From 1b25a5753129bc07353a374c777f3549cd446873 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 9 Mar 2022 21:58:29 +0000
Subject: [PATCH] 5.9.1-debian-10-r14 release

---
 bitnami/wordpress/5/debian-10/Dockerfile      |  4 ++--
 .../rootfs/opt/bitnami/scripts/apache-env.sh  |  2 ++
 .../opt/bitnami/scripts/apache/postunpack.sh  |  1 +
 .../opt/bitnami/scripts/apache/setup.sh       |  3 +++
 .../rootfs/opt/bitnami/scripts/libapache.sh   | 21 +++++++++++++++++++
 .../rootfs/opt/bitnami/scripts/php-env.sh     |  3 +--
 bitnami/wordpress/README.md                   |  2 +-
 7 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/bitnami/wordpress/5/debian-10/Dockerfile b/bitnami/wordpress/5/debian-10/Dockerfile
index 83170f0e0a54..be4cba7edb20 100644
--- a/bitnami/wordpress/5/debian-10/Dockerfile
+++ b/bitnami/wordpress/5/debian-10/Dockerfile
@@ -23,15 +23,15 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/wordpress/postunpack.sh
 RUN /opt/bitnami/scripts/wp-cli/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="wordpress" \
-    BITNAMI_IMAGE_VERSION="5.9.1-debian-10-r13" \
+    BITNAMI_IMAGE_VERSION="5.9.1-debian-10-r14" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/wp-cli/bin:/opt/bitnami/mysql/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
index eec592498ecd..ccbd724cb02f 100644
--- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
+++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
@@ -23,6 +23,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 apache_env_vars=(
     APACHE_HTTP_PORT_NUMBER
     APACHE_HTTPS_PORT_NUMBER
+    APACHE_SERVER_TOKENS
     APACHE_HTTP_PORT
     APACHE_HTTPS_PORT
 )
@@ -72,5 +73,6 @@ export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER"
 APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}"
 export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}"
 export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER"
+export APACHE_SERVER_TOKENS="${APACHE_SERVER_TOKENS:-Prod}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh
index e7d67d19321d..8a133f545c27 100755
--- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh
+++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh
@@ -59,6 +59,7 @@ apache_setup_bitnami_config() {
 Include "${APACHE_CONF_DIR}/extra/httpd-default.conf"
 PidFile "${APACHE_PID_FILE}"
 TraceEnable Off
+ServerTokens ${APACHE_SERVER_TOKENS}
 Include "${APACHE_CONF_DIR}/deflate.conf"
 IncludeOptional "${APACHE_VHOSTS_DIR}/*.conf"
 Include "${APACHE_CONF_DIR}/bitnami/bitnami.conf"
diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh
index 4aec08b33dd0..3d7279aad46a 100755
--- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh
+++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh
@@ -56,5 +56,8 @@ fi
 [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && info "Configuring the HTTP port" && apache_configure_http_port "$APACHE_HTTP_PORT_NUMBER"
 [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && info "Configuring the HTTPS port" && apache_configure_https_port "$APACHE_HTTPS_PORT_NUMBER"
 
+# Configure ServerTokens with user values
+[[ -n "$APACHE_SERVER_TOKENS" ]] && info "Configuring Apache ServerTokens directive" && apache_configure_server_tokens "$APACHE_SERVER_TOKENS"
+
 # Fix logging issue when running as root
 ! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"
diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 5a8bae06cbcc..2a6b3c70deed 100644
--- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -112,6 +112,27 @@ apache_configure_https_port() {
     fi
 }
 
+########################
+# Configure Apache's ServerTokens directive
+# Globals:
+#   APACHE_CONF_DIR
+# Arguments:
+#   $1 - Value for ServerTokens directive
+# Returns:
+#   None
+#########################
+apache_configure_server_tokens() {
+    local -r value=${1:?missing value}
+    local -r server_tokens_exp="s|^\s*ServerTokens\s+\w+\s*$|ServerTokens ${value}|"
+    local apache_configuration
+
+     if [[ -w "$APACHE_CONF_FILE" ]]; then
+        debug "Configuring ServerTokens ${value} on file ${APACHE_CONF_FILE}"
+        apache_configuration="$(sed -E -e "$server_tokens_exp" "$APACHE_CONF_FILE")"
+        echo "$apache_configuration" > "$APACHE_CONF_FILE"
+    fi
+}
+
 ########################
 # Enable a module in the Apache configuration file
 # Globals:
diff --git a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index 038af0c8d252..fc940ac44ee8 100644
--- a/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/wordpress/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -24,7 +24,6 @@ php_env_vars=(
     PHP_FPM_LISTEN_ADDRESS
     PHP_DATE_TIMEZONE
     PHP_ENABLE_OPCACHE
-    PHP_EXPOSE_PHP
     PHP_MAX_EXECUTION_TIME
     PHP_MAX_INPUT_TIME
     PHP_MAX_INPUT_VARS
@@ -76,7 +75,7 @@ export PHP_FPM_DAEMON_GROUP="daemon"
 export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-}"
 PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-"${PHP_OPCACHE_ENABLED:-}"}"
 export PHP_ENABLE_OPCACHE="${PHP_ENABLE_OPCACHE:-}"
-export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-}"
+export PHP_EXPOSE_PHP="0"
 export PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-}"
 export PHP_MAX_INPUT_TIME="${PHP_MAX_INPUT_TIME:-}"
 export PHP_MAX_INPUT_VARS="${PHP_MAX_INPUT_VARS:-}"
diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md
index d7c0bd5374f9..69288513e445 100644
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-- [`5`, `5-debian-10`, `5.9.1`, `5.9.1-debian-10-r13`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.9.1-debian-10-r13/5/debian-10/Dockerfile)
+- [`5`, `5-debian-10`, `5.9.1`, `5.9.1-debian-10-r14`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.9.1-debian-10-r14/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).