github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 🐛 Fix storing SavedUserAuth 

Caused SAML claim sources not to work in USERINFO and ID_TOKEN
pull/1580/head
Dominik Frantisek Bucik 2022-04-06 12:34:56 +02:00
parent 9bd4bac4ae
commit c83ecc28e2
No known key found for this signature in database
GPG Key ID: 25014C8DB2E7E62D
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/SavedUserAuthentication.java
View File

@ -100,17 +100,21 @@ public class SavedUserAuthentication implements Authentication {
setAuthorities(new HashSet<>(src.getAuthorities())); setAuthorities(new HashSet<>(src.getAuthorities()));
setAuthenticated(src.isAuthenticated()); setAuthenticated(src.isAuthenticated());
if (src instanceof SavedUserAuthentication) { if (src instanceof SavedUserAuthentication) {
this.setAcr(((SavedUserAuthentication) src).getAcr()); SavedUserAuthentication source = (SavedUserAuthentication) src;
this.setAcr(source.getAcr());
this.setAuthenticationDetails(source.getAuthenticationDetails());
} else if (src instanceof ExpiringUsernameAuthenticationToken) { } else if (src instanceof ExpiringUsernameAuthenticationToken) {
ExpiringUsernameAuthenticationToken token = (ExpiringUsernameAuthenticationToken) src; ExpiringUsernameAuthenticationToken token = (ExpiringUsernameAuthenticationToken) src;
this.acr = ((SamlPrincipal) token.getPrincipal()).getSamlCredential() SAMLCredential credential = ((SamlPrincipal) token.getPrincipal()).getSamlCredential();
this.setAcr(credential
.getAuthenticationAssertion() .getAuthenticationAssertion()
.getAuthnStatements().stream() .getAuthnStatements().stream()
.map(AuthnStatement::getAuthnContext) .map(AuthnStatement::getAuthnContext)
.map(AuthnContext::getAuthnContextClassRef) .map(AuthnContext::getAuthnContextClassRef)
.map(AuthnContextClassRef::getAuthnContextClassRef) .map(AuthnContextClassRef::getAuthnContextClassRef)
.collect(Collectors.joining()); .collect(Collectors.joining())
this.authenticationDetails = new SamlAuthenticationDetails((SAMLCredential) src.getCredentials()); );
this.setAuthenticationDetails(new SamlAuthenticationDetails(credential));
} }
} }