Merge pull request #116 from VBA-tools/digest-updates

Fix extract header bug in DigestAuthenticator

Author: timhall

authenticators/DigestAuthenticator.cls

@@ -158,38 +158,34 @@ End Function
 ' @param {WebResponse} Response
 ''
 Public Sub ExtractAuthenticateInformation(Response As WebResponse)
-    Dim auth_Header As Dictionary
-    For Each auth_Header In Response.Headers
-        ' Find authentication header
-        If auth_Header("key") = "WWW-Authenticate" Then
-            ' Make sure using Digest authentication
-            If VBA.Left$(auth_Header("value"), 6) = "Digest" Then
-                Dim auth_Lines As Variant
-                auth_Lines = VBA.Split(VBA.Mid$(auth_Header("value"), 7), vbCrLf)
-                
-                Dim auth_i As Integer
-                Dim auth_Key As String
-                Dim auth_Value As String
-                For auth_i = LBound(auth_Lines) To UBound(auth_Lines)
-                    auth_Key = VBA.LCase$(VBA.Trim$(VBA.Mid$(auth_Lines(auth_i), 1, VBA.InStr(1, auth_Lines(auth_i), "=") - 1)))
-                    auth_Value = VBA.Trim$(VBA.Mid$(auth_Lines(auth_i), VBA.InStr(1, auth_Lines(auth_i), "=") + 1, VBA.Len(auth_Lines(auth_i))))
-                    
-                    ' Remove quotes and trailing comma
-                    auth_Value = VBA.Replace(auth_Value, """", "")
-                    If VBA.Right$(auth_Value, 1) = "," Then auth_Value = VBA.Left$(auth_Value, VBA.Len(auth_Value) - 1)
-                    
-                    ' Find realm, nonce, and opaque
-                    If auth_Key = "realm" Then Me.Realm = auth_Value
-                    If auth_Key = "nonce" Then Me.ServerNonce = auth_Value
-                    If auth_Key = "opaque" Then Me.Opaque = auth_Value
-                Next auth_i
-                
-                WebHelpers.LogDebug "realm=" & Me.Realm & ", nonce=" & Me.ServerNonce & ", opaque=" & Me.Opaque, "DigestAuthenticator.ExtractAuthenticateInformation"
+    Dim auth_Header As String
+    auth_Header = WebHelpers.FindInKeyValues(Response.Headers, "WWW-Authenticate")
+    
+    If auth_Header <> "" And VBA.Left$(auth_Header, 6) = "Digest" Then
+        Dim auth_Lines As Variant
+        auth_Lines = VBA.Split(VBA.Mid$(auth_Header, 7), vbCrLf)
+        
+        Dim auth_i As Integer
+        Dim auth_Key As String
+        Dim auth_Value As String
+        For auth_i = LBound(auth_Lines) To UBound(auth_Lines)
+            auth_Key = VBA.LCase$(VBA.Trim$(VBA.Mid$(auth_Lines(auth_i), 1, VBA.InStr(1, auth_Lines(auth_i), "=") - 1)))
+            auth_Value = VBA.Trim$(VBA.Mid$(auth_Lines(auth_i), VBA.InStr(1, auth_Lines(auth_i), "=") + 1, VBA.Len(auth_Lines(auth_i))))
+            
+            ' Remove quotes and trailing comma
+            auth_Value = VBA.Replace(auth_Value, """", "")
+            If VBA.Right$(auth_Value, 1) = "," Then
+                auth_Value = VBA.Left$(auth_Value, VBA.Len(auth_Value) - 1)
             End If
 
-            Exit Sub
-        End If
-    Next auth_Header
+            ' Find realm, nonce, and opaque
+            If auth_Key = "realm" Then Me.Realm = auth_Value
+            If auth_Key = "nonce" Then Me.ServerNonce = auth_Value
+            If auth_Key = "opaque" Then Me.Opaque = auth_Value
+        Next auth_i
+        
+        WebHelpers.LogDebug "realm=" & Me.Realm & ", nonce=" & Me.ServerNonce & ", opaque=" & Me.Opaque, "DigestAuthenticator.ExtractAuthenticateInformation"
+    End If
 End Sub
 
 ' ============================================= '

specs/Specs_DigestAuthenticator.bas

@@ -54,13 +54,10 @@ Public Function Specs() As SpecSuite
         Dim Unauthorized As New WebResponse
         Unauthorized.StatusCode = 401
 
-        Dim UnauthorizedHeader As New Dictionary
-        UnauthorizedHeader.Add "key", "WWW-Authenticate"
-        UnauthorizedHeader.Add "value", "Digest realm=""[email protected]""," & vbCrLf & _
+        Unauthorized.Headers.Add WebHelpers.CreateKeyValue("WWW-Authenticate", "Digest realm=""[email protected]""," & vbCrLf & _
                             "qop=""auth,auth-int""," & vbCrLf & _
                             "nonce=""dcd98b7102dd2f0e8b11d0f600bfb0c093""," & vbCrLf & _
-                            "Opaque = ""5ccc069c403ebaf9f0171e9517f40e41"""
-        Unauthorized.Headers.Add UnauthorizedHeader
+                            "Opaque = ""5ccc069c403ebaf9f0171e9517f40e41""")
 
         Auth.Realm = ""
         Auth.ServerNonce = ""