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

pull request from extensions map

pull/544/merge
Justin Richer 2013-11-27 11:20:38 -05:00
parent 86e0f0c7ee
commit 39fb96a802
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
View File

@ -117,18 +117,26 @@ public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory {
} }
} }
if (inputParams.containsKey("max_age")) {
request.getExtensions().put("max_age", inputParams.get("max_age"));
}
if (inputParams.containsKey("request")) { if (inputParams.containsKey("request")) {
request.getExtensions().put("request", inputParams.get("request")); request.getExtensions().put("request", inputParams.get("request"));
processRequestObject(inputParams.get("request"), request); processRequestObject(inputParams.get("request"), request);
} }
if (request.getClientId() != null) {
ClientDetailsEntity client = clientDetailsService.loadClientByClientId(request.getClientId());
if ((request.getScope() == null || request.getScope().isEmpty())) { if ((request.getScope() == null || request.getScope().isEmpty())) {
if (request.getClientId() != null) {
ClientDetails client = clientDetailsService.loadClientByClientId(request.getClientId());
Set<String> clientScopes = client.getScope(); Set<String> clientScopes = client.getScope();
request.setScope(clientScopes); request.setScope(clientScopes);
} }
if (request.getExtensions().get("max_age") == null && client.getDefaultMaxAge() != null) {
request.getExtensions().put("max_age", client.getDefaultMaxAge().toString());
}
} }
return request; return request;

19
openid-connect-server/src/main/java/org/mitre/openid/connect/filter/PromptFilter.java
View File

@ -33,8 +33,11 @@ import javax.servlet.http.HttpSession;
import org.mitre.openid.connect.web.AuthenticationTimeStamper; import org.mitre.openid.connect.web.AuthenticationTimeStamper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.provider.AuthorizationRequest;
import org.springframework.security.oauth2.provider.OAuth2RequestFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.filter.GenericFilterBean;
@ -52,6 +55,9 @@ public class PromptFilter extends GenericFilterBean {
public final static String PROMPTED = "PROMPT_FILTER_PROMPTED"; public final static String PROMPTED = "PROMPT_FILTER_PROMPTED";
public final static String PROMPT_REQUESTED = "PROMPT_FILTER_REQUESTED"; public final static String PROMPT_REQUESTED = "PROMPT_FILTER_REQUESTED";
@Autowired
private OAuth2RequestFactory authRequestFactory;
/** /**
* *
*/ */
@ -60,11 +66,14 @@ public class PromptFilter extends GenericFilterBean {
HttpServletRequest request = (HttpServletRequest) req; HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) res; HttpServletResponse response = (HttpServletResponse) res;
AuthorizationRequest authRequest = authRequestFactory.createAuthorizationRequest(request.getParameterMap());
if (!Strings.isNullOrEmpty(request.getParameter("prompt"))) { if (authRequest.getExtensions().get("prompt") != null) {
// we have a "prompt" parameter // we have a "prompt" parameter
String prompt = (String)authRequest.getExtensions().get("prompt");
if (request.getParameter("prompt").equals("none")) { if (prompt.equals("none")) {
logger.info("Client requested no prompt"); logger.info("Client requested no prompt");
// see if the user's logged in // see if the user's logged in
Authentication auth = SecurityContextHolder.getContext().getAuthentication(); Authentication auth = SecurityContextHolder.getContext().getAuthentication();
@ -79,7 +88,7 @@ public class PromptFilter extends GenericFilterBean {
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Access Denied"); response.sendError(HttpServletResponse.SC_FORBIDDEN, "Access Denied");
return; return;
} }
} else if (request.getParameter("prompt").equals("login")) { } else if (prompt.equals("login")) {
// first see if the user's already been prompted in this session // first see if the user's already been prompted in this session
HttpSession session = request.getSession(); HttpSession session = request.getSession();
@ -111,9 +120,9 @@ public class PromptFilter extends GenericFilterBean {
chain.doFilter(req, res); chain.doFilter(req, res);
} }
} else if (!Strings.isNullOrEmpty(request.getParameter("max_age"))) { } else if (authRequest.getExtensions().get("max_age") != null) {
// TODO: issue #450 // TODO: issue #450
String maxAge = request.getParameter("max_age"); String maxAge = (String) authRequest.getExtensions().get("max_age");
HttpSession session = request.getSession(); HttpSession session = request.getSession();
Date authTime = (Date) session.getAttribute(AuthenticationTimeStamper.AUTH_TIMESTAMP); Date authTime = (Date) session.getAttribute(AuthenticationTimeStamper.AUTH_TIMESTAMP);