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

Reset ConnectAuthorizationRequestManager to version from master

pull/263/merge
Amanda Anganes 2013-01-23 15:57:47 -05:00
parent 06f970e61b
commit dd8b48e863
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectAuthorizationRequestManager.java
View File

@ -15,7 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
import org.springframework.security.oauth2.common.exceptions.InvalidScopeException;
import org.springframework.security.oauth2.common.util.OAuth2Utils;
@ -77,43 +76,29 @@ public class ConnectAuthorizationRequestManager implements AuthorizationRequestM
String requestNonce = parameters.get("nonce");
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
boolean anonymous = false;
if (principal instanceof String) {
if (principal.toString().equals("anonymousUser")) {
anonymous = true;
}
}
//If a nonce was included in the request, process it
// if (requestNonce != null) {
//
// //Check request nonce for reuse
// Collection<Nonce> clientNonces = nonceService.getByClientId(client.getClientId());
// for (Nonce nonce : clientNonces) {
// if (nonce.getValue().equals(requestNonce)) {
// throw new NonceReuseException(client.getClientId(), nonce);
// }
// }
//
//
//
// if (principal != null && !anonymous) {
//
// //Store nonce
// Nonce nonce = new Nonce();
// nonce.setClientId(client.getClientId());
// nonce.setValue(requestNonce);
// DateTime now = new DateTime(new Date());
// nonce.setUseDate(now.toDate());
// DateTime expDate = now.plus(nonceStorageDuration);
// Date expirationJdkDate = expDate.toDate();
// nonce.setExpireDate(expirationJdkDate);
//
// nonceService.save(nonce);
// }
// }
if (requestNonce != null) {
//Check request nonce for reuse
Collection<Nonce> clientNonces = nonceService.getByClientId(client.getClientId());
for (Nonce nonce : clientNonces) {
if (nonce.getValue().equals(requestNonce)) {
throw new NonceReuseException(client.getClientId(), nonce);
}
}
//Store nonce
Nonce nonce = new Nonce();
nonce.setClientId(client.getClientId());
nonce.setValue(requestNonce);
DateTime now = new DateTime(new Date());
nonce.setUseDate(now.toDate());
DateTime expDate = now.plus(nonceStorageDuration);
Date expirationJdkDate = expDate.toDate();
nonce.setExpireDate(expirationJdkDate);
nonceService.save(nonce);
}
Set<String> scopes = OAuth2Utils.parseParameterList(parameters.get("scope"));
if ((scopes == null || scopes.isEmpty())) {