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 expiration to id tokens

pull/165/merge
Amanda Anganes 2012-08-09 12:43:13 -04:00
parent 6bb9f67f5e
commit 170036e0b8
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
View File

@ -20,7 +20,9 @@ import java.util.Date;
import java.util.UUID; import java.util.UUID;
import org.mitre.jwt.signer.service.JwtSigningAndValidationService; import org.mitre.jwt.signer.service.JwtSigningAndValidationService;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.oauth2.model.OAuth2AccessTokenEntity; import org.mitre.oauth2.model.OAuth2AccessTokenEntity;
import org.mitre.oauth2.service.ClientDetailsEntityService;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean; import org.mitre.openid.connect.config.ConfigurationPropertiesBean;
import org.mitre.openid.connect.model.IdToken; import org.mitre.openid.connect.model.IdToken;
import org.mitre.openid.connect.model.IdTokenClaims; import org.mitre.openid.connect.model.IdTokenClaims;
@ -28,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.provider.ClientDetailsService;
import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.security.oauth2.provider.token.TokenEnhancer; import org.springframework.security.oauth2.provider.token.TokenEnhancer;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -45,6 +48,9 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
@Autowired @Autowired
private JwtSigningAndValidationService jwtService; private JwtSigningAndValidationService jwtService;
@Autowired
private ClientDetailsEntityService clientService;
@Override @Override
public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) { public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) {
@ -87,8 +93,14 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
IdTokenClaims claims = new IdTokenClaims(); IdTokenClaims claims = new IdTokenClaims();
claims.setAuthTime(new Date()); claims.setAuthTime(new Date());
claims.setIssuedAt(new Date()); claims.setIssuedAt(new Date());
//TODO: Set expiration
//claims.setExpiration(new Date()); ClientDetailsEntity client = clientService.loadClientByClientId(clientId);
if (client.getIdTokenValiditySeconds() != null) {
Date expiration = new Date(System.currentTimeMillis() + (client.getIdTokenValiditySeconds() * 1000L));
claims.setExpiration(expiration);
}
claims.setIssuer(configBean.getIssuer()); claims.setIssuer(configBean.getIssuer());
claims.setUserId(userId); claims.setUserId(userId);
claims.setAudience(clientId); claims.setAudience(clientId);
@ -130,4 +142,12 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
this.jwtService = jwtService; this.jwtService = jwtService;
} }
public ClientDetailsEntityService getClientService() {
return clientService;
}
public void setClientService(ClientDetailsEntityService clientService) {
this.clientService = clientService;
}
} }