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

wrap errors in saving the client in an HTTP 400 (instead of HTTP 500) error 

Conflicts:

	openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
pull/650/head
Justin Richer 2013-09-13 14:22:42 -04:00
parent e11c0386d1
commit 122b0c4e8c
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,7 @@ public class ClientDynamicRegistrationEndpoint {
newClient.setDynamicallyRegistered(true); newClient.setDynamicallyRegistered(true);
// now save it // now save it
try {
ClientDetailsEntity savedClient = clientService.saveNewClient(newClient); ClientDetailsEntity savedClient = clientService.saveNewClient(newClient);
// generate the registration access token // generate the registration access token
@ -180,6 +181,12 @@ public class ClientDynamicRegistrationEndpoint {
//m.addAttribute("uri", config.getIssuer() + "register/" + savedClient.getClientId()); //m.addAttribute("uri", config.getIssuer() + "register/" + savedClient.getClientId());
return "clientInformationResponseView"; return "clientInformationResponseView";
} catch (IllegalArgumentException e) {
logger.error("Couldn't save client", e);
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
}
} else { } else {
// didn't parse, this is a bad request // didn't parse, this is a bad request
logger.error("registerNewClient failed; submitted JSON is malformed"); logger.error("registerNewClient failed; submitted JSON is malformed");
@ -278,6 +285,7 @@ public class ClientDynamicRegistrationEndpoint {
// make sure that the client doesn't ask for scopes it can't have // make sure that the client doesn't ask for scopes it can't have
newClient.setScope(scopeService.toStrings(allowedScopes)); newClient.setScope(scopeService.toStrings(allowedScopes));
try {
// save the client // save the client
ClientDetailsEntity savedClient = clientService.updateClient(oldClient, newClient); ClientDetailsEntity savedClient = clientService.updateClient(oldClient, newClient);
@ -297,6 +305,12 @@ public class ClientDynamicRegistrationEndpoint {
//m.addAttribute("uri", config.getIssuer() + "register/" + savedClient.getClientId()); //m.addAttribute("uri", config.getIssuer() + "register/" + savedClient.getClientId());
return "clientInformationResponseView"; return "clientInformationResponseView";
} catch (IllegalArgumentException e) {
logger.error("Couldn't save client", e);
m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
}
} else { } else {
// client mismatch // client mismatch
logger.error("readClientConfiguration failed, client ID mismatch: " logger.error("readClientConfiguration failed, client ID mismatch: "