From bbf2d3e670104c0538dbd8966170496e4ce5aaa0 Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Tue, 19 Sep 2023 20:16:26 +0000
Subject: [PATCH] Revert "Fix files ownership and permissions in
 OpenSearch-Dashboards packages (#3952)"

This reverts commit b5f7ae2dd52cb8aa01173768009836fc6a95573b.
---
 .../opensearch-dashboards/deb/debian/postinst        | 12 ++++--------
 .../deb/debmake_opensearch_dashboards_install.sh     |  3 +--
 .../rpm/opensearch-dashboards.rpm.spec               | 11 +++++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/scripts/pkg/build_templates/opensearch-dashboards/deb/debian/postinst b/scripts/pkg/build_templates/opensearch-dashboards/deb/debian/postinst
index 08f0094078..30d62c95e7 100755
--- a/scripts/pkg/build_templates/opensearch-dashboards/deb/debian/postinst
+++ b/scripts/pkg/build_templates/opensearch-dashboards/deb/debian/postinst
@@ -36,15 +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
-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
diff --git a/scripts/pkg/build_templates/opensearch-dashboards/deb/debmake_opensearch_dashboards_install.sh b/scripts/pkg/build_templates/opensearch-dashboards/deb/debmake_opensearch_dashboards_install.sh
index e41763e071..1c4f593a53 100755
--- a/scripts/pkg/build_templates/opensearch-dashboards/deb/debmake_opensearch_dashboards_install.sh
+++ b/scripts/pkg/build_templates/opensearch-dashboards/deb/debmake_opensearch_dashboards_install.sh
@@ -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
diff --git a/scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec b/scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec
index df8e1bd064..6ff7c32084 100644
--- a/scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec
+++ b/scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec
@@ -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
@@ -102,7 +101,7 @@ exit 0
 
 %files
 # Permissions
-%defattr(-, root, root)
+%defattr(-, %{name}, %{name})
 
 # Root dirs/docs/licenses
 %dir %{product_dir}
@@ -131,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