Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 01:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AuthnRequestConverter Sample Typos

Browse Source 
Closes gh-10364
This commit is contained in:
Norbert Nowak 2021-11-01 12:42:57 +01:00 committed by Josh Cummings
parent 32d79f3f4e
commit 1c0f092176
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
docs/modules/ROOT/pages/servlet/saml2/login/authentication-requests.adoc
View File

@ -187,7 +187,7 @@ But, if you do need something from the request, then you can use create a custom
---- ----
@Component @Component
public class AuthnRequestConverter implements public class AuthnRequestConverter implements
Converter<MySaml2AuthenticationRequestContext, AuthnRequest> { Converter<Saml2AuthenticationRequestContext, AuthnRequest> {
private final AuthnRequestBuilder authnRequestBuilder; private final AuthnRequestBuilder authnRequestBuilder;
private final IssuerBuilder issuerBuilder; private final IssuerBuilder issuerBuilder;
@ -195,18 +195,17 @@ public class AuthnRequestConverter implements
// ... constructor // ... constructor
public AuthnRequest convert(Saml2AuthenticationRequestContext context) { public AuthnRequest convert(Saml2AuthenticationRequestContext context) {
MySaml2AuthenticationRequestContext myContext = (MySaml2AuthenticationRequestContext) context;
Issuer issuer = issuerBuilder.buildObject(); Issuer issuer = issuerBuilder.buildObject();
issuer.setValue(myContext.getIssuer()); issuer.setValue(context.getIssuer());
AuthnRequest authnRequest = authnRequestBuilder.buildObject(); AuthnRequest authnRequest = authnRequestBuilder.buildObject();
authnRequest.setIssuer(issuer); authnRequest.setIssuer(issuer);
authnRequest.setDestination(myContext.getDestination()); authnRequest.setDestination(context.getDestination());
authnRequest.setAssertionConsumerServiceURL(myContext.getAssertionConsumerServiceUrl()); authnRequest.setAssertionConsumerServiceURL(context.getAssertionConsumerServiceUrl());
// ... additional settings // ... additional settings
authRequest.setForceAuthn(myContext.getForceAuthn()); authRequest.setForceAuthn(context.getForceAuthn());
return authnRequest; return authnRequest;
} }
} }
@ -216,22 +215,21 @@ public class AuthnRequestConverter implements
[source,kotlin,role="secondary"] [source,kotlin,role="secondary"]
---- ----
@Component @Component
class AuthnRequestConverter : Converter<MySaml2AuthenticationRequestContext, AuthnRequest> { class AuthnRequestConverter : Converter<Saml2AuthenticationRequestContext, AuthnRequest> {
private val authnRequestBuilder: AuthnRequestBuilder? = null private val authnRequestBuilder: AuthnRequestBuilder? = null
private val issuerBuilder: IssuerBuilder? = null private val issuerBuilder: IssuerBuilder? = null
// ... constructor // ... constructor
override fun convert(context: MySaml2AuthenticationRequestContext): AuthnRequest { override fun convert(context: MySaml2AuthenticationRequestContext): AuthnRequest {
val myContext: MySaml2AuthenticationRequestContext = context
val issuer: Issuer = issuerBuilder.buildObject() val issuer: Issuer = issuerBuilder.buildObject()
issuer.value = myContext.getIssuer() issuer.value = context.getIssuer()
val authnRequest: AuthnRequest = authnRequestBuilder.buildObject() val authnRequest: AuthnRequest = authnRequestBuilder.buildObject()
authnRequest.issuer = issuer authnRequest.issuer = issuer
authnRequest.destination = myContext.getDestination() authnRequest.destination = context.getDestination()
authnRequest.assertionConsumerServiceURL = myContext.getAssertionConsumerServiceUrl() authnRequest.assertionConsumerServiceURL = context.getAssertionConsumerServiceUrl()
// ... additional settings // ... additional settings
authRequest.setForceAuthn(myContext.getForceAuthn()) authRequest.setForceAuthn(context.getForceAuthn())
return authnRequest return authnRequest
} }
} }
@ -246,12 +244,11 @@ Then, you can construct your own `Saml2AuthenticationRequestContextResolver` and
---- ----
@Bean @Bean
Saml2AuthenticationRequestContextResolver authenticationRequestContextResolver() { Saml2AuthenticationRequestContextResolver authenticationRequestContextResolver() {
Saml2AuthenticationRequestContextResolver resolver = Saml2AuthenticationRequestContextResolver resolver = new DefaultSaml2AuthenticationRequestContextResolver(relyingPartyRegistrationResolver);
new DefaultSaml2AuthenticationRequestContextResolver(); return request -> {
return request -> { Saml2AuthenticationRequestContext context = resolver.resolve(request);
Saml2AuthenticationRequestContext context = resolver.resolve(request); return context;
return new MySaml2AuthenticationRequestContext(context, request.getParameter("force") != null); };
};
} }
@Bean @Bean
@ -270,13 +267,9 @@ Saml2AuthenticationRequestFactory authenticationRequestFactory(
---- ----
@Bean @Bean
open fun authenticationRequestContextResolver(): Saml2AuthenticationRequestContextResolver { open fun authenticationRequestContextResolver(): Saml2AuthenticationRequestContextResolver {
val resolver: Saml2AuthenticationRequestContextResolver = DefaultSaml2AuthenticationRequestContextResolver() val resolver = DefaultSaml2AuthenticationRequestContextResolver(relyingPartyRegistrationResolver)
return Saml2AuthenticationRequestContextResolver { request: HttpServletRequest -> return Saml2AuthenticationRequestContextResolver { request ->
val context = resolver.resolve(request) resolver.resolve(request)
MySaml2AuthenticationRequestContext(
context,
request.getParameter("force") != null
)
} }
} }