From caee267a0d3635e46862993246856c0f25e91f45 Mon Sep 17 00:00:00 2001
From: P Stark <git@codechaos.ch>
Date: Fri, 21 Apr 2023 16:44:43 +0200
Subject: [PATCH] Fix parsing of SONARQUBE_EXTRA_PROPERTIES and
 SONARQUBE_SMTP_* variables (#31116)

* Fix parsing of SONARQUBE_EXTRA_PROPERTIES.

The existing code is not able to deal with values that include equal
signs. To configure SAML via the extra properties mechanism, a
certificate is required, which can include equal signs as part of the
base64 padding.

Signed-off-by: Philip Stark <git@codechaos.ch>

* Fix parsing of SMTP parameters when inserting into database

The SONARQUBE_SMTP_PASSWORD or SONARQUBE_SMTP_USER could contain equal
signs, which would then lead to an insertion of an incorrect key.

Signed-off-by: Philip Stark <git@codechaos.ch>

---------

Signed-off-by: Philip Stark <git@codechaos.ch>
---
 bitnami/sonarqube/10/debian-11/Dockerfile                     | 2 +-
 .../10/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh   | 4 ++--
 bitnami/sonarqube/9/debian-11/Dockerfile                      | 2 +-
 .../9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bitnami/sonarqube/10/debian-11/Dockerfile b/bitnami/sonarqube/10/debian-11/Dockerfile
index 98ab77f609a9..1ebb42bb9cb7 100644
--- a/bitnami/sonarqube/10/debian-11/Dockerfile
+++ b/bitnami/sonarqube/10/debian-11/Dockerfile
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
       org.opencontainers.image.created="2023-04-18T11:47:12Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.0.0-debian-11-r0" \
+      org.opencontainers.image.ref.name="10.0.0-debian-11-r1" \
       org.opencontainers.image.title="sonarqube" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.0.0"
diff --git a/bitnami/sonarqube/10/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh b/bitnami/sonarqube/10/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh
index 9599f3299f7c..8471ecd10b3d 100644
--- a/bitnami/sonarqube/10/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh
+++ b/bitnami/sonarqube/10/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh
@@ -133,7 +133,7 @@ sonarqube_initialize() {
     if [[ "${#additional_properties[@]}" -gt 0 ]]; then
         info "Adding properties provided via SONARQUBE_EXTRA_PROPERTIES to sonar.properties"
         for property in "${additional_properties[@]}"; do
-            sonarqube_conf_set "${property%=*}" "${property#*=}"
+            sonarqube_conf_set "${property%%=*}" "${property#*=}"
         done
     fi
 
@@ -186,7 +186,7 @@ EOF
                 unix_timestamp_ms="$(date '+%s%N' | cut -b1-13)"
                 for setting in "${settings_to_update[@]}"; do
                     postgresql_remote_execute "${postgresql_execute_args[@]}" <<EOF
-INSERT INTO properties (uuid, prop_key, is_empty, text_value, created_at) VALUES ('$(generate_random_string -t alphanumeric -c 20)', '${setting%=*}', '0', '${setting#*=}', '${unix_timestamp_ms}');
+INSERT INTO properties (uuid, prop_key, is_empty, text_value, created_at) VALUES ('$(generate_random_string -t alphanumeric -c 20)', '${setting%%=*}', '0', '${setting#*=}', '${unix_timestamp_ms}');
 EOF
                 done
             fi
diff --git a/bitnami/sonarqube/9/debian-11/Dockerfile b/bitnami/sonarqube/9/debian-11/Dockerfile
index e95509856345..b78c3e670959 100644
--- a/bitnami/sonarqube/9/debian-11/Dockerfile
+++ b/bitnami/sonarqube/9/debian-11/Dockerfile
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
       org.opencontainers.image.created="2023-04-17T16:59:26Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.9.0-debian-11-r23" \
+      org.opencontainers.image.ref.name="9.9.0-debian-11-r24" \
       org.opencontainers.image.title="sonarqube" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.9.0"
diff --git a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh
index 9599f3299f7c..8471ecd10b3d 100644
--- a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh
+++ b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh
@@ -133,7 +133,7 @@ sonarqube_initialize() {
     if [[ "${#additional_properties[@]}" -gt 0 ]]; then
         info "Adding properties provided via SONARQUBE_EXTRA_PROPERTIES to sonar.properties"
         for property in "${additional_properties[@]}"; do
-            sonarqube_conf_set "${property%=*}" "${property#*=}"
+            sonarqube_conf_set "${property%%=*}" "${property#*=}"
         done
     fi
 
@@ -186,7 +186,7 @@ EOF
                 unix_timestamp_ms="$(date '+%s%N' | cut -b1-13)"
                 for setting in "${settings_to_update[@]}"; do
                     postgresql_remote_execute "${postgresql_execute_args[@]}" <<EOF
-INSERT INTO properties (uuid, prop_key, is_empty, text_value, created_at) VALUES ('$(generate_random_string -t alphanumeric -c 20)', '${setting%=*}', '0', '${setting#*=}', '${unix_timestamp_ms}');
+INSERT INTO properties (uuid, prop_key, is_empty, text_value, created_at) VALUES ('$(generate_random_string -t alphanumeric -c 20)', '${setting%%=*}', '0', '${setting#*=}', '${unix_timestamp_ms}');
 EOF
                 done
             fi