mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-06-25 05:22:16 +00:00
Merge branch '6.3.x' into 6.4.x
This commit is contained in:
commit
5ba4ab5e11
@ -103,10 +103,11 @@ spring:
|
|||||||
security:
|
security:
|
||||||
saml2:
|
saml2:
|
||||||
relyingparty:
|
relyingparty:
|
||||||
okta:
|
registration:
|
||||||
identityprovider:
|
okta:
|
||||||
entity-id: ...
|
assertingparty:
|
||||||
singlesignon.sign-request: false
|
entity-id: ...
|
||||||
|
singlesignon.sign-request: false
|
||||||
----
|
----
|
||||||
|
|
||||||
Java::
|
Java::
|
||||||
|
@ -125,7 +125,7 @@ spring:
|
|||||||
relyingparty:
|
relyingparty:
|
||||||
registration:
|
registration:
|
||||||
adfs:
|
adfs:
|
||||||
identityprovider:
|
assertingparty:
|
||||||
entity-id: https://idp.example.com/issuer
|
entity-id: https://idp.example.com/issuer
|
||||||
verification.credentials:
|
verification.credentials:
|
||||||
- certificate-location: "classpath:idp.crt"
|
- certificate-location: "classpath:idp.crt"
|
||||||
@ -886,16 +886,17 @@ spring:
|
|||||||
security:
|
security:
|
||||||
saml2:
|
saml2:
|
||||||
relyingparty:
|
relyingparty:
|
||||||
okta:
|
registration:
|
||||||
signing.credentials: &relying-party-credentials
|
okta:
|
||||||
- private-key-location: classpath:rp.key
|
signing.credentials: &relying-party-credentials
|
||||||
certificate-location: classpath:rp.crt
|
- private-key-location: classpath:rp.key
|
||||||
identityprovider:
|
certificate-location: classpath:rp.crt
|
||||||
entity-id: ...
|
assertingparty:
|
||||||
azure:
|
entity-id: ...
|
||||||
signing.credentials: *relying-party-credentials
|
azure:
|
||||||
identityprovider:
|
signing.credentials: *relying-party-credentials
|
||||||
entity-id: ...
|
assertingparty:
|
||||||
|
entity-id: ...
|
||||||
----
|
----
|
||||||
|
|
||||||
Second, in a database, you need not replicate the model of `RelyingPartyRegistration`.
|
Second, in a database, you need not replicate the model of `RelyingPartyRegistration`.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user