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

Working on request object userinfo parsing

pull/263/merge
Amanda Anganes 2013-01-10 14:44:36 -05:00
parent 779001a8c8
commit 67e8714671
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCSignedRequestFilter.java
View File

@ -64,7 +64,7 @@ public class OIDCSignedRequestFilter extends AbstractOIDCAuthenticationFilter im
"An Authorization Endpoint URI must be supplied"); "An Authorization Endpoint URI must be supplied");
Assert.notNull(oidcServerConfig.getTokenEndpointUrl(), Assert.notNull(oidcServerConfig.getTokenEndpointUrl(),
"A Token ID Endpoint URI must be supplied"); "A Token Endpoint URI must be supplied");
Assert.notNull(oidcServerConfig.getClientId(), Assert.notNull(oidcServerConfig.getClientId(),
"A Client ID must be supplied"); "A Client ID must be supplied");

24
openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java
View File

@ -75,7 +75,18 @@ public class JSONUserInfoView extends AbstractView {
try { try {
out = response.getWriter(); out = response.getWriter();
gson.toJson(toJson(userInfo, scope), out);
if (model.get("requestObject") != null) {
String jsonString = (String)model.get("requestObject");
JsonObject requestObject = gson.fromJson(jsonString, JsonObject.class);
gson.toJson(toJsonFromRequestObj(userInfo, scope, requestObject));
} else {
gson.toJson(toJson(userInfo, scope), out);
}
} catch (IOException e) { } catch (IOException e) {
@ -135,4 +146,15 @@ public class JSONUserInfoView extends AbstractView {
return obj; return obj;
} }
private JsonObject toJsonFromRequestObj(UserInfo ui, Set<String> scope, JsonObject requestObj) {
JsonObject obj = new JsonObject();
return obj;
}
} }

6
openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java
View File

@ -105,9 +105,9 @@ public class RequestObjectAuthorizationEndpoint {
String requestUri = claims.getClaimAsString("request_uri"); String requestUri = claims.getClaimAsString("request_uri");
if (requestUri != null) { if (requestUri != null) {
if (parameters.containsKey("request_uri") == false) { //The spec does not allow a client to send a request parameter AND
parameters.put("request_uri", requestUri); //link to a hosted request object at the same time, so this is an error.
} //TODO: what error to throw?
} }
// call out to the SECOAUTH endpoint to do the real processing // call out to the SECOAUTH endpoint to do the real processing

1
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
View File

@ -88,6 +88,7 @@ public class UserInfoEndpoint {
OAuth2Authentication authentication = (OAuth2Authentication)p; OAuth2Authentication authentication = (OAuth2Authentication)p;
model.addAttribute("scope", authentication.getAuthorizationRequest().getScope()); model.addAttribute("scope", authentication.getAuthorizationRequest().getScope());
model.addAttribute("requestObject", authentication.getAuthorizationRequest().getAuthorizationParameters().get("request"));
} }
model.addAttribute("userInfo", userInfo); model.addAttribute("userInfo", userInfo);