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

added passthrough of userinfo for remote OIDC users

pull/359/head
Justin Richer 2013-06-12 10:39:20 -04:00
parent 48e8f5edad
commit 8290d198c2
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java
View File

@ -24,6 +24,7 @@ import java.security.Principal;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.mitre.openid.connect.client.OIDCAuthenticationToken;
import org.mitre.openid.connect.model.UserInfo; import org.mitre.openid.connect.model.UserInfo;
import org.mitre.openid.connect.service.UserInfoService; import org.mitre.openid.connect.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -48,16 +49,22 @@ public class UserInfoInterceptor extends HandlerInterceptorAdapter {
// get our principal from the security context // get our principal from the security context
Principal p = request.getUserPrincipal(); Principal p = request.getUserPrincipal();
if (p != null && p.getName() != null) { // don't bother checking if we don't have a principal if (p instanceof OIDCAuthenticationToken) {
// if they're logging into this server from a remote OIDC server, pass through their user info
// try to look up a user based on it OIDCAuthenticationToken oidc = (OIDCAuthenticationToken) p;
UserInfo user = userInfoService.getBySubject(p.getName()); modelAndView.addObject("userInfo", oidc.getUserInfo());
} else {
// if we have one, inject it so views can use it if (p != null && p.getName() != null) { // don't bother checking if we don't have a principal
if (user != null) {
modelAndView.addObject("userInfo", user); // try to look up a user based on the principal's name
UserInfo user = userInfoService.getBySubject(p.getName());
// if we have one, inject it so views can use it
if (user != null) {
modelAndView.addObject("userInfo", user);
}
} }
} }
} }
} }