Merge pull request rails#16011 from xjlu/token_and_options

Improve token_and_options regex and test

Author: rafaelfranca

actionpack/lib/action_controller/metal/http_authentication.rb

@@ -459,7 +459,7 @@ def rewrite_param_values(array_params)
       # pairs by the standardized `:`, `;`, or `\t` delimiters defined in
       # `AUTHN_PAIR_DELIMITERS`.
       def raw_params(auth)
-        auth.sub(TOKEN_REGEX, '').split(/"\s*#{AUTHN_PAIR_DELIMITERS}\s*/)
+        auth.sub(TOKEN_REGEX, '').split(/\s*#{AUTHN_PAIR_DELIMITERS}\s*/)
       end
 
       # Encodes the given token and options into an Authorization header value.

actionpack/test/controller/http_token_authentication_test.rb

@@ -139,16 +139,36 @@ def authenticate_long_credentials
     assert_equal(expected, actual)
   end
 
+  test "token_and_options returns correct token with nounce option" do
+    token = "rcHu+HzSFw89Ypyhn/896A="
+    nonce_hash = {nonce: "123abc"}
+    actual = ActionController::HttpAuthentication::Token.token_and_options(sample_request(token, nonce_hash))
+    expected_token = token
+    expected_nonce = {"nonce" => nonce_hash[:nonce]}
+    assert_equal(expected_token, actual.first)
+    assert_equal(expected_nonce, actual.last)
+  end
+
   test "token_and_options returns nil with no value after the equal sign" do
     actual = ActionController::HttpAuthentication::Token.token_and_options(malformed_request).first
     expected = nil
     assert_equal(expected, actual)
   end
 
+  test "raw_params returns a tuple of two key value pair strings" do
+    auth = sample_request("rcHu+HzSFw89Ypyhn/896A=").authorization.to_s
+    actual = ActionController::HttpAuthentication::Token.raw_params(auth)
+    expected = ["token=\"rcHu+HzSFw89Ypyhn/896A=\"", "nonce=\"def\""]
+    assert_equal(expected, actual)
+  end
+
   private
 
-    def sample_request(token)
-      @sample_request ||= OpenStruct.new authorization: %{Token token="#{token}", nonce="def"}
+    def sample_request(token, options = {nonce: "def"})
+      authorization = options.inject([%{Token token="#{token}"}]) do |arr, (k, v)|
+        arr << "#{k}=\"#{v}\""
+      end.join(", ")
+      @sample_request ||= OpenStruct.new authorization: authorization
     end
 
     def malformed_request