Short log for RequestRejectedException and IllegalArgumentException (#7502)

Author: amontenegro

orcid-api-common/src/main/java/org/orcid/api/common/jaxb/OrcidExceptionMapper.java

@@ -142,6 +142,8 @@ public Response toResponse(Throwable t) {
             logShortError(t, clientId);
         } else if (t instanceof SearchStartParameterLimitExceededException) {
             logShortError(t, clientId);
+        } else if (t instanceof IllegalArgumentException) {
+            logShortError(t, clientId);
         } else if (t instanceof InvalidDisambiguatedOrgException) {
             LOGGER.error("Error for client ID: " + clientId + "InvalidDisambiguatedOrgException: Disambiguated org is empty or null");
         } else {

orcid-core/src/main/java/org/orcid/core/oauth/service/OrcidRandomValueTokenServicesImpl.java

@@ -294,7 +294,7 @@ private OAuth2Authentication loadAuthenticationFromAuthorizationServer(String ac
                     throw new InvalidTokenException("Invalid access token: " + accessTokenValue);
                 }
             }
-        } catch(InvalidTokenException i) {
+        } catch(IllegalArgumentException | InvalidTokenException i) {
             throw i;
         } catch(Exception e) {
             LOGGER.error("Exception validating token from authorization server", e);

orcid-core/src/main/java/org/orcid/core/web/filters/AcceptFilter.java

@@ -19,7 +19,15 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.MediaType;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.orcid.core.manager.impl.OrcidUrlManager;
+import org.orcid.jaxb.model.v3.release.error.OrcidError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.web.firewall.RequestRejectedException;
+import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 /**
@@ -29,31 +37,54 @@
  */
 
 public class AcceptFilter extends OncePerRequestFilter {
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(AcceptFilter.class);
     private static String[] accpetTypesArray = { VND_ORCID_XML, ORCID_XML, MediaType.APPLICATION_XML, VND_ORCID_JSON, ORCID_JSON, MediaType.APPLICATION_JSON, TEXT_TURTLE,
             TEXT_N3, N_TRIPLES, JSON_LD, APPLICATION_RDFXML };
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        String accept = request.getHeader("accept");
-        String path = ((HttpServletRequest) request).getRequestURI();
-        String contentType = request.getHeader("Content-Type");
+        try {
+            String accept = request.getHeader("accept");
+            String contentType = request.getHeader("Content-Type");
 
-        if (accept == null || accept.equals("*/*")) {
-            HttpServletRequestWrapper requestWrapper = null;
-            if (isValidAcceptType(contentType))
-                requestWrapper = new AcceptHeaderRequestWrapper(request, contentType);
-            else
-                if (isStandardJsonRequest(request))
+            if (accept == null || accept.equals("*/*")) {
+                HttpServletRequestWrapper requestWrapper = null;
+                if (isValidAcceptType(contentType))
+                    requestWrapper = new AcceptHeaderRequestWrapper(request, contentType);
+                else if (isStandardJsonRequest(request))
                     requestWrapper = new AcceptHeaderRequestWrapper(request, MediaType.APPLICATION_JSON);
                 else
                     requestWrapper = new AcceptHeaderRequestWrapper(request, VND_ORCID_XML);
-            filterChain.doFilter(requestWrapper, response);
-        } else {
-            filterChain.doFilter(request, response);
+                filterChain.doFilter(requestWrapper, response);
+            } else {
+                filterChain.doFilter(request, response);
+            }
+        } catch (RequestRejectedException e) {
+            if(request.getRequestURI() != null) {
+                logger.warn(request.getRequestURI() + ":" + e.getMessage());
+            } else {
+                logger.warn(e.getMessage());
+            }
+            ResponseEntity<OrcidError> errorResponseEntity = buildErrorResponseEntity(HttpStatus.BAD_REQUEST, e.getMessage());
+            new ObjectMapper().writeValue(response.getWriter(), errorResponseEntity);
+            response.flushBuffer();
+        } catch (IllegalArgumentException e) {
+            logger.warn(e.getMessage());
+            ResponseEntity<OrcidError> errorResponseEntity = buildErrorResponseEntity(HttpStatus.BAD_REQUEST, e.getMessage());
+            new ObjectMapper().writeValue(response.getWriter(), errorResponseEntity);
+            response.flushBuffer();
         }
     }
 
+    private ResponseEntity<OrcidError> buildErrorResponseEntity(HttpStatus status, String message) {
+        OrcidError orcidError = new OrcidError();
+        orcidError.setResponseCode(status.value());
+        orcidError.setDeveloperMessage(message);
+        orcidError.setUserMessage(message);
+        ResponseEntity<OrcidError> errorResponseEntity = new ResponseEntity<>(orcidError, status);
+        return errorResponseEntity;
+    }
+
     private boolean isStandardJsonRequest(HttpServletRequest request) {
         String path = OrcidUrlManager.getPathWithoutContextPath(request);
         return path.startsWith("/oauth/") || path.endsWith("/pubStatus") || path.endsWith("/apiStatus");