updated

wildfly-security · Apr 13, 2023 · 159092a · 159092a
1 parent ea56eb8
commit 159092a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/http/client/src/main/java/org/wildfly/security/http/client/ElytronHttpClient.java b/http/client/src/main/java/org/wildfly/security/http/client/ElytronHttpClient.java
@@ -64,7 +64,7 @@ public HttpResponse evaluateDigestMechanism(String uri) throws Exception {
         HttpRequest request;
         request = createDigestRequest(uri);
 
-        if(!(lastURI.equals(uri))){
+        if(lastURI==null || !(lastURI.equals(uri))){
             lastURI = uri;
         }
 
@@ -284,6 +284,7 @@ public HttpResponse evaluateNoAuthMechanism(String uri) throws Exception{
                 .build();
 
         HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        return response;
     }
 
     public HttpResponse connect(String uri) throws Exception {
@@ -314,10 +315,10 @@ public HttpResponse connect(String uri) throws Exception {
 
             String authHeader = response.headers().allValues("www-authenticate").get(0);
 
-            if (authHeader.toLowerCase().startsWith("Basic ")) {
+            if (authHeader.toLowerCase().startsWith("basic")) {
                 response = evaluateBasicMechanism(uri);
                 previousMechanism = "basic";
-            } else if (authHeader.toLowerCase().startsWith("Digest ")) {
+            } else if (authHeader.toLowerCase().startsWith("digest")) {
                 updateAuthParams(authHeader);
                 response = evaluateDigestMechanism(uri);
                 previousMechanism = "digest";