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

updated request object forwarding hack

pull/306/merge
Justin Richer 2013-03-01 15:46:36 -05:00
parent 913320d7a3
commit 13a3e97113
3 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,40 +1,62 @@
package org.mitre.openid.connect.web; package org.mitre.openid.connect.web;
import java.security.Principal; import java.net.URI;
import java.util.Map; import java.net.URISyntaxException;
import java.text.ParseException;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.apache.http.client.utils.URIBuilder;
import org.springframework.security.oauth2.provider.endpoint.AuthorizationEndpoint; import org.springframework.stereotype.Component;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.servlet.ModelAndView;
// import com.google.common.base.Strings;
// TODO: make this into a controller again, use the forward: or redirect: mechanism to send to auth endpoint import com.nimbusds.jwt.JWT;
// import com.nimbusds.jwt.JWTParser;
//@Controller("requestObjectAuthorzationEndpoint")
/**
* This @Controller is a hack to get around SECOAUTH's AuthorizationEndpoint requiring the response_type parameter to be passed in.
*
* @author jricher
*
*/
@Controller("requestObjectAuthorzationEndpoint")
//@Component
public class RequestObjectAuthorizationEndpoint { public class RequestObjectAuthorizationEndpoint {
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
@Autowired @RequestMapping(value = "/authorize", params = "request")
private AuthorizationEndpoint authorizationEndpoint; public String authorizeRequestObject(@RequestParam("request") String jwtString, @RequestParam(value = "response_type", required = false) String responseType, HttpServletRequest request) {
@RequestMapping(value = "/oauth/authorize", params = "request") String query = request.getQueryString();
public ModelAndView authorizeRequestObject(Map<String, Object> model, @RequestParam("request") String jwtString,
@RequestParam Map<String, String> parameters, SessionStatus sessionStatus, Principal principal) {
/* if (responseType == null) {
* try {
* SEE Processing code in ConnectAuthorizationRequestManager.processRequestObject JWT requestObject = JWTParser.parse(jwtString);
* responseType = (String)requestObject.getJWTClaimsSet().getClaim("response_type");
*/
return null; URI uri = new URIBuilder(Strings.nullToEmpty(request.getServletPath()) + Strings.nullToEmpty(request.getPathInfo()) + "?" + query)
.addParameter("response_type", responseType)
.build();
query = uri.getRawQuery();//uri.toString();
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
return "forward:/oauth/authorize?" + query;
} }

2
openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
View File

@ -27,7 +27,7 @@
</mvc:interceptors> </mvc:interceptors>
<mvc:default-servlet-handler /> <mvc:default-servlet-handler />
<!-- Bean to hold configuration propreties --> <!-- Bean to hold configuration properties -->
<import resource="server-config.xml" /> <import resource="server-config.xml" />
<!-- Import the data context --> <!-- Import the data context -->

2
pom.xml
View File

@ -244,7 +244,7 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.1.1</version> <version>4.2.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>