Improve DigestAuthenticator class

Signed-off-by: Oleksandr Krutko <[email protected]>

Author: arsenalzp

jetty-core/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java

@@ -58,14 +58,14 @@ public class DigestAuthenticator extends LoginAuthenticator
     private final ConcurrentMap<String, Nonce> _nonceMap = new ConcurrentHashMap<>();
     private long _maxNonceAgeMs = 60 * 1000;
     private int _maxNC = 1024;
-    private Algorithm algorithm = Algorithm.MD5;
+    private String algorithm = "MD5";
 
-    public void setAlgorithm(Algorithm a)
+    public void setAlgorithm(String a)
     {
         algorithm = a;
     }
 
-    public Algorithm getAlgorithm()
+    public String getAlgorithm()
     {
         return algorithm;
     }
@@ -188,7 +188,7 @@ else if (n == 0)
             res.getHeaders().put(HttpHeader.WWW_AUTHENTICATE.asString(), "Digest realm=\"" + _loginService.getName() +
                     "\", domain=\"" + domain +
                     "\", nonce=\"" + newNonce(req) +
-                    "\", algorithm=" + algorithm.getName() +
+                    "\", algorithm=" + getAlgorithm() +
                     ", qop=\"auth\"" +
                     ", stale=" + stale);
 
@@ -297,7 +297,7 @@ private static class Digest extends Credential
     {
         @Serial
         private static final long serialVersionUID = -2484639019549527724L;
-        private Algorithm algorithm;
+        private String algorithm;
         final String method;
         String username = "";
         String realm = "";
@@ -313,38 +313,28 @@ private static class Digest extends Credential
             method = m;
         }
 
-        Digest(String m, Algorithm a)
+        Digest(String m, String a)
         {
             method = m;
             algorithm = a;
         }
-
-        @Override
-        public boolean check(Object credentials)
-        {
-            byte[] digest = new byte[]{};
-            digest = calcDigest(credentials, algorithm.getName());
-
-            // check digest
-            return stringEquals(TypeUtil.toString(digest, 16).toLowerCase(), response == null ? null : response.toLowerCase());
-        }
-
-        @Override
-        public String toString()
+        
+        private String getAlgorithm()
         {
-            return username + "," + response;
+            return algorithm;
         }
 
-        private byte[] calcDigest(Object credentials, String algorithm)
-        {
+        @Override
+        public boolean check(Object credentials)
+        {            
             if (credentials instanceof char[])
                 credentials = new String((char[])credentials);
             String password = (credentials instanceof String) ? (String)credentials : credentials.toString();
 
             try
             {
                 // MD5 required by the specification
-                MessageDigest md = MessageDigest.getInstance(algorithm);
+                MessageDigest md = MessageDigest.getInstance(getAlgorithm());
                 byte[] ha1;
                 if (credentials instanceof MD5)
                 {
@@ -389,32 +379,21 @@ private byte[] calcDigest(Object credentials, String algorithm)
                 md.update((byte)':');
                 md.update(TypeUtil.toString(ha2, 16).getBytes(StandardCharsets.ISO_8859_1));
 
-                return md.digest();
+                // check digest
+                return stringEquals(TypeUtil.toString(md.digest(), 16).toLowerCase(), response == null ? null : response.toLowerCase());
+                
             } 
             catch (Exception e) 
             {
                 LOG.warn("Unable to process digest", e);
             }
-            
-            return new byte[] {};
+                return false;
+        }
+        
+        @Override
+        public String toString()
+        {
+            return username + "," + response;
         }
     }
-    
-    public static enum Algorithm
-    {
-            MD5("MD5"),
-            SHA256("SHA-256");
-
-            private String name;
-
-            Algorithm(String name)
-            {
-                this.name = name;
-            }
-
-            public String getName()
-            {
-                return this.name;
-            }
-    }
-}
+}