Merge pull request jnunemaker#338 from orgsync/fix-qop-parsing

quotes qop value prior to parsing
dnlbyl · Oct 24, 2014 · a028de4 · a028de4
2 parents fea7a18 + c187bb6
commit a028de4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/httparty/net_digest_auth.rb b/lib/httparty/net_digest_auth.rb
@@ -44,7 +44,10 @@ def authorization_header
     private
 
       def parse(response_header)
-        response_header['www-authenticate'] =~ /Digest (.*)/
+        header = response_header['www-authenticate']
+          .gsub(/qop=(auth(?:-int)?)/, %Q(qop="\\1"))
+
+        header =~ /Digest (.*)/
         params = {}
         $1.gsub(/(\w+)="(.*?)"/) { params[$1] = $2 }
         params

diff --git a/spec/httparty/net_digest_auth_spec.rb b/spec/httparty/net_digest_auth_spec.rb
@@ -75,6 +75,17 @@ def authorization_header
     end
   end
 
+  context "when quality of protection (qop) is unquoted" do
+    before do
+      @digest = setup_digest({
+        'www-authenticate' => 'Digest realm="[email protected]", nonce="NONCE", qop=auth',
+      })
+    end
+
+    it "should still set qop" do
+      authorization_header.should include(%Q(qop="auth"))
+    end
+  end
 
   context "with unspecified quality of protection (qop)" do
     before do