From bdf402562ba21e81d9a883f1ad7515bcbda9bb35 Mon Sep 17 00:00:00 2001 From: Danilo Piazzalunga Date: Thu, 8 May 2025 20:37:47 +0000 Subject: [PATCH 1/2] Update assertingparty property usage in YAML snippets Spring Boot 2.7 renamed spring.security.saml2.relyingparty.registration.*.identityprovider.* to spring.security.saml2.relyingparty.registration.*.assertingparty.*. Closes gh-12810. Signed-off-by: Danilo Piazzalunga --- .../pages/servlet/saml2/login/authentication-requests.adoc | 2 +- docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc b/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc index 4e0ec21d32e..1195cb2933f 100644 --- a/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc +++ b/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc @@ -67,7 +67,7 @@ spring: saml2: relyingparty: okta: - identityprovider: + assertingparty: entity-id: ... singlesignon.sign-request: false ---- diff --git a/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc b/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc index 396edb8bd27..53b0fc3fcbe 100644 --- a/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc +++ b/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc @@ -125,7 +125,7 @@ spring: relyingparty: registration: adfs: - identityprovider: + assertingparty: entity-id: https://idp.example.com/issuer verification.credentials: - certificate-location: "classpath:idp.crt" @@ -839,11 +839,11 @@ spring: signing.credentials: &relying-party-credentials - private-key-location: classpath:rp.key certificate-location: classpath:rp.crt - identityprovider: + assertingparty: entity-id: ... azure: signing.credentials: *relying-party-credentials - identityprovider: + assertingparty: entity-id: ... ---- From 37f72a9838adc158e77cf2d34c5e17574d9d91c6 Mon Sep 17 00:00:00 2001 From: Danilo Piazzalunga Date: Thu, 8 May 2025 20:46:25 +0000 Subject: [PATCH 2/2] Add missing registration property in YAML listing Signed-off-by: Danilo Piazzalunga --- .../saml2/login/authentication-requests.adoc | 9 ++++---- .../pages/servlet/saml2/login/overview.adoc | 21 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc b/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc index 1195cb2933f..2f794becf3e 100644 --- a/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc +++ b/docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc @@ -66,10 +66,11 @@ spring: security: saml2: relyingparty: - okta: - assertingparty: - entity-id: ... - singlesignon.sign-request: false + registration: + okta: + assertingparty: + entity-id: ... + singlesignon.sign-request: false ---- Java:: diff --git a/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc b/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc index 53b0fc3fcbe..e394fb2a088 100644 --- a/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc +++ b/docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc @@ -835,16 +835,17 @@ spring: security: saml2: relyingparty: - okta: - signing.credentials: &relying-party-credentials - - private-key-location: classpath:rp.key - certificate-location: classpath:rp.crt - assertingparty: - entity-id: ... - azure: - signing.credentials: *relying-party-credentials - assertingparty: - entity-id: ... + registration: + okta: + signing.credentials: &relying-party-credentials + - private-key-location: classpath:rp.key + certificate-location: classpath:rp.crt + assertingparty: + entity-id: ... + azure: + signing.credentials: *relying-party-credentials + assertingparty: + entity-id: ... ---- Second, in a database, you need not replicate the model of `RelyingPartyRegistration`.