Merge pull request #233 from iankko/log4j

[CIAM-2055] Add one-off patch for log4j

Author: iankko

modules/sso/apply/patches/module.yaml

@@ -11,6 +11,11 @@ artifacts:
   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
+# CIAM-2055
+- md5: e131a6a7ab26779951981665b9e63919
+  name: rhsso-2054.zip
+  target: eap-one-off-rhsso-2054.zip
+  url: http://$DOWNLOAD_SERVER/devel/candidates/JBSSO/JBSSO-7.5.1-CIAM-2054-patch/rhsso-2054.zip
 
 # Note:
 #

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

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