diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAccessDeniedHandler.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAccessDeniedHandler.java index 0e68036..2d16b39 100644 --- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAccessDeniedHandler.java +++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAccessDeniedHandler.java @@ -26,7 +26,8 @@ public class ApiAccessDeniedHandler implements AccessDeniedHandler { } @Override - public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { + public void handle(HttpServletRequest request, HttpServletResponse response, + AccessDeniedException accessDeniedException) throws IOException, ServletException { int code = HttpServletResponse.SC_FORBIDDEN; response.setStatus(code); response.setContentType(MediaType.APPLICATION_JSON_VALUE); @@ -38,7 +39,7 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Acc response.getWriter().write(objectMapper.writeValueAsString(errorResponse)); - log.info("Request rejected for endpoint '{}': {}", request.getRequestURI(), message); + log.info("Request rejected for endpoint '{} {}': {}", request.getMethod(), request.getRequestURI(), message); } } diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationFilter.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationFilter.java index f4ba416..8230b7a 100644 --- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationFilter.java +++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationFilter.java @@ -48,7 +48,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha try { Authentication authentication = authenticationService.getAuthentication((HttpServletRequest) request); SecurityContextHolder.getContext().setAuthentication(authentication); - log.info("Endpoint '{}' accessed by {}.", ((HttpServletRequest) request).getRequestURI(), authentication.getPrincipal().toString()); + log.info("Endpoint '{} {}' requested by {}.", ((HttpServletRequest) request).getMethod(), + ((HttpServletRequest) request).getRequestURI(), authentication.getPrincipal().toString()); filterChain.doFilter(request, response); } catch (Exception ex) { int code = HttpServletResponse.SC_UNAUTHORIZED; @@ -63,7 +64,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha httpResponse.getWriter().write(objectMapper.writeValueAsString(errorResponse)); - log.info("Request rejected for endpoint '{}': {}", ((HttpServletRequest) request).getRequestURI(), message); + log.info("Request rejected for endpoint '{} {}': {}", ((HttpServletRequest) request).getMethod(), + ((HttpServletRequest) request).getRequestURI(), message); } } } \ No newline at end of file diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationToken.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationToken.java index 6ad8f70..9ac44fe 100644 --- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationToken.java +++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/ApiAuthenticationToken.java @@ -14,7 +14,8 @@ public class ApiAuthenticationToken extends AbstractAuthenticationToken { private final String clientName; private final String accessToken; - public ApiAuthenticationToken(String clientName, String accessToken, Collection authorities) { + public ApiAuthenticationToken(String clientName, String accessToken, + Collection authorities) { super(authorities); this.clientName = clientName; this.accessToken = accessToken; diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/AuthenticationProperties.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/AuthenticationProperties.java index c886351..8b7712e 100644 --- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/AuthenticationProperties.java +++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-auth/src/main/java/uk/gov/laa/ccms/springboot/auth/AuthenticationProperties.java @@ -21,14 +21,16 @@ public class AuthenticationProperties { /** * The list of clients who are authorized to access the API, and their roles - * JSON formatted string, with the top level being a list and each contained item representing a {@link ClientCredential}. + * JSON formatted string, with the top level being a list and each contained item + * representing a {@link ClientCredential}. */ @NotNull(message = "authorizedClients is required") private String authorizedClients; /** * The list of roles that can be used to access the API, and the URIs they enable access to. - * JSON formatted string, with the top level being a list and each contained item representing an {@link AuthorizedRole}. + * JSON formatted string, with the top level being a list and each contained item representing + * an {@link AuthorizedRole}. */ @NotNull(message = "authorizedRoles is required") private String authorizedRoles;