Skip to content

Commit e8b5a6e

Browse files
author
Jan Lieskovsky
committed
[CIAM-1394] Use a non-printable character - ASCII 31 (octal 037) unit
separator character as the sed substitute (s) command delimiter for each existing call of "sed -i" and "sed -e" across the various container image modules, where either the regexp or the replacement value is dynamically generated (IOW it's not a fixed string) and it's based on / derived from the value of some environment variable. Do this to avoid clash of the sed substitute command delimiter with some special character specified in env var value (e.g. in password), leading to: * sed: -e expression #1, char <CHAR_POS>: unterminated `s' command * sed: -e expression #1, char <CHAR_POS>: unknown option to 's' type of errors Signed-off-by: Jan Lieskovsky <[email protected]>
1 parent 06c183a commit e8b5a6e

File tree

37 files changed

+364
-104
lines changed

37 files changed

+364
-104
lines changed

‎image.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ modules:
9494
path: modules
9595

9696
install:
97+
# Define RH-SSO global variables & functions required by subsequent image modules.
98+
#
99+
# IMPORTANT: This module needs to be included (sourced) in each of the following
100+
# modules using "sed -e" or "sed -i" expressions, where the regex pattern
101+
# or the replacement value is dynamic (coming from env var supplied to the
102+
# container image at runtime). See CIAM-1394 JIRA for details
103+
- name: sso.rcfile
104+
version: '1.0'
97105
- name: sso.security.cve-2020-10695
98106
version: '1.0'
99107
# Install JDK runtime

‎modules/eap/setup/eap/modules/added/https.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ function configureSslXml() {
6969
</ssl>\n\
7070
</server-identities>"
7171

72-
sed -i "s|<!-- ##SSL## -->|${ssl}|" $CONFIG_FILE
72+
# CIAM-1394 correction
73+
sed -i "s${AUS}<!-- ##SSL## -->${AUS}${ssl}${AUS}" $CONFIG_FILE
74+
# EOF CIAM-1394 correction
7375
}
7476

7577
function configureSslCli() {
@@ -96,7 +98,9 @@ EOF
9698

9799
function configureHttpsXml() {
98100
https_connector="<https-listener name=\"https\" socket-binding=\"https\" security-realm=\"ApplicationRealm\" proxy-address-forwarding=\"true\"/>"
99-
sed -i "s|<!-- ##HTTPS_CONNECTOR## -->|${https_connector}|" $CONFIG_FILE
101+
# CIAM-1394 correction
102+
sed -i "s${AUS}<!-- ##HTTPS_CONNECTOR## -->${AUS}${https_connector}${AUS}" $CONFIG_FILE
103+
# EOF CIAM-1394 correction
100104
}
101105

102106
function configureHttpsCli() {
@@ -134,4 +138,4 @@ function configureHttpsCli() {
134138
done
135139
EOF
136140

137-
}
141+
}

‎modules/eap/setup/eap/modules/added/keycloak.sh‎

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ function configure_cli_keycloak() {
162162
keycloak_subsystem=$(cat "${SECURE_DEPLOYMENTS}" | sed ':a;N;$!ba;s/\n//g')
163163
keycloak_subsystem="<subsystem xmlns=\"urn:jboss:domain:keycloak:1.1\">${keycloak_subsystem}</subsystem>${SUBSYSTEM_END_MARKER}"
164164

165-
sed -i "s|${SUBSYSTEM_END_MARKER}|${keycloak_subsystem}|" "${CONFIG_FILE}"
165+
# CIAM-1394 correction
166+
sed -i "s${AUS}${SUBSYSTEM_END_MARKER}${AUS}${keycloak_subsystem}${AUS}" "${CONFIG_FILE}"
167+
# EOF CIAM-1394 correction
166168

167169
oidc_elytron="$(configure_OIDC_elytron $id)"
168170
ejb_config="$(configure_ejb $id $app_sec_domain)"
@@ -183,7 +185,9 @@ function configure_cli_keycloak() {
183185
keycloak_subsystem=$(cat "${SECURE_SAML_DEPLOYMENTS}" | sed ':a;N;$!ba;s/\n//g')
184186
keycloak_subsystem="<subsystem xmlns=\"urn:jboss:domain:keycloak-saml:1.1\">${keycloak_subsystem}</subsystem>${SUBSYSTEM_END_MARKER}"
185187

186-
sed -i "s|${SUBSYSTEM_END_MARKER}|${keycloak_subsystem}|" "${CONFIG_FILE}"
188+
# CIAM-1394 correction
189+
sed -i "s${AUS}${SUBSYSTEM_END_MARKER}${AUS}${keycloak_subsystem}${AUS}" "${CONFIG_FILE}"
190+
# EOF CIAM-1394 correction
187191

188192
saml_elytron="$(configure_SAML_elytron $id)"
189193
if [ "$useLegacySecurity" == "false" ]; then
@@ -554,14 +558,18 @@ function configure_keycloak() {
554558
keycloak_subsystem=$(cat "${SECURE_DEPLOYMENTS}" | sed ':a;N;$!ba;s/\n//g')
555559
keycloak_subsystem="<subsystem xmlns=\"urn:jboss:domain:keycloak:1.1\">${keycloak_subsystem}</subsystem>"
556560

557-
sed -i "s|<!-- ##KEYCLOAK_SUBSYSTEM## -->|${keycloak_subsystem}|" "${CONFIG_FILE}"
561+
# CIAM-1394 correction
562+
sed -i "s${AUS}<!-- ##KEYCLOAK_SUBSYSTEM## -->${AUS}${keycloak_subsystem}${AUS}" "${CONFIG_FILE}"
563+
# EOF CIAM-1394 correction
558564
fi
559565

560566
if [ -f $SECURE_SAML_DEPLOYMENTS ]; then
561567
keycloak_subsystem=$(cat "${SECURE_SAML_DEPLOYMENTS}" | sed ':a;N;$!ba;s/\n//g')
562568
keycloak_subsystem="<subsystem xmlns=\"urn:jboss:domain:keycloak-saml:1.1\">${keycloak_subsystem}</subsystem>"
563569

564-
sed -i "s|<!-- ##KEYCLOAK_SAML_SUBSYSTEM## -->|${keycloak_subsystem}|" "${CONFIG_FILE}"
570+
# CIAM-1394 correction
571+
sed -i "s${AUS}<!-- ##KEYCLOAK_SAML_SUBSYSTEM## -->${AUS}${keycloak_subsystem}${AUS}" "${CONFIG_FILE}"
572+
# EOF CIAM-1394 correction
565573
fi
566574

567575
enable_keycloak_deployments
@@ -590,31 +598,45 @@ function configure_keycloak() {
590598
keycloak_saml_sp=$(cat "${KEYCLOAK_SAML_SP_SUBSYSTEM_FILE}" | sed ':a;N;$!ba;s|\n|\\n|g')
591599
configure_subsystem $SAML ${KEYCLOAK_SAML_REALM_SUBSYSTEM_FILE} "##KEYCLOAK_SAML_SUBSYSTEM##" "saml" ${KEYCLOAK_SAML_DEPLOYMENT_SUBSYSTEM_FILE}
592600

593-
sed -i "s|##KEYCLOAK_REALM##|${SSO_REALM}|g" "${CONFIG_FILE}"
601+
# CIAM-1394 correction
602+
sed -i "s${AUS}##KEYCLOAK_REALM##${AUS}${SSO_REALM}${AUS}g" "${CONFIG_FILE}"
603+
# EOF CIAM-1394 correction
594604

595605
if [ -n "$SSO_PUBLIC_KEY" ]; then
596-
sed -i "s|<!-- ##KEYCLOAK_PUBLIC_KEY## -->|<realm-public-key>${SSO_PUBLIC_KEY}</realm-public-key>|g" "${CONFIG_FILE}"
606+
# CIAM-1394 correction
607+
sed -i "s${AUS}<!-- ##KEYCLOAK_PUBLIC_KEY## -->${AUS}<realm-public-key>${SSO_PUBLIC_KEY}</realm-public-key>${AUS}g" "${CONFIG_FILE}"
608+
# EOF CIAM-1394 correction
597609
fi
598610

599611
if [ -n "$SSO_TRUSTSTORE" ] && [ -n "$SSO_TRUSTSTORE_DIR" ]; then
600-
sed -i "s|<!-- ##KEYCLOAK_TRUSTSTORE## -->|<truststore>${SSO_TRUSTSTORE_DIR}/${SSO_TRUSTSTORE}</truststore><truststore-password>${SSO_TRUSTSTORE_PASSWORD}</truststore-password>|g" "${CONFIG_FILE}"
612+
# CIAM-1394 correction
613+
sed -i "s${AUS}<!-- ##KEYCLOAK_TRUSTSTORE## -->${AUS}<truststore>${SSO_TRUSTSTORE_DIR}/${SSO_TRUSTSTORE}</truststore><truststore-password>${SSO_TRUSTSTORE_PASSWORD}</truststore-password>${AUS}g" "${CONFIG_FILE}"
614+
# EOF CIAM-1394 correction
601615
sed -i "s|##KEYCLOAK_DISABLE_TRUST_MANAGER##|false|g" "${CONFIG_FILE}"
602616
else
603617
sed -i "s|##KEYCLOAK_DISABLE_TRUST_MANAGER##|true|g" "${CONFIG_FILE}"
604618
fi
605619

606-
sed -i "s|##KEYCLOAK_URL##|${SSO_URL}|g" "${CONFIG_FILE}"
620+
# CIAM-1394 correction
621+
sed -i "s${AUS}##KEYCLOAK_URL##${AUS}${SSO_URL}${AUS}g" "${CONFIG_FILE}"
622+
# EOF CIAM-1394 correction
607623

608624
if [ -n "$SSO_SAML_CERTIFICATE_NAME" ]; then
609-
sed -i "s|##SSO_SAML_CERTIFICATE_NAME##|${SSO_SAML_CERTIFICATE_NAME}|g" "${CONFIG_FILE}"
625+
# CIAM-1394 correction
626+
sed -i "s${AUS}##SSO_SAML_CERTIFICATE_NAME##${AUS}${SSO_SAML_CERTIFICATE_NAME}${AUS}g" "${CONFIG_FILE}"
627+
# EOF CIAM-1394 correction
610628
fi
611629

612630
if [ -n "$SSO_SAML_KEYSTORE_PASSWORD" ]; then
613-
sed -i "s|##SSO_SAML_KEYSTORE_PASSWORD##|${SSO_SAML_KEYSTORE_PASSWORD}|g" "${CONFIG_FILE}"
631+
# CIAM-1394 correction
632+
sed -i "s${AUS}##SSO_SAML_KEYSTORE_PASSWORD##${AUS}${SSO_SAML_KEYSTORE_PASSWORD}${AUS}g" "${CONFIG_FILE}"
633+
# EOF CIAM-1394 correction
614634
fi
615635

616636
if [ -n "$SSO_SAML_KEYSTORE" ] && [ -n "$SSO_SAML_KEYSTORE_DIR" ]; then
617-
sed -i "s|##SSO_SAML_KEYSTORE##|${SSO_SAML_KEYSTORE_DIR}/${SSO_SAML_KEYSTORE}|g" "${CONFIG_FILE}"
637+
# CIAM-1394 correction
638+
sed -i "s${AUS}##SSO_SAML_KEYSTORE##${AUS}${SSO_SAML_KEYSTORE_DIR}/${SSO_SAML_KEYSTORE}${AUS}g" "${CONFIG_FILE}"
639+
# EOF CIAM-1394 correction
618640
fi
619641
else
620642
log_warning "Missing SSO_URL. Unable to properly configure SSO-enabled applications"
@@ -661,7 +683,9 @@ function explode_keycloak_deployments() {
661683

662684
if [ -f "${JBOSS_HOME}/standalone/deployments/${sso_deployment}/WEB-INF/web.xml" ]; then
663685
requested_auth_method=$(cat ${JBOSS_HOME}/standalone/deployments/${sso_deployment}/WEB-INF/web.xml | xmllint --nowarning --xpath "string(//*[local-name()='auth-method'])" - | sed ':a;N;$!ba;s/\n//g' | tr -d '[:space:]')
664-
sed -i "s|${requested_auth_method}|${auth_method}|" "${JBOSS_HOME}/standalone/deployments/${sso_deployment}/WEB-INF/web.xml"
686+
# CIAM-1394 correction
687+
sed -i "s${AUS}${requested_auth_method}${AUS}${auth_method}${AUS}" "${JBOSS_HOME}/standalone/deployments/${sso_deployment}/WEB-INF/web.xml"
688+
# EOF CIAM-1394 correction
665689
fi
666690
done
667691
}
@@ -694,12 +718,16 @@ function configure_extension() {
694718
}
695719

696720
function configure_extensions_no_marker() {
697-
sed -i "s|${EXTENSIONS_END_MARKER}|<extension module=\"org.keycloak.keycloak-adapter-subsystem\"/><extension module=\"org.keycloak.keycloak-saml-adapter-subsystem\"/>${EXTENSIONS_END_MARKER}|" "${CONFIG_FILE}"
721+
# CIAM-1394 correction
722+
sed -i "s${AUS}${EXTENSIONS_END_MARKER}${AUS}<extension module=\"org.keycloak.keycloak-adapter-subsystem\"/><extension module=\"org.keycloak.keycloak-saml-adapter-subsystem\"/>${EXTENSIONS_END_MARKER}${AUS}" "${CONFIG_FILE}"
723+
# EOF CIAM-1394 correction
698724
}
699725

700726
function configure_security_domain() {
701727
keycloak_security_domain=$(cat "${KEYCLOAK_SECURITY_DOMAIN_FILE}" | sed ':a;N;$!ba;s|\n|\\n|g')
702-
sed -i "s|<!-- ##KEYCLOAK_SECURITY_DOMAIN## -->|${keycloak_security_domain%$'\n'}|" "${CONFIG_FILE}"
728+
# CIAM-1394 correction
729+
sed -i "s${AUS}<!-- ##KEYCLOAK_SECURITY_DOMAIN## -->${AUS}${keycloak_security_domain%$'\n'}${AUS}" "${CONFIG_FILE}"
730+
# EOF CIAM-1394 correction
703731
}
704732

705733
function configure_subsystem() {
@@ -975,7 +1003,9 @@ function configure_subsystem() {
9751003

9761004
if [ -z "$is_cli" ]; then
9771005
if [ -n "$subsystem" ]; then
978-
sed -i "s|<!-- ${subsystem_marker} -->|${subsystem%$'\n'}|" "${CONFIG_FILE}"
1006+
# CIAM-1394 correction
1007+
sed -i "s${AUS}<!-- ${subsystem_marker} -->${AUS}${subsystem%$'\n'}${AUS}" "${CONFIG_FILE}"
1008+
# EOF CIAM-1394 correction
9791009
fi
9801010
fi
9811011
}

‎modules/eap/setup/eap/modules/added/launch/access_log_valve.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ function configure_access_log_valve() {
4646
if [ "${mode}" == "xml" ]; then
4747
local pattern=$(getPattern "add-xml")
4848
local valve="<access-log use-server-log=\"true\" pattern=\"${pattern}\"/>"
49-
sed -i "s|<!-- ##ACCESS_LOG_VALVE## -->|${valve}|" $CONFIG_FILE
49+
# CIAM-1394 correction
50+
sed -i "s${AUS}<!-- ##ACCESS_LOG_VALVE## -->${AUS}${valve}${AUS}" $CONFIG_FILE
51+
# EOF CIAM-1394 correction
5052
else
5153
# A lot of XPath here since we need to do more advanced stuff than CLI allows us to...
5254

@@ -184,7 +186,9 @@ function configure_access_log_handler() {
184186
getConfigurationMode "<!-- ##ACCESS_LOG_HANDLER## -->" "mode"
185187

186188
if [ "${mode}" = "xml" ]; then
187-
sed -i "s|<!-- ##ACCESS_LOG_HANDLER## -->|<logger category=\"${log_category}\"><level name=\"TRACE\"/></logger>|" $CONFIG_FILE
189+
# CIAM-1394 correction
190+
sed -i "s${AUS}<!-- ##ACCESS_LOG_HANDLER## -->${AUS}<logger category=\"${log_category}\"><level name=\"TRACE\"/></logger>${AUS}" $CONFIG_FILE
191+
# EOF CIAM-1394 correction
188192
elif [ "${mode}" = "cli" ]; then
189193

190194
if [ -z "${ENABLE_ACCESS_LOG_TRACE}" ] || [ "${ENABLE_ACCESS_LOG_TRACE^^}" != "TRUE" ]; then

‎modules/eap/setup/eap/modules/added/launch/admin.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ function configure_administration() {
3333

3434
if [ "${mode}" = "xml" ]; then
3535
local mgmt_iface_replace_str="security-realm=\"ManagementRealm\""
36-
sed -i "s|><!-- ##MGMT_IFACE_REALM## -->| ${mgmt_iface_replace_str}>|" "$CONFIG_FILE"
36+
# CIAM-1394 correction
37+
sed -i "s${AUS}><!-- ##MGMT_IFACE_REALM## -->${AUS} ${mgmt_iface_replace_str}>${AUS}" "$CONFIG_FILE"
38+
# EOF CIAM-1394 correction
3739
elif [ "${mode}" = "cli" ]; then
3840
cat << EOF >> "${CLI_SCRIPT_FILE}"
3941
if (outcome != success) of /core-service=management/management-interface=http-interface:read-resource

‎modules/eap/setup/eap/modules/added/launch/datasource-common.sh‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ function inject_internal_datasources() {
109109
local dsConfMode
110110
getDataSourceConfigureMode "dsConfMode"
111111
if [ "${dsConfMode}" = "xml" ]; then
112-
sed -i "s|<!-- ##DATASOURCES## -->|${datasource}<!-- ##DATASOURCES## -->|" $CONFIG_FILE
112+
# CIAM-1394 correction
113+
sed -i "s${AUS}<!-- ##DATASOURCES## -->${AUS}${datasource}<!-- ##DATASOURCES## -->${AUS}" $CONFIG_FILE
114+
# EOF CIAM-1394 correction
113115
elif [ "${dsConfMode}" = "cli" ]; then
114116
echo "${datasource}" >> ${CLI_SCRIPT_FILE}
115117
fi
@@ -198,9 +200,11 @@ function writeEEDefaultDatasourceXml() {
198200
defaultDatasource=""
199201
fi
200202
# new format replacement : datasource="##DEFAULT_DATASOURCE##"
201-
sed -i "s|datasource=\"##DEFAULT_DATASOURCE##\"|${defaultDatasource}|" $CONFIG_FILE
203+
# CIAM-1394 correction
204+
sed -i "s${AUS}datasource=\"##DEFAULT_DATASOURCE##\"${AUS}${defaultDatasource}${AUS}" $CONFIG_FILE
202205
# old format (for compat)
203-
sed -i "s|<!-- ##DEFAULT_DATASOURCE## -->|${defaultDatasource}|" $CONFIG_FILE
206+
sed -i "s${AUS}<!-- ##DEFAULT_DATASOURCE## -->${AUS}${defaultDatasource}${AUS}" $CONFIG_FILE
207+
# EOF CIAM-1394 correction
204208
}
205209

206210
function writeEEDefaultDatasourceCli() {
@@ -416,7 +420,9 @@ function inject_connection_properties_to_datasource_xml() {
416420

417421
if [ "${failed}" != "true" ]; then
418422
for property in "${conn_props[@]}"; do
419-
prop_name=$(sed -e "s/${conn_prop_env_var}//g" <<< "${property}")
423+
# CIAM-1394 correction
424+
prop_name=$(sed -e "s${AUS}${conn_prop_env_var}${AUS}${AUS}g" <<< "${property}")
425+
# EOF CIAM-1394 correction
420426
prop_value=$(find_env "${property}")
421427
if [ ! -z "${prop_value}" ]; then
422428
ds="${ds}
@@ -588,7 +594,9 @@ function generate_external_datasource_cli() {
588594
else
589595
if [ "${failed}" != "true" ]; then
590596
for property in "${conn_props[@]}"; do
591-
prop_name=$(sed -e "s/${conn_prop_env_var}//g" <<< "${property}")
597+
# CIAM-1394 correction
598+
prop_name=$(sed -e "s${AUS}${conn_prop_env_var}${AUS}${AUS}g" <<< "${property}")
599+
# EOF CIAM-1394 correction
592600
prop_value=$(find_env "${property}")
593601
if [ ! -z "${prop_value}" ]; then
594602
ds_tmp_connection_properties["${prop_name}"]="${prop_value}"
@@ -758,7 +766,9 @@ function inject_default_timer_service() {
758766
<file-data-store name=\"default-file-store\" path=\"timer-service-data\" relative-to=\"jboss.server.data.dir\"/>\
759767
</data-stores>\
760768
</timer-service>"
761-
sed -i "s|<!-- ##TIMER_SERVICE## -->|${timerservice}|" $CONFIG_FILE
769+
# CIAM-1394 correction
770+
sed -i "s${AUS}<!-- ##TIMER_SERVICE## -->${AUS}${timerservice}${AUS}" $CONFIG_FILE
771+
# EOF CIAM-1394 correction
762772

763773
# We will use this file for validation later, so write here that we found a match
764774
touch "${TIMER_SERVICE_DATA_STORE_FILE}"
@@ -805,7 +815,9 @@ function inject_timer_service() {
805815
<database-data-store name=\"${datastore_name}\" datasource-jndi-name=\"${jndi_name}\" database=\"${databasename}\" partition=\"${pool_name}_part\" refresh-interval=\"${refresh_interval}\"/>
806816
</data-stores>\
807817
</timer-service>"
808-
sed -i "s|<!-- ##TIMER_SERVICE## -->|${timerservice}|" $CONFIG_FILE
818+
# CIAM-1394 correction
819+
sed -i "s${AUS}<!-- ##TIMER_SERVICE## -->${AUS}${timerservice}${AUS}" $CONFIG_FILE
820+
# EOF CIAM-1394 correction
809821

810822
# We will use this file for validation later, so write here that we found a match
811823
touch "${TIMER_SERVICE_DATA_STORE_FILE}"
@@ -1047,7 +1059,9 @@ function inject_datasource() {
10471059
local dsConfMode
10481060
getDataSourceConfigureMode "dsConfMode"
10491061
if [ "${dsConfMode}" = "xml" ]; then
1050-
sed -i "s|<!-- ##DATASOURCES## -->|${datasource}\n<!-- ##DATASOURCES## -->|" $CONFIG_FILE
1062+
# CIAM-1394 correction
1063+
sed -i "s${AUS}<!-- ##DATASOURCES## -->${AUS}${datasource}\n<!-- ##DATASOURCES## -->${AUS}" $CONFIG_FILE
1064+
# EOF CIAM-1394 correction
10511065
elif [ "${dsConfMode}" = "cli" ]; then
10521066
echo "${datasource}" >> ${CLI_SCRIPT_FILE}
10531067
fi
@@ -1073,7 +1087,9 @@ function inject_default_job_repository() {
10731087
getConfigurationMode "<!-- ##DEFAULT_JOB_REPOSITORY## -->" "dsConfMode"
10741088
if [ "${dsConfMode}" = "xml" ]; then
10751089
local defaultjobrepo=" <default-job-repository name=\"${1}\"/>"
1076-
sed -i "s|<!-- ##DEFAULT_JOB_REPOSITORY## -->|${defaultjobrepo%$'\n'}|" $CONFIG_FILE
1090+
# CIAM-1394 correction
1091+
sed -i "s${AUS}<!-- ##DEFAULT_JOB_REPOSITORY## -->${AUS}${defaultjobrepo%$'\n'}${AUS}" $CONFIG_FILE
1092+
# EOF CIAM-1394 correction
10771093

10781094
# We will use this file for validation later, so create it to indicate we found a match
10791095
touch "${DEFAULT_JOB_REPOSITORY_FILE}"
@@ -1115,7 +1131,9 @@ function inject_job_repository() {
11151131
</job-repository>\
11161132
<!-- ##JOB_REPOSITORY## -->"
11171133

1118-
sed -i "s|<!-- ##JOB_REPOSITORY## -->|${jobrepo%$'\n'}|" $CONFIG_FILE
1134+
# CIAM-1394 correction
1135+
sed -i "s${AUS}<!-- ##JOB_REPOSITORY## -->${AUS}${jobrepo%$'\n'}${AUS}" $CONFIG_FILE
1136+
# EOF CIAM-1394 correction
11191137

11201138
# We will use this file for validation later, so create it to indicate we found a match
11211139
touch "${DEFAULT_JOB_REPOSITORY_FILE}"

‎modules/eap/setup/eap/modules/added/launch/datasource.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ function configureEnv() {
3737
# TODO - I don't think this is being used any more? The real action seems to be in tx-datasource.sh
3838
if [ -n "$JDBC_STORE_JNDI_NAME" ]; then
3939
local jdbcStore="<jdbc-store datasource-jndi-name=\"${JDBC_STORE_JNDI_NAME}\"/>"
40-
sed -i "s|<!-- ##JDBC_STORE## -->|${jdbcStore}|" $CONFIG_FILE
40+
# CIAM-1394 correction
41+
sed -i "s${AUS}<!-- ##JDBC_STORE## -->${AUS}${jdbcStore}${AUS}" $CONFIG_FILE
42+
# EOF CIAM-1394 correction
4143
fi
4244

4345
}
@@ -93,4 +95,4 @@ function generate_datasource() {
9395
local url="${14}"
9496

9597
generate_datasource_common "${1}" "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" "${10}" "${11}" "${12}" "${13}" "${14}"
96-
}
98+
}

‎modules/eap/setup/eap/modules/added/launch/deploymentScanner.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ function configure_deployment_scanner() {
88
local auto_deploy_exploded
99
local explicitly_set=false
1010
if [[ -n "$JAVA_OPTS_APPEND" ]] && [[ $JAVA_OPTS_APPEND == *"Xdebug"* ]]; then
11-
sed -i "s|##AUTO_DEPLOY_EXPLODED##|true|" "$CONFIG_FILE"
11+
# CIAM-1394 correction
12+
sed -i "s${AUS}##AUTO_DEPLOY_EXPLODED##${AUS}true${AUS}" "$CONFIG_FILE"
13+
# EOF CIAM-1394 correction
1214
auto_deploy_exploded=true
1315
elif [ -n "$AUTO_DEPLOY_EXPLODED" ] || [ -n "$OPENSHIFT_AUTO_DEPLOY_EXPLODED" ]; then
1416
auto_deploy_exploded="${AUTO_DEPLOY_EXPLODED:-${OPENSHIFT_AUTO_DEPLOY_EXPLODED}}"
@@ -22,7 +24,9 @@ function configure_deployment_scanner() {
2224
getConfigurationMode "##AUTO_DEPLOY_EXPLODED##" "configure_mode"
2325

2426
if [ "${configure_mode}" = "xml" ]; then
25-
sed -i "s|##AUTO_DEPLOY_EXPLODED##|${auto_deploy_exploded}|" "$CONFIG_FILE"
27+
# CIAM-1394 correction
28+
sed -i "s${AUS}##AUTO_DEPLOY_EXPLODED##${AUS}${auto_deploy_exploded}${AUS}" "$CONFIG_FILE"
29+
# EOF CIAM-1394 correction
2630
elif [ "${configure_mode}" = "cli" ] && [ "${explicitly_set}" = "true" ]; then
2731
# We only do this if the variable was explicitly set. Otherwise we assume the user has provided their own configuration
2832

0 commit comments

Comments
 (0)