Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset deb rpm permissions to original state #4041

Merged
merged 3 commits into from
Sep 19, 2023
Merged

Reset deb rpm permissions to original state #4041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0bfacb
Revert "Allow opensearch-dashboard user to read its config (#4038)"
peterzhuamazon Sep 19, 2023
bbf2d3e
Revert "Fix files ownership and permissions in OpenSearch-Dashboards …
peterzhuamazon Sep 19, 2023
780edd8
Revert "Improve ownership and permissions of files in deb and rpm pac…
peterzhuamazon Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions scripts/pkg/build_templates/opensearch-dashboards/deb/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,11 @@ echo " sudo systemctl enable opensearch-dashboards.service"
echo "### You can start opensearch-dashboards service by executing"
echo " sudo systemctl start opensearch-dashboards.service"

# Set ownership and permissions
chown -R root.opensearch-dashboards ${config_dir}
chmod -R u=rwX,g=rX,o= ${config_dir}

chown -R opensearch-dashboards.adm ${log_dir}
chmod 750 ${log_dir}

# Set owner
chown -R opensearch-dashboards.opensearch-dashboards ${product_dir}
chown -R opensearch-dashboards.opensearch-dashboards ${config_dir}
chown -R opensearch-dashboards.opensearch-dashboards ${log_dir}
chown -R opensearch-dashboards.opensearch-dashboards ${data_dir}
chmod 750 ${data_dir}

chown -R opensearch-dashboards.opensearch-dashboards ${pid_dir}

exit 0
Expand Down
3 changes: 1 addition & 2 deletions ...ts/pkg/build_templates/opensearch-dashboards/deb/debmake_opensearch_dashboards_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ ln -s ${data_dir} ${buildroot}${product_dir}/data
ln -s ${log_dir} ${buildroot}${product_dir}/logs

# Change Permissions
chmod -Rf g-s ${buildroot}/*
chmod -Rf u=rwX,g=rX,o=rX ${buildroot}/*
chmod -Rf a+rX,u+w,g-w,o-w ${buildroot}/*

exit 0
12 changes: 5 additions & 7 deletions scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ chmod 0755 %{buildroot}%{product_dir}/bin/*
ln -s %{data_dir} %{buildroot}%{product_dir}/data
ln -s %{log_dir} %{buildroot}%{product_dir}/logs
# Change Permissions
chmod -Rf g-s %{buildroot}/*
chmod -Rf u=rwX,g=rX,o= %{buildroot}/etc
chmod -Rf a+rX,u+w,g-w,o-w %{buildroot}/*
exit 0

%pre
Expand All @@ -76,7 +75,6 @@ exit 0

%post
set -e
chown -R root.%{name} %{config_dir}
# Reload systemctl daemon
if command -v systemctl > /dev/null; then
systemctl daemon-reload
Expand All @@ -103,7 +101,7 @@ exit 0

%files
# Permissions
%defattr(-, root, root)
%defattr(-, %{name}, %{name})

# Root dirs/docs/licenses
%dir %{product_dir}
Expand Down Expand Up @@ -132,9 +130,9 @@ exit 0
%{product_dir}/node_modules
%{product_dir}/plugins
%{product_dir}/src
%attr(750, %{name}, %{name}) %{log_dir}
%attr(750, %{name}, %{name}) %{pid_dir}
%dir %attr(750, %{name}, %{name}) %{data_dir}
%{log_dir}
%{pid_dir}
%dir %{data_dir}

# Symlinks
%{product_dir}/data
Expand Down
12 changes: 3 additions & 9 deletions scripts/pkg/build_templates/opensearch/deb/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,11 @@ if ! grep -q '## OpenSearch Performance Analyzer' ${config_dir}/jvm.options; the
echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> ${config_dir}/jvm.options
fi

# Set ownership and permissions
# FIXME: the opensearch service should not have w permission in the config directory
# Set owner
chown -R opensearch.opensearch ${product_dir}
chown -R opensearch.opensearch ${config_dir}
chmod -R u=rwX,g=rX,o= ${config_dir}

chown -R opensearch.adm ${log_dir}
chmod 750 ${log_dir}

chown -R opensearch.opensearch ${log_dir}
chown -R opensearch.opensearch ${data_dir}
chmod 750 ${data_dir}

chown -R opensearch.opensearch ${pid_dir}

# Reload systemctl daemon
Expand Down
3 changes: 1 addition & 2 deletions scripts/pkg/build_templates/opensearch/deb/debmake_opensearch_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ ln -s ${data_dir} ${buildroot}${product_dir}/data
ln -s ${log_dir} ${buildroot}${product_dir}/logs

# Change Permissions
chmod -Rf g-s ${buildroot}/*
chmod -Rf u=rwX,g=rX,o=rX ${buildroot}/*
chmod -Rf a+rX,u+w,g-w,o-w ${buildroot}/*

exit 0
27 changes: 11 additions & 16 deletions scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ if [ ! -f %{buildroot}%{data_dir}/performance_analyzer_enabled.conf ]; then
echo 'true' > %{buildroot}%{data_dir}/performance_analyzer_enabled.conf
fi
# Change Permissions
chmod -Rf g-s %{buildroot}/*
chmod -Rf u=rwX,g=rX,o= %{buildroot}/etc
chmod -Rf a+rX,u+w,g-w,o-w %{buildroot}/*
exit 0

%pre
Expand Down Expand Up @@ -151,6 +150,13 @@ exit 0
# Permissions
%defattr(-, %{name}, %{name})

# Root dirs/docs/licenses
%dir %{product_dir}
%doc %{product_dir}/NOTICE.txt
%doc %{product_dir}/README.md
%license %{product_dir}/LICENSE.txt
%{product_dir}/manifest.yml

# Config dirs/files
%dir %{config_dir}
%{config_dir}/jvm.options.d
Expand All @@ -169,27 +175,16 @@ exit 0
%attr(0644, root, root) %config(noreplace) %{_prefix}/lib/sysctl.d/%{name}.conf
%attr(0644, root, root) %config(noreplace) %{_prefix}/lib/tmpfiles.d/%{name}.conf

%dir %attr(750, %{name}, %{name}) %{data_dir}
%attr(750, %{name}, %{name}) %{log_dir}
%attr(750, %{name}, %{name}) %{pid_dir}

# Permissions
%defattr(-, root, root)

# Root dirs/docs/licenses
%dir %{product_dir}
%doc %{product_dir}/NOTICE.txt
%doc %{product_dir}/README.md
%license %{product_dir}/LICENSE.txt
%{product_dir}/manifest.yml

# Main dirs
%{product_dir}/bin
%{product_dir}/jdk
%{product_dir}/lib
%{product_dir}/modules
%{product_dir}/performance-analyzer-rca
%{product_dir}/plugins
%{log_dir}
%{pid_dir}
%dir %{data_dir}

# Symlinks
%{product_dir}/data
Expand Down