Merge branch 'master' into j21tc9

VEuPathDB · Jun 13, 2024 · 0785869 · 0785869
2 parents 0fa1564 + 8dd042c
commit 0785869
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java b/Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java
@@ -81,7 +81,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
           ValidatedToken token = factory.validateBearerToken(rawToken);
           User user = factory.convertToUser(token);
           setRequestAttributes(request, token, user);
-          LOG.info("Validated successfully.  Request will be processed for user " + user.getUserId() + " / " + user.getEmail());
+          LOG.info("Validated successfully.  Request will be processed for user " + user.getUserId());
         }
         catch (ExpiredTokenException e) {
           // token is expired; use guest token for now which should inspire them to log back in
@@ -122,7 +122,8 @@ private void setRequestAttributes(RequestData request, ValidatedToken token, Use
   private String findRawBearerToken(RequestData request, ContainerRequestContext requestContext) {
     String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
     if (authHeader != null) {
-      LOG.info("Recieved Authorization header with value: " + authHeader + "; trying bearer token validation.");
+      // commented to avoid sensitive header value being written to logs
+      //LOG.trace("Recieved Authorization header with value: " + authHeader + "; trying bearer token validation.");
       return OAuthClient.getTokenFromAuthHeader(authHeader);
     }
     // otherwise try Authorization cookie