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

made timeout field optional, tokens don't expire in the default case

pull/620/head
Justin Richer 2014-06-12 19:37:32 -04:00
parent 276d846f4c
commit f4edd3164f
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml
View File

@ -29,10 +29,19 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd"> http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean"> <bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
<!-- This property sets the root URL of the server, known as the issuer. -->
<property name="issuer" value="http://localhost:8080/openid-connect-server-webapp/" /> <property name="issuer" value="http://localhost:8080/openid-connect-server-webapp/" />
<!-- This property is a URL pointing to a logo image 24px high to be used in the top bar -->
<property name="logoImageUrl" value="resources/images/openid_connect_small.png" /> <property name="logoImageUrl" value="resources/images/openid_connect_small.png" />
<!-- This property sets the display name of the server, displayed in the topbar and page title -->
<property name="topbarTitle" value="OpenID Connect Server" /> <property name="topbarTitle" value="OpenID Connect Server" />
<property name="regTokenLifeTime" value="172800" />
<!-- This property sets the lifetime of registration access tokens, in seconds. Leave it unset (null) for no rotation. -->
<!-- <property name="regTokenLifeTime" value="172800" /> -->
</bean> </bean>
</beans> </beans>

43
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
View File

@ -217,10 +217,6 @@ public class ClientDynamicRegistrationEndpoint {
logger.error("Unsupported encoding", e); logger.error("Unsupported encoding", e);
m.addAttribute("code", HttpStatus.INTERNAL_SERVER_ERROR); m.addAttribute("code", HttpStatus.INTERNAL_SERVER_ERROR);
return "httpCodeView"; return "httpCodeView";
} catch (ParseException e) {
logger.error("Invalid Token", e);
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} }
} else { } else {
@ -314,10 +310,6 @@ public class ClientDynamicRegistrationEndpoint {
logger.error("Unsupported encoding", e); logger.error("Unsupported encoding", e);
m.addAttribute("code", HttpStatus.INTERNAL_SERVER_ERROR); m.addAttribute("code", HttpStatus.INTERNAL_SERVER_ERROR);
return "httpCodeView"; return "httpCodeView";
} catch (ParseException e) {
logger.error("Invalid Token", e);
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} }
} else { } else {
// client mismatch // client mismatch
@ -528,18 +520,33 @@ public class ClientDynamicRegistrationEndpoint {
return newClient; return newClient;
} }
private OAuth2AccessTokenEntity fetchValidRegistrationToken(OAuth2Authentication auth, ClientDetailsEntity client) throws ParseException private OAuth2AccessTokenEntity fetchValidRegistrationToken(OAuth2Authentication auth, ClientDetailsEntity client) {
{
OAuth2AuthenticationDetails details = (OAuth2AuthenticationDetails) auth.getDetails(); OAuth2AuthenticationDetails details = (OAuth2AuthenticationDetails) auth.getDetails();
OAuth2AccessTokenEntity token = tokenService.readAccessToken(details.getTokenValue()); OAuth2AccessTokenEntity token = tokenService.readAccessToken(details.getTokenValue());
// Re-issue the token if it has been issued before [currentTime - validity]
Date validToDate = new Date(System.currentTimeMillis() - config.getRegTokenLifeTime() * 1000); if (config.getRegTokenLifeTime() != null) {
if(token.getJwt().getJWTClaimsSet().getIssueTime().before(validToDate))
{ try {
tokenService.revokeAccessToken(token); // Re-issue the token if it has been issued before [currentTime - validity]
token = connectTokenService.createRegistrationAccessToken(client); Date validToDate = new Date(System.currentTimeMillis() - config.getRegTokenLifeTime() * 1000);
tokenService.saveAccessToken(token); if(token.getJwt().getJWTClaimsSet().getIssueTime().before(validToDate)) {
logger.info("Rotating the registration access token for " + client.getClientId());
tokenService.revokeAccessToken(token);
OAuth2AccessTokenEntity newToken = connectTokenService.createRegistrationAccessToken(client);
tokenService.saveAccessToken(newToken);
return newToken;
} else {
// it's not expired, keep going
return token;
}
} catch (ParseException e) {
logger.error("Couldn't parse a known-valid token?", e);
return token;
}
} else {
// tokens don't expire, just return it
return token;
} }
return token;
} }
} }