[OPENJDK-3655] alternative fix for script permissions

jmtd · jmtd · commit 7e1657a889ce · 2025-07-31T14:25:43.000+01:00
Adjust the permissions of installed files such that files that
should be executable have o+x.

Remove unnecessary chowns and chmods that set g+w etc on files
that should not be modified by running applications anyway.

The results should be:

    $ podman run --rm -ti ubi9/openjdk-21:latest find /opt/jboss /usr/local/s2i -type f -printf "%M %u:%g %h/%f\n"
    -rw-r--r-- root:root /opt/jboss/container/openjdk/jdk/jvm-options
    -rw-r--r-- root:root /opt/jboss/container/s2i/core/s2i-core
    -rw-r--r-- root:root /opt/jboss/container/maven/default/maven.sh
    -rw-r--r-- root:root /opt/jboss/container/maven/default/jboss-settings.xml
    -rw-r--r-- root:root /opt/jboss/container/maven/s2i/maven-overrides
    -rw-r--r-- root:root /opt/jboss/container/maven/s2i/maven-s2i
    -rw-r--r-- root:root /opt/jboss/container/java/proxy/proxy-options
    -rw-r--r-- root:root /opt/jboss/container/java/proxy/parse-proxy-url.sh
    -rw-r--r-- root:root /opt/jboss/container/java/proxy/translate-no-proxy.sh
    -rwxr-xr-x root:root /opt/jboss/container/java/run/run-java.sh
    -rwxr-xr-x root:root /opt/jboss/container/java/jvm/debug-options
    -rwxr-xr-x root:root /opt/jboss/container/java/jvm/java-default-options
    -rw-r--r-- root:root /opt/jboss/container/java/s2i/maven-overrides
    -rw-r--r-- root:root /opt/jboss/container/java/s2i/maven-s2i-overrides
    -rw-r--r-- root:root /opt/jboss/container/java/s2i/s2i-core-hooks
    -rw-r--r-- root:root /opt/jboss/container/util/logging/logging.sh
    -rwxr-xr-x root:root /usr/local/s2i/run
    -rwxr-xr-x root:root /usr/local/s2i/save-artifacts
    -rwxr-xr-x root:root /usr/local/s2i/assemble
    -rwxr-xr-x root:root /usr/local/s2i/usage

Signed-off-by: Jonathan Dowland &lt;jdowland@redhat.com&gt;
diff --git a/modules/jdk/21/configure.sh b/modules/jdk/21/configure.sh
@@ -5,10 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
-
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
diff --git a/modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options b/modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options
diff --git a/modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options b/modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options
diff --git a/modules/jvm/configure.sh b/modules/jvm/configure.sh
@@ -5,10 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/*
-
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
diff --git a/modules/maven/default/configure.sh b/modules/maven/default/configure.sh
@@ -5,11 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-# configure artifact permissions
-chown -R $USER:root $ARTIFACTS_DIR
-chmod -R ug+rwX $ARTIFACTS_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/maven.sh
-
 # install artifacts
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
@@ -19,7 +14,6 @@ MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./}
 
 # pull in specific maven version to serve as default
 ln -s /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/* /opt/jboss/container/maven/default
-chown -h $USER:root /opt/jboss/container/maven/default/*
 
 # install default settings.xml file in user home
 mkdir -p $HOME/.m2
diff --git a/modules/maven/s2i/configure.sh b/modules/maven/s2i/configure.sh
@@ -5,10 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/s2i/*
-chmod ug+x ${ARTIFACTS_DIR}/usr/local/s2i/*
+chmod +x ${ARTIFACTS_DIR}/usr/local/s2i/*
 
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
diff --git a/modules/proxy/configure.sh b/modules/proxy/configure.sh
@@ -5,10 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/proxy*
-
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
diff --git a/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh b/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh
diff --git a/modules/run/configure.sh b/modules/run/configure.sh
@@ -5,10 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/run/*
-
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/bash/configure.sh
@@ -5,10 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/s2i/*
-chmod ug+x ${ARTIFACTS_DIR}/usr/local/s2i/*
+chmod +x ${ARTIFACTS_DIR}/usr/local/s2i/*
 
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh
@@ -5,10 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/s2i/core/*
-
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
diff --git a/modules/util/logging/configure.sh b/modules/util/logging/configure.sh
@@ -5,10 +5,6 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/util/logging/*
-
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
