Merge pull request thenoobsbr#18 from JSGInray/bugfix/2.0.0/MultipleQob

thenoobsbr#17 fix wrong qob reply

Author: bernardbr

src/DigestAuthenticator/DigestAuthenticatorManager.cs

@@ -47,6 +47,11 @@ internal class DigestAuthenticatorManager
     /// </summary>
     private string? _realm;
 
+    /// <summary>
+    ///     The opaque that is returned by the first digest request (without the data).
+    /// </summary>
+    private string? _opaque;
+
     static DigestAuthenticatorManager()
     {
         _assemblyVersion = Assembly.GetAssembly(typeof(DigestAuthenticatorManager)).GetName().Version;
@@ -130,6 +135,7 @@ public string GetDigestHeader(string digestUri, Method method)
                $"uri=\"{digestUri}\"," +
                "algorithm=MD5," +
                $"response=\"{digestResponse}\"," +
+               (!string.IsNullOrWhiteSpace(_opaque) ? $"opaque=\"{_opaque}\"," : string.Empty) +
                $"qop={_qop}," +
                $"nc={DigestHeader.NONCE_COUNT:00000000}," +
                $"cnonce=\"{_cnonce}\"";
@@ -184,5 +190,14 @@ private void GetDigestDataFromFailResponse(RestResponse response)
         _realm = digestHeader.Realm;
         _nonce = digestHeader.Nonce;
         _qop = digestHeader.Qop;
+        if (!string.IsNullOrWhiteSpace(_qop) && _qop!.Contains(','))
+        {
+            _qop = _qop!
+                .Split(',')
+                .Select(q => q.Trim())
+                .FirstOrDefault(q => q.Equals("auth", StringComparison.OrdinalIgnoreCase)) // prefer "auth" if the server offered several
+                ?? _qop.Split(',')[0].Trim();
+        }
+        _opaque = digestHeader.Opaque;
     }
 }

src/DigestAuthenticator/DigestHeader.cs

@@ -14,9 +14,11 @@ internal class DigestHeader
 
     public const string REALM = "realm";
 
+    public const string OPAQUE = "opaque";
+
     public const string REGEX_PATTERN =
         "realm=\"(?<realm>.*?)\"|qop=(?:\"(?<qop>.*?)\"|(?<qop>[^\",\\s]+))|nonce=\"(?<nonce>.*?)\"|stale=\"(?<stale>.*?)\"|opaque=\"(?<opaque>.*?)\"|domain=\"(?<domain>.*?)\"";
-
+    
     private static readonly Regex _regex;
 
     static DigestHeader()
@@ -50,6 +52,11 @@ public DigestHeader(string authenticateHeader, ILogger logger)
             {
                 Nonce = m.Groups[NONCE].Value;
             }
+
+            if (m.Groups[OPAQUE].Success)
+            {
+                Opaque = m.Groups[OPAQUE].Value;
+            }
         }
 
         if (AllDataCorrectFilled())
@@ -65,10 +72,11 @@ public DigestHeader(string authenticateHeader, ILogger logger)
     public string? Nonce { get; }
     public string? Qop { get; }
     public string? Realm { get; }
+    public string? Opaque { get; }
 
     public override string ToString()
     {
-        return $"{nameof(Realm)}=\"{Realm}\"&{nameof(Nonce)}=\"{Nonce}\"&{nameof(Qop)}=\"{Qop}\"";
+        return $"{nameof(Realm)}=\"{Realm}\"&{nameof(Nonce)}=\"{Nonce}\"&{nameof(Qop)}=\"{Qop}\"&{nameof(Opaque)}=\"{Opaque}\"";
     }
 
     private bool AllDataCorrectFilled()