CLOUD-2821 fix http.nonProxyHosts escaping for amq

Signed-off-by: rcernich <[email protected]>
jboss-openshift · Oct 8, 2018 · c3fd77a · c3fd77a
1 parent 91d0095
commit c3fd77a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/os-amq-launch/added/drain.sh b/os-amq-launch/added/drain.sh
@@ -27,6 +27,8 @@ fi
 # Add proxy command line options
 source /opt/run-java/proxy-options
 ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $(proxy_options)"
+opts_array=($ACTIVEMQ_OPTS)
+ACTIVEMQ_OPTS=$(printf "%q " ${opts_array[@]})
 
 function runMigration() {
     export ACTIVEMQ_DATA="$1"

diff --git a/os-amq-launch/added/launch.sh b/os-amq-launch/added/launch.sh
@@ -25,9 +25,9 @@ fi
 
 # Add proxy command line options
 source /opt/run-java/proxy-options
-options="$(proxy_options)"
-options="$(echo $options | sed 's|"|\\"|g')"
-ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $options"
+ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $(proxy_options)"
+opts_array=($ACTIVEMQ_OPTS)
+ACTIVEMQ_OPTS=$(printf "%q " ${opts_array[@]})
 
 # Add jolokia command line options
 cat <<EOF > $AMQ_HOME/bin/env

diff --git a/tests/features/amq/amq-common.feature b/tests/features/amq/amq-common.feature
@@ -214,10 +214,11 @@ Feature: Openshift AMQ tests
 
   Scenario: check nonHttpProxy escaping
     When container is started with env
-       | variable                  | value           |
-       | NO_PROXY                  | patriots.com    |
+       | variable                  | value                 |
+       | NO_PROXY                  | patriots.com,127.*    |
     Then container log should contain INFO | Apache ActiveMQ 5.11.0.redhat-
-    And file /opt/amq/bin/env should contain -Dhttp.nonProxyHosts=patriots.com
+    And container log should contain -Dhttp.nonProxyHosts=patriots.com|127.*
+    And file /opt/amq/bin/env should contain -Dhttp.nonProxyHosts=patriots.com\|127.\*
 
   Scenario: check queue memory limit
     Given XML namespace amq:http://activemq.apache.org/schema/core