Merge pull request #111 from luck3y/CLOUD-3219

[7.2.x-openjdk11] [CLOUD-3209] SSO_SECRET parameter should be required if configuring RH-SSO integration
jboss-container-images · May 29, 2019 · 3c6c28b · 3c6c28b
2 parents df899ae + e0b5a30
commit 3c6c28b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/os-eap-datasource/1.0/added/launch/datasource-common.sh b/os-eap-datasource/1.0/added/launch/datasource-common.sh
@@ -180,7 +180,10 @@ function generate_datasource_common() {
   local service_name="${11}"
   local jta="${12}"
   local validate="${13}"
-  local url="${14}"
+  # CLOUD-3198 Since Sed replaces '&' with a full match, we need to escape it.
+  local url="${14//&/\\&}"
+  # CLOUD-3198 In addition to that, we also need to escape ';'
+  url="${url//;/\\;}"
 
   if [ -n "$driver" ]; then
     ds=$(generate_external_datasource)

diff --git a/os-eap-launch/added/launch/datasource-common.sh b/os-eap-launch/added/launch/datasource-common.sh
@@ -188,7 +188,10 @@ function generate_datasource_common() {
   local service_name="${11}"
   local jta="${12}"
   local validate="${13}"
-  local url="${14}"
+  # CLOUD-3198 Since Sed replaces '&' with a full match, we need to escape it.
+  local url="${14//&/\\&}"
+  # CLOUD-3198 In addition to that, we also need to escape ';'
+  url="${url//;/\\;}"
 
   if [ -n "$driver" ]; then
     ds=$(generate_external_datasource)