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

Fixing up logging changes

pull/306/merge
Amanda Anganes 2013-03-08 09:52:24 -05:00
parent f9b0670ae9
commit 8992506a1d
12 changed files with 69 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java
View File

@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
import org.springframework.security.oauth2.common.exceptions.InvalidScopeException;
import org.springframework.security.oauth2.common.exceptions.InvalidTokenException; import org.springframework.security.oauth2.common.exceptions.InvalidTokenException;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
@ -50,7 +48,7 @@ public class IntrospectionEndpoint {
@Autowired @Autowired
private ClientDetailsEntityService clientService; private ClientDetailsEntityService clientService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(IntrospectionEndpoint.class);
public IntrospectionEndpoint() { public IntrospectionEndpoint() {
@ -66,7 +64,7 @@ public class IntrospectionEndpoint {
Map<String, Object> model = new HashMap<String, Object>(); Map<String, Object> model = new HashMap<String, Object>();
model.put("entity", e); model.put("entity", e);
logger.error("IntrospectionEndpoint InvalidTokenException: " + ex.getStackTrace().toString()); logger.error("InvalidTokenException: " + ex.getStackTrace().toString());
model.put("code", HttpStatus.BAD_REQUEST); model.put("code", HttpStatus.BAD_REQUEST);
@ -97,7 +95,7 @@ public class IntrospectionEndpoint {
}*/ }*/
if (Strings.isNullOrEmpty(tokenValue)) { if (Strings.isNullOrEmpty(tokenValue)) {
logger.error("IntrospectionEndpoint: verify failed; token value is null"); logger.error("Verify failed; token value is null");
modelAndView.addObject("code", HttpStatus.BAD_REQUEST); modelAndView.addObject("code", HttpStatus.BAD_REQUEST);
modelAndView.setViewName("httpCodeView"); modelAndView.setViewName("httpCodeView");
return modelAndView; return modelAndView;
@ -108,7 +106,7 @@ public class IntrospectionEndpoint {
try { try {
token = tokenServices.readAccessToken(tokenValue); token = tokenServices.readAccessToken(tokenValue);
} catch (AuthenticationException e) { } catch (AuthenticationException e) {
logger.error("IntrospectionEndpoint: verify failed; AuthenticationException: " + e.getStackTrace().toString()); logger.error("Verify failed; AuthenticationException: " + e.getStackTrace().toString());
modelAndView.addObject("code", HttpStatus.FORBIDDEN); modelAndView.addObject("code", HttpStatus.FORBIDDEN);
modelAndView.setViewName("httpCodeView"); modelAndView.setViewName("httpCodeView");
return modelAndView; return modelAndView;
@ -130,20 +128,20 @@ public class IntrospectionEndpoint {
modelAndView.addObject("entity", token); modelAndView.addObject("entity", token);
return modelAndView; return modelAndView;
} else { } else {
logger.error("IntrospectionEndpoint: verify failed; client tried to introspect a token of an incorrect scope"); logger.error("Verify failed; client tried to introspect a token of an incorrect scope");
modelAndView.addObject("code", HttpStatus.BAD_REQUEST); modelAndView.addObject("code", HttpStatus.BAD_REQUEST);
modelAndView.setViewName("httpCodeView"); modelAndView.setViewName("httpCodeView");
return modelAndView; return modelAndView;
} }
} else { } else {
logger.error("IntrospectionEndpoint: verify failed; client " + clientId + " is not allowed to call introspection endpoint"); logger.error("Verify failed; client " + clientId + " is not allowed to call introspection endpoint");
modelAndView.addObject("code", HttpStatus.BAD_REQUEST); modelAndView.addObject("code", HttpStatus.BAD_REQUEST);
modelAndView.setViewName("httpCodeView"); modelAndView.setViewName("httpCodeView");
return modelAndView; return modelAndView;
} }
} else { } else {
//TODO: Log error client not found //TODO: Log error client not found
logger.error("IntrospectionEndpoint: verify failed; client " + clientId + " not found."); logger.error("Verify failed; client " + clientId + " not found.");
modelAndView.addObject("code", HttpStatus.NOT_FOUND); modelAndView.addObject("code", HttpStatus.NOT_FOUND);
modelAndView.setViewName("httpCodeView"); modelAndView.setViewName("httpCodeView");
return modelAndView; return modelAndView;

10
openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
View File

@ -22,7 +22,6 @@ import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.mitre.oauth2.exception.ClientNotFoundException;
import org.mitre.oauth2.model.SystemScope; import org.mitre.oauth2.model.SystemScope;
import org.mitre.oauth2.service.ClientDetailsEntityService; import org.mitre.oauth2.service.ClientDetailsEntityService;
import org.mitre.oauth2.service.SystemScopeService; import org.mitre.oauth2.service.SystemScopeService;
@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
import org.springframework.security.oauth2.provider.AuthorizationRequest; import org.springframework.security.oauth2.provider.AuthorizationRequest;
import org.springframework.security.oauth2.provider.ClientDetails; import org.springframework.security.oauth2.provider.ClientDetails;
@ -57,7 +55,7 @@ public class OAuthConfirmationController {
@Autowired @Autowired
private SystemScopeService scopeService; private SystemScopeService scopeService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(OAuthConfirmationController.class);
public OAuthConfirmationController() { public OAuthConfirmationController() {
@ -78,19 +76,19 @@ public class OAuthConfirmationController {
try { try {
client = clientService.loadClientByClientId(clientAuth.getClientId()); client = clientService.loadClientByClientId(clientAuth.getClientId());
} catch (OAuth2Exception e) { } catch (OAuth2Exception e) {
logger.error("OAuthConfirmationController: confirmAccess: OAuth2Exception was thrown when attempting to load client: " logger.error("confirmAccess: OAuth2Exception was thrown when attempting to load client: "
+ e.getStackTrace().toString()); + e.getStackTrace().toString());
model.put("code", HttpStatus.BAD_REQUEST); model.put("code", HttpStatus.BAD_REQUEST);
return new ModelAndView("httpCodeView"); return new ModelAndView("httpCodeView");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
logger.error("OAuthConfirmationController: confirmAccess: IllegalArgumentException was thrown when attempting to load client: " logger.error("confirmAccess: IllegalArgumentException was thrown when attempting to load client: "
+ e.getStackTrace().toString()); + e.getStackTrace().toString());
model.put("code", HttpStatus.BAD_REQUEST); model.put("code", HttpStatus.BAD_REQUEST);
return new ModelAndView("httpCodeView"); return new ModelAndView("httpCodeView");
} }
if (client == null) { if (client == null) {
logger.error("OAuthConfirmationController: confirmAccess: could not find client " + clientAuth.getClientId()); logger.error("confirmAccess: could not find client " + clientAuth.getClientId());
model.put("code", HttpStatus.NOT_FOUND); model.put("code", HttpStatus.NOT_FOUND);
return new ModelAndView("httpCodeView"); } return new ModelAndView("httpCodeView"); }

2
openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java
View File

@ -39,7 +39,7 @@ public class RevocationEndpoint {
@Autowired @Autowired
OAuth2TokenEntityService tokenServices; OAuth2TokenEntityService tokenServices;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(RevocationEndpoint.class);
public RevocationEndpoint() { public RevocationEndpoint() {

12
openid-connect-server/src/main/java/org/mitre/oauth2/web/ScopeAPI.java
View File

@ -33,7 +33,7 @@ public class ScopeAPI {
@Autowired @Autowired
private SystemScopeService scopeService; private SystemScopeService scopeService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(ScopeAPI.class);
private Gson gson = new Gson(); private Gson gson = new Gson();
@ -59,7 +59,7 @@ public class ScopeAPI {
return "jsonEntityView"; return "jsonEntityView";
} else { } else {
logger.error("ScopeAPI: getScope failed; scope not found: " + id); logger.error("getScope failed; scope not found: " + id);
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
@ -86,7 +86,7 @@ public class ScopeAPI {
return "jsonEntityView"; return "jsonEntityView";
} else { } else {
logger.error("ScopeAPI: updateScope failed; scope ids to not match: got " logger.error("updateScope failed; scope ids to not match: got "
+ existing.getId() + " and " + scope.getId()); + existing.getId() + " and " + scope.getId());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
@ -96,7 +96,7 @@ public class ScopeAPI {
} else { } else {
logger.error("ScopeAPI: updateScope failed; scope with id " + id + " not found."); logger.error("updateScope failed; scope with id " + id + " not found.");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
@ -117,7 +117,7 @@ public class ScopeAPI {
return "jsonEntityView"; return "jsonEntityView";
} else { } else {
logger.error("ScopeAPI: createScope failed; JSON was invalid: " + json); logger.error("createScope failed; JSON was invalid: " + json);
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
@ -137,7 +137,7 @@ public class ScopeAPI {
return "httpCodeView"; return "httpCodeView";
} else { } else {
logger.error("ScopeAPI: deleteScope failed; scope with id " + id + " not found."); logger.error("deleteScope failed; scope with id " + id + " not found.");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";

10
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java
View File

@ -31,7 +31,7 @@ public class ApprovedSiteAPI {
@Autowired @Autowired
private ApprovedSiteService approvedSiteService; private ApprovedSiteService approvedSiteService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(ApprovedSiteAPI.class);
/** /**
* Get a list of all of this user's approved sites * Get a list of all of this user's approved sites
@ -57,10 +57,10 @@ public class ApprovedSiteAPI {
ApprovedSite approvedSite = approvedSiteService.getById(id); ApprovedSite approvedSite = approvedSiteService.getById(id);
if (approvedSite == null) { if (approvedSite == null) {
logger.error("ApprovedSiteAPI: deleteApprovedSite failed; no approved site found for id: " + id); logger.error("deleteApprovedSite failed; no approved site found for id: " + id);
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
} else if (!approvedSite.getUserId().equals(p.getName())) { } else if (!approvedSite.getUserId().equals(p.getName())) {
logger.error("ApprovedSiteAPI: deleteApprovedSite failed; principal " logger.error("deleteApprovedSite failed; principal "
+ p.getName() + " does not own approved site" + id); + p.getName() + " does not own approved site" + id);
m.put("code", HttpStatus.FORBIDDEN); m.put("code", HttpStatus.FORBIDDEN);
} else { } else {
@ -78,11 +78,11 @@ public class ApprovedSiteAPI {
public String getApprovedSite(@PathVariable("id") Long id, ModelMap m, Principal p) { public String getApprovedSite(@PathVariable("id") Long id, ModelMap m, Principal p) {
ApprovedSite approvedSite = approvedSiteService.getById(id); ApprovedSite approvedSite = approvedSiteService.getById(id);
if (approvedSite == null) { if (approvedSite == null) {
logger.error("ApprovedSiteAPI: getApprovedSite failed; no approved site found for id: " + id); logger.error("getApprovedSite failed; no approved site found for id: " + id);
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} else if (!approvedSite.getUserId().equals(p.getName())) { } else if (!approvedSite.getUserId().equals(p.getName())) {
logger.error("ApprovedSiteAPI: getApprovedSite failed; principal " logger.error("getApprovedSite failed; principal "
+ p.getName() + " does not own approved site" + id); + p.getName() + " does not own approved site" + id);
m.put("code", HttpStatus.FORBIDDEN); m.put("code", HttpStatus.FORBIDDEN);
return "httpCodeView"; return "httpCodeView";

16
openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
View File

@ -37,7 +37,7 @@ public class BlacklistAPI {
@Autowired @Autowired
private BlacklistedSiteService blacklistService; private BlacklistedSiteService blacklistService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(BlacklistAPI.class);
private Gson gson = new Gson(); private Gson gson = new Gson();
private JsonParser parser = new JsonParser(); private JsonParser parser = new JsonParser();
@ -80,11 +80,11 @@ public class BlacklistAPI {
} }
catch (JsonSyntaxException e) { catch (JsonSyntaxException e) {
logger.error("BlacklistAPI: addNewBlacklistedSite failed due to JsonSyntaxException: " + e.getStackTrace().toString()); logger.error("addNewBlacklistedSite failed due to JsonSyntaxException: " + e.getStackTrace().toString());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("BlacklistAPI: addNewBlacklistedSite failed due to IllegalStateException: " + e.getStackTrace().toString()); logger.error("addNewBlacklistedSite failed due to IllegalStateException: " + e.getStackTrace().toString());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -110,11 +110,11 @@ public class BlacklistAPI {
} }
catch (JsonSyntaxException e) { catch (JsonSyntaxException e) {
logger.error("BlacklistAPI: updateBlacklistedSite failed due to JsonSyntaxException: " + e.getStackTrace().toString()); logger.error("updateBlacklistedSite failed due to JsonSyntaxException: " + e.getStackTrace().toString());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("BlacklistAPI: updateBlacklistedSite failed due to IllegalStateException: " + e.getStackTrace().toString()); logger.error("updateBlacklistedSite failed due to IllegalStateException: " + e.getStackTrace().toString());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -123,7 +123,7 @@ public class BlacklistAPI {
BlacklistedSite oldBlacklist = blacklistService.getById(id); BlacklistedSite oldBlacklist = blacklistService.getById(id);
if (oldBlacklist == null) { if (oldBlacklist == null) {
logger.error("BlacklistAPI: updateBlacklistedSite failed; blacklist with id " + id + " could not be found"); logger.error("updateBlacklistedSite failed; blacklist with id " + id + " could not be found");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} else { } else {
@ -145,7 +145,7 @@ public class BlacklistAPI {
BlacklistedSite blacklist = blacklistService.getById(id); BlacklistedSite blacklist = blacklistService.getById(id);
if (blacklist == null) { if (blacklist == null) {
logger.error("BlacklistAPI: deleteBlacklistedSite failed; blacklist with id " + id + " could not be found"); logger.error("deleteBlacklistedSite failed; blacklist with id " + id + " could not be found");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
} else { } else {
m.put("code", HttpStatus.OK); m.put("code", HttpStatus.OK);
@ -162,7 +162,7 @@ public class BlacklistAPI {
public String getBlacklistedSite(@PathVariable("id") Long id, ModelMap m) { public String getBlacklistedSite(@PathVariable("id") Long id, ModelMap m) {
BlacklistedSite blacklist = blacklistService.getById(id); BlacklistedSite blacklist = blacklistService.getById(id);
if (blacklist == null) { if (blacklist == null) {
logger.error("BlacklistAPI: getBlacklistedSite failed; blacklist with id " + id + " could not be found"); logger.error("getBlacklistedSite failed; blacklist with id " + id + " could not be found");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} else { } else {

16
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
View File

@ -97,7 +97,7 @@ public class ClientAPI {
.setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ") .setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
.create(); .create();
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(ClientAPI.class);
/** /**
* Get a list of all clients * Get a list of all clients
@ -136,11 +136,11 @@ public class ClientAPI {
client = gson.fromJson(json, ClientDetailsEntity.class); client = gson.fromJson(json, ClientDetailsEntity.class);
} }
catch (JsonSyntaxException e) { catch (JsonSyntaxException e) {
logger.error("ClientAPI: apiAddClient failed due to JsonSyntaxException: " + e.getStackTrace().toString()); logger.error("apiAddClient failed due to JsonSyntaxException: " + e.getStackTrace().toString());
m.addAttribute("code", HttpStatus.BAD_REQUEST); m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("ClientAPI: apiAddClient failed due to IllegalStateException: " + e.getStackTrace().toString()); logger.error("apiAddClient failed due to IllegalStateException: " + e.getStackTrace().toString());
m.addAttribute("code", HttpStatus.BAD_REQUEST); m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -191,11 +191,11 @@ public class ClientAPI {
client = gson.fromJson(json, ClientDetailsEntity.class); client = gson.fromJson(json, ClientDetailsEntity.class);
} }
catch (JsonSyntaxException e) { catch (JsonSyntaxException e) {
logger.error("ClientAPI: apiUpdateClient failed due to JsonSyntaxException: " + e.getStackTrace().toString()); logger.error("apiUpdateClient failed due to JsonSyntaxException: " + e.getStackTrace().toString());
m.addAttribute("code", HttpStatus.BAD_REQUEST); m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("ClientAPI: apiUpdateClient failed due to IllegalStateException: " + e.getStackTrace().toString()); logger.error("apiUpdateClient failed due to IllegalStateException: " + e.getStackTrace().toString());
m.addAttribute("code", HttpStatus.BAD_REQUEST); m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -203,7 +203,7 @@ public class ClientAPI {
ClientDetailsEntity oldClient = clientService.getClientById(id); ClientDetailsEntity oldClient = clientService.getClientById(id);
if (oldClient == null) { if (oldClient == null) {
logger.error("ClientAPI: apiUpdateClient failed; client with id " + id + " could not be found."); logger.error("apiUpdateClient failed; client with id " + id + " could not be found.");
m.addAttribute("code", HttpStatus.NOT_FOUND); m.addAttribute("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} }
@ -245,7 +245,7 @@ public class ClientAPI {
ClientDetailsEntity client = clientService.getClientById(id); ClientDetailsEntity client = clientService.getClientById(id);
if (client == null) { if (client == null) {
logger.error("ClientAPI: apiDeleteClient failed; client with id " + id + " could not be found."); logger.error("apiDeleteClient failed; client with id " + id + " could not be found.");
modelAndView.getModelMap().put("code", HttpStatus.NOT_FOUND); modelAndView.getModelMap().put("code", HttpStatus.NOT_FOUND);
} else { } else {
modelAndView.getModelMap().put("code", HttpStatus.OK); modelAndView.getModelMap().put("code", HttpStatus.OK);
@ -268,7 +268,7 @@ public class ClientAPI {
ClientDetailsEntity client = clientService.getClientById(id); ClientDetailsEntity client = clientService.getClientById(id);
if (client == null) { if (client == null) {
logger.error("ClientAPI: apiShowClient failed; client with id " + id + " could not be found."); logger.error("apiShowClient failed; client with id " + id + " could not be found.");
model.addAttribute("code", HttpStatus.NOT_FOUND); model.addAttribute("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} }

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

@ -56,7 +56,7 @@ public class ClientDynamicRegistrationEndpoint {
@Autowired @Autowired
private SystemScopeService scopeService; private SystemScopeService scopeService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(ClientDynamicRegistrationEndpoint.class);
private JsonParser parser = new JsonParser(); private JsonParser parser = new JsonParser();
private Gson gson = new Gson(); private Gson gson = new Gson();
@ -146,7 +146,7 @@ public class ClientDynamicRegistrationEndpoint {
return "clientInformationResponseView"; return "clientInformationResponseView";
} else { } else {
// didn't parse, this is a bad request // didn't parse, this is a bad request
logger.error("ClientDynamicRegistrationEndpoint: registerNewClient failed; submitted JSON is malformed"); logger.error("registerNewClient failed; submitted JSON is malformed");
m.addAttribute("code", HttpStatus.BAD_REQUEST); // http 400 m.addAttribute("code", HttpStatus.BAD_REQUEST); // http 400
return "httpCodeView"; return "httpCodeView";
@ -182,7 +182,7 @@ public class ClientDynamicRegistrationEndpoint {
return "clientInformationResponseView"; return "clientInformationResponseView";
} else { } else {
// client mismatch // client mismatch
logger.error("ClientDynamicRegistrationEndpoint: readClientConfiguration failed, client ID mismatch: " logger.error("readClientConfiguration failed, client ID mismatch: "
+ clientId + " and " + auth.getAuthorizationRequest().getClientId() + " do not match."); + clientId + " and " + auth.getAuthorizationRequest().getClientId() + " do not match.");
m.addAttribute("code", HttpStatus.FORBIDDEN); // http 403 m.addAttribute("code", HttpStatus.FORBIDDEN); // http 403
@ -253,7 +253,7 @@ public class ClientDynamicRegistrationEndpoint {
return "clientInformationResponseView"; return "clientInformationResponseView";
} else { } else {
// client mismatch // client mismatch
logger.error("ClientDynamicRegistrationEndpoint: readClientConfiguration failed, client ID mismatch: " logger.error("readClientConfiguration failed, client ID mismatch: "
+ clientId + " and " + auth.getAuthorizationRequest().getClientId() + " do not match."); + clientId + " and " + auth.getAuthorizationRequest().getClientId() + " do not match.");
m.addAttribute("code", HttpStatus.FORBIDDEN); // http 403 m.addAttribute("code", HttpStatus.FORBIDDEN); // http 403
@ -290,7 +290,7 @@ public class ClientDynamicRegistrationEndpoint {
return "clientInformationResponseView"; return "clientInformationResponseView";
} else { } else {
// client mismatch // client mismatch
logger.error("ClientDynamicRegistrationEndpoint: readClientConfiguration failed, client ID mismatch: " logger.error("readClientConfiguration failed, client ID mismatch: "
+ clientId + " and " + auth.getAuthorizationRequest().getClientId() + " do not match."); + clientId + " and " + auth.getAuthorizationRequest().getClientId() + " do not match.");
m.addAttribute("code", HttpStatus.FORBIDDEN); // http 403 m.addAttribute("code", HttpStatus.FORBIDDEN); // http 403

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

@ -6,13 +6,14 @@ import java.text.ParseException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.client.utils.URIBuilder; import org.apache.http.client.utils.URIBuilder;
import org.springframework.stereotype.Component; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller; 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.servlet.ModelAndView;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.nimbusds.jwt.JWT; import com.nimbusds.jwt.JWT;
@ -29,10 +30,10 @@ import com.nimbusds.jwt.JWTParser;
//@Component //@Component
public class RequestObjectAuthorizationEndpoint { public class RequestObjectAuthorizationEndpoint {
protected final Log logger = LogFactory.getLog(getClass()); private static Logger logger = LoggerFactory.getLogger(RequestObjectAuthorizationEndpoint.class);
@RequestMapping(value = "/authorize", params = "request") @RequestMapping(value = "/authorize", params = "request")
public String authorizeRequestObject(@RequestParam("request") String jwtString, @RequestParam(value = "response_type", required = false) String responseType, HttpServletRequest request) { public String authorizeRequestObject(@RequestParam("request") String jwtString, @RequestParam(value = "response_type", required = false) String responseType, HttpServletRequest request, ModelAndView mav) {
String query = request.getQueryString(); String query = request.getQueryString();
@ -48,11 +49,14 @@ public class RequestObjectAuthorizationEndpoint {
query = uri.getRawQuery();//uri.toString(); query = uri.getRawQuery();//uri.toString();
} catch (ParseException e) { } catch (ParseException e) {
// TODO Auto-generated catch block logger.error("ParseException while attempting to authorize request object: " + e.getStackTrace().toString());
e.printStackTrace(); mav.addObject("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
// TODO Auto-generated catch block logger.error("URISyntaxError while attempting to authorize request object: " + e.getStackTrace().toString());
e.printStackTrace(); mav.addObject("code", HttpStatus.BAD_REQUEST);
return "httpCodeView";
} }
} }

3
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ServerConfigInterceptor.java
View File

@ -3,13 +3,10 @@
*/ */
package org.mitre.openid.connect.web; package org.mitre.openid.connect.web;
import java.security.Principal;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean; import org.mitre.openid.connect.config.ConfigurationPropertiesBean;
import org.mitre.openid.connect.model.UserInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

8
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
View File

@ -49,7 +49,7 @@ public class UserInfoEndpoint {
@Autowired @Autowired
private UserInfoService userInfoService; private UserInfoService userInfoService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(UserInfoEndpoint.class);
private Map<String, String> schemaToViewNameMap = ImmutableMap.of( private Map<String, String> schemaToViewNameMap = ImmutableMap.of(
openIdSchema, jsonUserInfoViewName, openIdSchema, jsonUserInfoViewName,
@ -74,14 +74,14 @@ public class UserInfoEndpoint {
public String getInfo(Principal p, @RequestParam("schema") String schema, Model model) { public String getInfo(Principal p, @RequestParam("schema") String schema, Model model) {
if (p == null) { if (p == null) {
logger.error("UserInfoEndpoint: getInfo failed; no principal. Requester is not authorized."); logger.error("getInfo failed; no principal. Requester is not authorized.");
model.addAttribute("code", HttpStatus.FORBIDDEN); model.addAttribute("code", HttpStatus.FORBIDDEN);
return "httpCodeView"; return "httpCodeView";
} }
String viewName = schemaToViewNameMap.get(schema); String viewName = schemaToViewNameMap.get(schema);
if (viewName == null) { if (viewName == null) {
logger.error("UserInfoEndpoint: getInfo failed; unknown User Info schema " + schema); logger.error("getInfo failed; unknown User Info schema " + schema);
model.addAttribute("code", HttpStatus.BAD_REQUEST); model.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -90,7 +90,7 @@ public class UserInfoEndpoint {
UserInfo userInfo = userInfoService.getByUserId(userId); UserInfo userInfo = userInfoService.getByUserId(userId);
if (userInfo == null) { if (userInfo == null) {
logger.error("UserInfoEndpoint: getInfo failed; user not found: " + userId); logger.error("getInfo failed; user not found: " + userId);
model.addAttribute("code", HttpStatus.NOT_FOUND); model.addAttribute("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} }

17
openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java
View File

@ -24,7 +24,6 @@ import com.google.gson.Gson;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
/** /**
* @author jricher * @author jricher
@ -38,7 +37,7 @@ public class WhitelistAPI {
@Autowired @Autowired
private WhitelistedSiteService whitelistService; private WhitelistedSiteService whitelistService;
private Logger logger = LoggerFactory.getLogger(this.getClass()); private static Logger logger = LoggerFactory.getLogger(WhitelistAPI.class);
private Gson gson = new Gson(); private Gson gson = new Gson();
private JsonParser parser = new JsonParser(); private JsonParser parser = new JsonParser();
@ -77,11 +76,11 @@ public class WhitelistAPI {
whitelist = gson.fromJson(json, WhitelistedSite.class); whitelist = gson.fromJson(json, WhitelistedSite.class);
} catch (JsonParseException e) { } catch (JsonParseException e) {
logger.error("WhitelistAPi: addNewWhitelistedSite failed due to JsonParseException: " + e.getStackTrace().toString()); logger.error("addNewWhitelistedSite failed due to JsonParseException: " + e.getStackTrace().toString());
m.addAttribute("code", HttpStatus.BAD_REQUEST); m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("WhitelistAPi: addNewWhitelistedSite failed due to IllegalStateException: " + e.getStackTrace().toString()); logger.error("addNewWhitelistedSite failed due to IllegalStateException: " + e.getStackTrace().toString());
m.addAttribute("code", HttpStatus.BAD_REQUEST); m.addAttribute("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -112,11 +111,11 @@ public class WhitelistAPI {
whitelist = gson.fromJson(json, WhitelistedSite.class); whitelist = gson.fromJson(json, WhitelistedSite.class);
} catch (JsonParseException e) { } catch (JsonParseException e) {
logger.error("WhitelistAPi: updateWhitelistedSite failed due to JsonParseException: " + e.getStackTrace().toString()); logger.error("updateWhitelistedSite failed due to JsonParseException: " + e.getStackTrace().toString());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("WhitelistAPi: updateWhitelistedSite failed due to IllegalStateException: " + e.getStackTrace().toString()); logger.error("updateWhitelistedSite failed due to IllegalStateException: " + e.getStackTrace().toString());
m.put("code", HttpStatus.BAD_REQUEST); m.put("code", HttpStatus.BAD_REQUEST);
return "httpCodeView"; return "httpCodeView";
} }
@ -124,7 +123,7 @@ public class WhitelistAPI {
WhitelistedSite oldWhitelist = whitelistService.getById(id); WhitelistedSite oldWhitelist = whitelistService.getById(id);
if (oldWhitelist == null) { if (oldWhitelist == null) {
logger.error("WhitelistAPi: updateWhitelistedSite failed; whitelist with id " + id + " could not be found."); logger.error("updateWhitelistedSite failed; whitelist with id " + id + " could not be found.");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} else { } else {
@ -147,7 +146,7 @@ public class WhitelistAPI {
WhitelistedSite whitelist = whitelistService.getById(id); WhitelistedSite whitelist = whitelistService.getById(id);
if (whitelist == null) { if (whitelist == null) {
logger.error("WhitelistAPi: deleteWhitelistedSite failed; whitelist with id " + id + " could not be found."); logger.error("deleteWhitelistedSite failed; whitelist with id " + id + " could not be found.");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
} else { } else {
m.put("code", HttpStatus.OK); m.put("code", HttpStatus.OK);
@ -164,7 +163,7 @@ public class WhitelistAPI {
public String getWhitelistedSite(@PathVariable("id") Long id, ModelMap m) { public String getWhitelistedSite(@PathVariable("id") Long id, ModelMap m) {
WhitelistedSite whitelist = whitelistService.getById(id); WhitelistedSite whitelist = whitelistService.getById(id);
if (whitelist == null) { if (whitelist == null) {
logger.error("WhitelistAPi: getWhitelistedSite failed; whitelist with id " + id + " could not be found."); logger.error("getWhitelistedSite failed; whitelist with id " + id + " could not be found.");
m.put("code", HttpStatus.NOT_FOUND); m.put("code", HttpStatus.NOT_FOUND);
return "httpCodeView"; return "httpCodeView";
} else { } else {