diff --git a/oc-sso-notificatie/src/main/java/nl/kennisnet/services/web/controller/SsoNotificationController.java b/oc-sso-notificatie/src/main/java/nl/kennisnet/services/web/controller/SsoNotificationController.java index 93ca8ab..850d70c 100644 --- a/oc-sso-notificatie/src/main/java/nl/kennisnet/services/web/controller/SsoNotificationController.java +++ b/oc-sso-notificatie/src/main/java/nl/kennisnet/services/web/controller/SsoNotificationController.java @@ -81,9 +81,11 @@ public class SsoNotificationController { private static final String SSONOT_FAILED = "SSONOT_FAILED"; + private static final String SSONOT_INITIATED = "SSONOT_INITIATED"; + private static final String SSONOT_REDIRECT = "SSONOT_REDIRECT"; - private static final String SSONOT_SUCCESS= "SSONOT_SUCCESS"; + private static final String SSONOT_SUCCESS = "SSONOT_SUCCESS"; /** The name of the SSO Cookie notification ({@value}) */ public static final String COOKIE_NOTIFICATION = "ssonot"; @@ -128,11 +130,14 @@ public void processSsoNotification(@RequestParam(required = false) String id, HttpServletRequest request, HttpServletResponse response) throws IOException { + // Add IdP id to logback and set the MDC event to INITIATE + MDC.put(IDP, String.valueOf(id)); + MDC.put(EVENT, SSONOT_INITIATED); + LOGGER.info("Request received with id ('{}') url ('{}') redirectUri ('{}') referrer ('{}') realm ('{}') " + "notificationCookie ('{}')", id, url, redirectUri, referrer, realm, notificationCookie); - // Add IdP id to logback and set default to failed - MDC.put(IDP, String.valueOf(id)); + // Set default MDC event to FAILED MDC.put(EVENT, SSONOT_FAILED); List remoteSsoNotifications = idPProvider.getAllSsoNotifications(); @@ -157,7 +162,8 @@ public void processSsoNotification(@RequestParam(required = false) String id, URL createdUrl = determineAndVerifyURL(idp, url, referrer); - // Set notification cookie + // Put the MDC event to SUCCESS and place notification cookie + MDC.put(EVENT, SSONOT_SUCCESS); LOGGER.info("Setting notification Cookie ('{}') for id ('{}') with url ('{}') and realm ('{}')", COOKIE_NOTIFICATION, id, createdUrl, realm); @@ -171,7 +177,6 @@ public void processSsoNotification(@RequestParam(required = false) String id, response.sendRedirect(redirectUri); return; } - MDC.put(EVENT, SSONOT_SUCCESS); EVENT_LOGGER.info("Finished without redirecting"); } diff --git a/pom.xml b/pom.xml index 4f110c3..bee3a7a 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.6 + 3.5.7 @@ -49,7 +49,7 @@ 17 1.5 0.8.13 - 12.1.6 + 12.1.9 1.7.0 7.4 2.8 @@ -194,17 +194,25 @@ Kok.Stephan@kpmg.nl - mutlu01 - Aram Mutlu + schaafsma01 + Donovan Schaafsma KPMG Advisory N.V. Developer - Mutlu.Aram@kpmg.nl + Schaafsma.Donovan@kpmg.nl + + Aram Mutlu + KPMG Advisory N.V. + + Developer + + Mutlu.Aram@kpmg.nl + Vincent Jong KPMG Advisory N.V. diff --git a/release/pom.xml b/release/pom.xml index 6723cdc..0dc6c69 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -31,7 +31,7 @@ - 2.3.7,2.3.6,2.3.5,2.3.4,2.3.3,2.3.2,2.3.1,2.3.0,2.2.1,2.2.0,2.1.1,2.1.0,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,1.0.0 + 2.3.8,2.3.7,2.3.6,2.3.5,2.3.4,2.3.3,2.3.2,2.3.1,2.3.0,2.2.1,2.2.0,2.1.1,2.1.0,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,1.0.0 diff --git a/release/src/site/markdown/docs/2.3.8/release-notes.md b/release/src/site/markdown/docs/2.3.8/release-notes.md new file mode 100644 index 0000000..4bba334 --- /dev/null +++ b/release/src/site/markdown/docs/2.3.8/release-notes.md @@ -0,0 +1,24 @@ +# OC SSO Notification Service - Release Notes + +| Field | Value | +|:--------------------------|:----------------------------| +| Application | OC SSO Notification Service | +| Version | 2.3.8 | +| Changes since version | 2.3.7 | +| Release date | 18-11-2025 (dd-mm-yyyy) | +| Delivery type | Full release | + +## Changes + +| # | Description | +|:---------|:--------------------------------------------------------------| +| ENT-5279 | SSO notification seems to log 'SSONOT_FAILED' when successful | +| ENT-5318 | Build release OC SSO Notification 2.3.8 | + +## Configuration changes + +None. + +## Known vulnerabilities + +At the time of release, this version of the application had no known vulnerabilities with a CVE of 7 or higher.