Skip to content

Commit df4411f

Browse files
committed
Merge branch '5.7.x' into 5.8.x
2 parents b47420f + e834543 commit df4411f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

docs/modules/ROOT/pages/servlet/saml2/login/authentication.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ relyingPartyRegistrationBuilder.assertionConsumerServiceLocation("/saml2/login/s
9696
== Setting a Clock Skew
9797

9898
It's not uncommon for the asserting and relying parties to have system clocks that aren't perfectly synchronized.
99-
For that reason, you can configure `OpenSaml4AuthenticationProvider` 's default assertion validator with some tolerance:
99+
For that reason, you can configure ``OpenSaml4AuthenticationProvider``'s default assertion validator with some tolerance:
100100

101101
====
102102
.Java
@@ -238,7 +238,7 @@ open class SecurityConfig {
238238
<3> Third, return a custom authentication that includes the user details
239239

240240
[NOTE]
241-
It's not required to call `OpenSaml4AuthenticationProvider` 's default authentication converter.
241+
It's not required to call ``OpenSaml4AuthenticationProvider``'s default authentication converter.
242242
It returns a `Saml2AuthenticatedPrincipal` containing the attributes it extracted from ``AttributeStatement``s as well as the single `ROLE_USER` authority.
243243

244244
[[servlet-saml2login-opensamlauthenticationprovider-additionalvalidation]]
@@ -271,7 +271,7 @@ After verifying the signature, it will:
271271
1. Validate `<AudienceRestriction>` and `<DelegationRestriction>` conditions
272272
2. Validate ``<SubjectConfirmation>``s, expect for any IP address information
273273

274-
To perform additional validation, you can configure your own assertion validator that delegates to `OpenSaml4AuthenticationProvider` 's default and then performs its own.
274+
To perform additional validation, you can configure your own assertion validator that delegates to ``OpenSaml4AuthenticationProvider``'s default and then performs its own.
275275

276276
[[servlet-saml2login-opensamlauthenticationprovider-onetimeuse]]
277277
For example, you can use OpenSAML's `OneTimeUseConditionValidator` to also validate a `<OneTimeUse>` condition, like so:
@@ -325,7 +325,7 @@ provider.setAssertionValidator { assertionToken ->
325325
====
326326

327327
[NOTE]
328-
While recommended, it's not necessary to call `OpenSaml4AuthenticationProvider` 's default assertion validator.
328+
While recommended, it's not necessary to call ``OpenSaml4AuthenticationProvider``'s default assertion validator.
329329
A circumstance where you would skip it would be if you don't need it to check the `<AudienceRestriction>` or the `<SubjectConfirmation>` since you are doing those yourself.
330330

331331
[[servlet-saml2login-opensamlauthenticationprovider-decryption]]
@@ -337,7 +337,7 @@ Spring Security decrypts `<saml2:EncryptedAssertion>`, `<saml2:EncryptedAttribut
337337
The response decrypter is for decrypting encrypted elements of the `<saml2:Response>`, like `<saml2:EncryptedAssertion>`.
338338
The assertion decrypter is for decrypting encrypted elements of the `<saml2:Assertion>`, like `<saml2:EncryptedAttribute>` and `<saml2:EncryptedID>`.
339339

340-
You can replace `OpenSaml4AuthenticationProvider`'s default decryption strategy with your own.
340+
You can replace ``OpenSaml4AuthenticationProvider``'s default decryption strategy with your own.
341341
For example, if you have a separate service that decrypts the assertions in a `<saml2:Response>`, you can use it instead like so:
342342

343343
====

docs/modules/ROOT/pages/servlet/saml2/login/overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ There are two ``@Bean``s that Spring Boot generates for a relying party.
283283
The first is a `SecurityFilterChain` that configures the app as a relying party.
284284
When including `spring-security-saml2-service-provider`, the `SecurityFilterChain` looks like:
285285

286-
.Default JWT Configuration
286+
.Default SAML 2.0 Login Configuration
287287
====
288288
.Java
289289
[source,java,role="primary"]

0 commit comments

Comments
 (0)