Skip to content

Commit 399575a

Browse files
author
Jan Lieskovsky
committed
[CIAM-2055] Apply one-off patch for log4j
Add image prelaunch check to verify it's properly installed Signed-off-by: Jan Lieskovsky <[email protected]>
1 parent d834cef commit 399575a

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

modules/sso/apply/patches/module.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ artifacts:
1111
name: rhsso-1974.zip
1212
target: eap-one-off-rhsso-1974.zip
1313
url: http://$DOWNLOAD_SERVER/devel/candidates/JBSSO/JBSSO-7.5.1-CIAM-1974-patch/rhsso-1974.zip
14+
# CIAM-2055
15+
- md5: e131a6a7ab26779951981665b9e63919
16+
name: rhsso-2054.zip
17+
target: eap-one-off-rhsso-2054.zip
18+
url: http://$DOWNLOAD_SERVER/devel/candidates/JBSSO/JBSSO-7.5.1-CIAM-2054-patch/rhsso-2054.zip
1419

1520
# Note:
1621
#

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ function postConfigure() {
1111
verify_KEYCLOAK_16736_fix_present
1212
verify_CIAM_1757_fix_present
1313
verify_CIAM_1975_fix_present
14+
verify_CIAM_2055_fix_present
1415
}
1516

1617
# KEYCLOAK-13585 / RH BZ#1817530 / CVE-2020-10695:
@@ -90,3 +91,17 @@ function verify_CIAM_1975_fix_present() {
9091
exit "${errorExitCode}"
9192
fi
9293
}
94+
95+
# CIAM-2055
96+
#
97+
# Verify one-off patch for CIAM-2055 got properly installed to the expected location
98+
#
99+
function verify_CIAM_2055_fix_present() {
100+
local -r errorExitCode="1"
101+
if ! find "${JBOSS_HOME}"/modules/system/layers -name '*-rhsso-2054.jar' 2> /dev/null | grep -q .
102+
then
103+
log_error "The CIAM-2055 one-off patch wasn't properly installed."
104+
log_error "Cannot start the '${JBOSS_IMAGE_NAME}', version '${JBOSS_IMAGE_VERSION}'!"
105+
exit "${errorExitCode}"
106+
fi
107+
}

0 commit comments

Comments
 (0)