Skip to content

Commit 3fa052c

Browse files
authored
Fix cloudstack-ui package: bad directory permissions and missing WEB-INF (#8568)
* Fix bad perms on sub directories for webapp asset files Updated the spec file such that directories are chmod 0755 rather than 0644 which would prevent the cloud user from reading their contents. * Fix bad permissions for centos8 UI files, missing WEB-INF The cloudstack-ui package should have the same files as the bundled webapp in the management package. * Fix bad perms and missing WEB-INF for centos7 ui rpm Add the missing WEB-INF directory and do not set directories to 0755. * Fix missing WEB-INF on CentOS 8 cloudstack-ui rpm * Fix missing WEB-INF on CentOS 7 cloudstack-ui rpm
1 parent 69e8ebc commit 3fa052c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

packaging/centos7/cloud.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm/md5sum
320320
# UI
321321
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui
322322
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
323+
cp -r client/target/classes/META-INF/webapp/WEB-INF ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui
323324
cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui/
324325
cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
325326
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
@@ -658,7 +659,7 @@ pip3 install --upgrade urllib3
658659

659660
%files ui
660661
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/ui/config.json
661-
%attr(0644,root,root) %{_datadir}/%{name}-ui/*
662+
%{_datadir}/%{name}-ui/*
662663
%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
663664
%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
664665

packaging/centos8/cloud.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm/md5sum
302302
# UI
303303
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui
304304
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
305+
cp -r client/target/classes/META-INF/webapp/WEB-INF ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui
305306
cp ui/dist/config.json ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui/
306307
cp -r ui/dist/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
307308
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/config.json
@@ -636,7 +637,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
636637

637638
%files ui
638639
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/ui/config.json
639-
%attr(0644,root,root) %{_datadir}/%{name}-ui/*
640+
%{_datadir}/%{name}-ui/*
640641
%{_defaultdocdir}/%{name}-ui-%{version}/LICENSE
641642
%{_defaultdocdir}/%{name}-ui-%{version}/NOTICE
642643

0 commit comments

Comments
 (0)