better error messages

Author: Vladimir Kotal

plugins/src/opengrok/auth/plugin/decoders/MellonHeaderDecoder.java

@@ -26,6 +26,7 @@
 import opengrok.auth.plugin.entity.User;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -53,7 +54,9 @@ public User fromRequest(HttpServletRequest request) {
         String username = request.getHeader(MELLON_EMAIL_HEADER);
         if (username == null || username.isEmpty()) {
             LOGGER.log(Level.WARNING,
-                    "Can not construct an user: username could not be extracted");
+                    "Can not construct User object: header ''{1}'' not found in request headers: {0}",
+                    new Object[]{String.join(",", Collections.list(request.getHeaderNames())),
+                            MELLON_EMAIL_HEADER});
             return null;
         }
 

plugins/src/opengrok/auth/plugin/decoders/OSSOHeaderDecoder.java

@@ -22,6 +22,7 @@
  */
 package opengrok.auth.plugin.decoders;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -57,13 +58,15 @@ public User fromRequest(HttpServletRequest request) {
 
         if (username == null || username.isEmpty()) {
             LOGGER.log(Level.WARNING,
-                    "Can not construct an user: username could not be extracted");
+                    "Can not construct an user: username could not be extracted from headers: {0}",
+                    String.join(",", Collections.list(request.getHeaderNames())));
             return null;
         }
 
         if (userguid == null || userguid.isEmpty()) {
             LOGGER.log(Level.WARNING,
-                    "Can not construct an user: userguid could not be extracted");
+                    "Can not construct an user: userguid could not be extracted from headers: {0}",
+                    String.join(",", Collections.list(request.getHeaderNames())));
             return null;
         }
 
@@ -74,8 +77,8 @@ public User fromRequest(HttpServletRequest request) {
             cookieTimestamp = Timestamp.decodeTimeCookie(timestamp);
         } catch (NumberFormatException ex) {
             LOGGER.log(Level.WARNING,
-                    String.format("Unparseable timestamp cookie \"%s\" for user \"%s\"", timestamp, username),
-                    ex);
+                    String.format("Unparseable timestamp cookie \"%s\" for user \"%s\"",
+                            timestamp, username), ex);
         }
 
         /**
@@ -89,7 +92,8 @@ public User fromRequest(HttpServletRequest request) {
         user.setAttribute("subscriber", request.getHeader(OSSO_SUBSCRIBER_HEADER));
 
         if (user.isTimeouted()) {
-            LOGGER.log(Level.WARNING, "Can not construct an user \"{0}\": header is timeouted", username);
+            LOGGER.log(Level.WARNING, "Can not construct an user \"{0}\": header is timeouted",
+                    username);
             return null;
         }
 

plugins/test/opengrok/auth/plugin/decoders/MellonDecoderTest.java

@@ -30,6 +30,7 @@
 import org.junit.Test;
 
 import static opengrok.auth.plugin.decoders.MellonHeaderDecoder.MELLON_EMAIL_HEADER;
+import static org.junit.Assert.assertNull;
 
 public class MellonDecoderTest {
     DummyHttpServletRequestUser dummyRequest;
@@ -47,7 +48,12 @@ public void testAll() {
 
         Assert.assertNotNull(result);
         Assert.assertEquals("[email protected]", result.getUsername());
-        Assert.assertNull(result.getId());
+        assertNull(result.getId());
         Assert.assertFalse(result.isTimeouted());
     }
+
+    @Test
+    public void testMissingHeader() {
+        assertNull(decoder.fromRequest(new DummyHttpServletRequestUser()));
+    }
 }

plugins/test/opengrok/auth/plugin/util/DummyHttpServletRequestUser.java

@@ -172,7 +172,7 @@ public Enumeration<String> getHeaders(String string) {
 
     @Override
     public Enumeration<String> getHeaderNames() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return Collections.enumeration(headers.keySet());
     }
 
     @Override