WIP for #713

Author: oharsta

server/src/main/java/invite/api/DefaultErrorController.java

@@ -15,13 +15,15 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
 
+import java.util.Base64;
 import java.util.Map;
 
 import static org.springframework.http.HttpStatus.*;
@@ -56,8 +58,14 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         HttpStatus statusCode;
 
         if (error == null) {
-            statusCode = result.containsKey("status") && (int) result.get("status") != 999 ?
-                    HttpStatus.valueOf((int) result.get("status")) : INTERNAL_SERVER_ERROR;
+            if ("Unauthorized".equalsIgnoreCase((String) result.get("error"))) {
+                statusCode = HttpStatus.UNAUTHORIZED;
+                this.handleAuthorizationException(request, result);
+            } else {
+                statusCode = result.containsKey("status") && (int) result.get("status") != 999 ?
+                        HttpStatus.valueOf((int) result.get("status")) : INTERNAL_SERVER_ERROR;
+
+            }
         } else {
             if (!(error instanceof NotFoundException || error instanceof NoResourceFoundException)) {
                 boolean logStackTrace = !(error instanceof UserRestrictionException || error instanceof invite.exception.RemoteException);
@@ -75,4 +83,35 @@ public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
         return ResponseEntity.status(statusCode).body(result);
     }
 
+    private void handleAuthorizationException(HttpServletRequest request, Map<String, Object> result) {
+        String remoteIp = request.getHeader("X-Forwarded-For");
+        if (StringUtils.hasText(remoteIp)) {
+            remoteIp = remoteIp.split(",")[0].trim(); // first entry is the originating client
+        } else {
+            remoteIp = request.getRemoteAddr();
+        }
+
+        String username = null;
+        String authHeader = request.getHeader("Authorization");
+        if (StringUtils.hasText(authHeader) && authHeader.startsWith("Basic ")) {
+            String encoded = authHeader.substring(6);
+            String decoded = new String(Base64.getDecoder().decode(encoded));
+            username = decoded.split(":", 2)[0];
+        }
+
+        String method = request.getMethod();
+        String fullPath;
+        if (result.containsKey("path")) {
+            fullPath = (String) result.get("path");
+        } else {
+            String path = request.getRequestURI();
+            String query = request.getQueryString();
+            fullPath = query != null ? path + "?" + query : path;
+        }
+
+        LOG.warn(String.format("Authentication error: ip=%s, user=%s, method=%s, path=%s",
+                remoteIp, username, method, fullPath
+        ));
+    }
+
 }

server/src/main/resources/application.yml

@@ -1,19 +1,4 @@
 ---
-logging:
-  level:
-    root: WARN
-    com.zaxxer.hikari: ERROR
-    org.mariadb.jdbc.message.server: ERROR
-    org.springframework.security: INFO
-    invite: DEBUG
-    net.javacrumbs.shedlock: DEBUG
-  #    sql: DEBUG
-#    org.hibernate.type.descriptor.sql.BasicBinder: TRACE
-#    org.hibernate.orm.jdbc.bind: TRACE
-  threshold:
-#    console: TRACE
-    console: WARN
-
 server:
   port: 8888
   error: