[CIAM-1975] Apply one-off patch for CIAM-1975

Add image prelaunch check to verify it's properly installed

Signed-off-by: Jan Lieskovsky <[email protected]>

Author: Jan Lieskovsky

modules/sso/apply/patches/apply-eap-rh-sso-one-off-patches.sh

@@ -8,5 +8,7 @@ export JAVA_OPTS="${JAVA_OPTS} -Dorg.wildfly.patching.jar.invalidation=true"
 # Do not use for cycle, it would faile if no such files are found
 find "${SOURCES_DIR}" \( -name 'eap-one-off-*.zip' -o -name 'rh-sso-*.zip' \) | while read -r I; do
     echo "Applying patch: '$I' ..."
-    "${JBOSS_HOME}"/bin/jboss-cli.sh --command="patch apply $I"
+    # CIAM-1975 Prevent any possible 'Conflicts detected:' error while applying
+    # the patch by using the '--override-all' option of patch apply command
+    "${JBOSS_HOME}"/bin/jboss-cli.sh --command="patch apply $I --override-all"
 done

modules/sso/apply/patches/module.yaml

@@ -5,6 +5,13 @@ description: Module to apply any possibly needed EAP / RH-SSO one-off patches vi
 execute:
 - script: apply-eap-rh-sso-one-off-patches.sh
 
+artifacts:
+# CIAM-1975
+- md5: 8f54d950472fb9abf34e2f965303a5fc
+  name: rhsso-1974.zip
+  target: eap-one-off-rhsso-1974.zip
+  url: http://$DOWNLOAD_SERVER/devel/candidates/JBSSO/JBSSO-7.5.1-CIAM-1974-patch/rhsso-1974.zip
+
 # Note:
 #
 # All EAP one-offs artifacts must be prefixed with "eap-one-off-" prefix and suffixed with ".zip".

modules/sso/sso-pre-launch-checks/added/sso_image_pre_launch_checks.sh

@@ -10,6 +10,7 @@ function postConfigure() {
   verify_CVE_2020_10695_fix_present
   verify_KEYCLOAK_16736_fix_present
   verify_CIAM_1757_fix_present
+  verify_CIAM_1975_fix_present
 }
 
 # KEYCLOAK-13585 / RH BZ#1817530 / CVE-2020-10695:
@@ -75,3 +76,17 @@ function verify_CIAM_1757_fix_present() {
     exit "${errorExitCode}"
   fi
 }
+
+# CIAM-1975
+#
+# Verify one-off patch for CIAM-1975 got properly installed to the expected location
+#
+function verify_CIAM_1975_fix_present() {
+  local -r errorExitCode="1"
+  if ! find "${JBOSS_HOME}"/modules/system/layers -name '*-rhsso-1974.jar' 2> /dev/null | grep -q .
+  then
+    log_error "The CIAM-1975 one-off patch wasn't properly installed."
+    log_error "Cannot start the '${JBOSS_IMAGE_NAME}', version '${JBOSS_IMAGE_VERSION}'!"
+    exit "${errorExitCode}"
+  fi
+}