diff options
Diffstat (limited to 'actionpack/test/controller/http_digest_authentication_test.rb')
-rw-r--r-- | actionpack/test/controller/http_digest_authentication_test.rb | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb index 75ae288d4c..854ec62774 100644 --- a/actionpack/test/controller/http_digest_authentication_test.rb +++ b/actionpack/test/controller/http_digest_authentication_test.rb @@ -51,7 +51,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase AUTH_HEADERS.each do |header| test "successful authentication with #{header.downcase}" do - @request.env[header] = encode_credentials(:username => "lifo", :password => "world") + @request.env[header] = encode_credentials(username: "lifo", password: "world") get :index assert_response :success @@ -61,7 +61,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase AUTH_HEADERS.each do |header| test "unsuccessful authentication with #{header.downcase}" do - @request.env[header] = encode_credentials(:username => "h4x0r", :password => "world") + @request.env[header] = encode_credentials(username: "h4x0r", password: "world") get :index assert_response :unauthorized @@ -79,7 +79,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with nil credentials" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => nil, :password => nil) + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: nil, password: nil) get :index assert_response :unauthorized @@ -88,7 +88,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with invalid password" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "foo") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "foo") get :display assert_response :unauthorized @@ -96,7 +96,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with invalid nonce" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please", :nonce => "xxyyzz") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please", nonce: "xxyyzz") get :display assert_response :unauthorized @@ -104,7 +104,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with invalid opaque" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "foo", :opaque => "xxyyzz") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "foo", opaque: "xxyyzz") get :display assert_response :unauthorized @@ -112,7 +112,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with invalid realm" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "foo", :realm => "NotSecret") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "foo", realm: "NotSecret") get :display assert_response :unauthorized @@ -120,7 +120,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with valid credential" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please") get :display assert_response :success @@ -128,7 +128,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with valid credential and nil session" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please") get :display @@ -137,7 +137,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with request-uri that doesn't match credentials digest-uri" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please") @request.env["PATH_INFO"] = "/proxied/uri" get :display @@ -146,7 +146,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with absolute request uri (as in webrick)" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please") @request.env["SERVER_NAME"] = "test.host" @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest" @@ -157,8 +157,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with absolute uri in credentials (as in IE)" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:url => "http://test.host/http_digest_authentication_test/dummy_digest", - :username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(url: "http://test.host/http_digest_authentication_test/dummy_digest", + username: "pretty", password: "please") get :display @@ -167,8 +167,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with absolute uri in both request and credentials (as in Webrick with IE)" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:url => "http://test.host/http_digest_authentication_test/dummy_digest", - :username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(url: "http://test.host/http_digest_authentication_test/dummy_digest", + username: "pretty", password: "please") @request.env["SERVER_NAME"] = "test.host" @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest" @@ -179,9 +179,9 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with password stored as ha1 digest hash" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "dhh", - :password => ::Digest::MD5::hexdigest(["dhh","SuperSecret","secret"].join(":")), - :password_is_ha1 => true) + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "dhh", + password: ::Digest::MD5::hexdigest(["dhh","SuperSecret","secret"].join(":")), + password_is_ha1: true) get :display assert_response :success @@ -189,7 +189,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "authentication request with _method" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please", :method => :post) + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please", method: :post) @request.env["rack.methodoverride.original_method"] = "POST" put :display @@ -198,13 +198,13 @@ class HttpDigestAuthenticationTest < ActionController::TestCase end test "validate_digest_response should fail with nil returning password_procedure" do - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => nil, :password => nil) + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: nil, password: nil) assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil} end test "authentication request with request-uri ending in '/'" do @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest/" - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please") # simulate normalizing PATH_INFO @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest" @@ -216,7 +216,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase test "authentication request with request-uri ending in '?'" do @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest/?" - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "pretty", password: "please") # simulate normalizing PATH_INFO @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest" @@ -228,8 +228,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase test "authentication request with absolute uri in credentials (as in IE) ending with /" do @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest/" - @request.env["HTTP_AUTHORIZATION"] = encode_credentials(:uri => "http://test.host/http_digest_authentication_test/dummy_digest/", - :username => "pretty", :password => "please") + @request.env["HTTP_AUTHORIZATION"] = encode_credentials(uri: "http://test.host/http_digest_authentication_test/dummy_digest/", + username: "pretty", password: "please") # simulate normalizing PATH_INFO @request.env["PATH_INFO"] = "/http_digest_authentication_test/dummy_digest" @@ -250,7 +250,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase private def encode_credentials(options) - options.reverse_merge!(:nc => "00000001", :cnonce => "0a4f113b", :password_is_ha1 => false) + options.reverse_merge!(nc: "00000001", cnonce: "0a4f113b", password_is_ha1: false) password = options.delete(:password) # Perform unauthenticated request to retrieve digest parameters to use on subsequent request @@ -269,7 +269,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase credentials.merge!(options) path_info = @request.env["PATH_INFO"].to_s uri = options[:uri] || path_info - credentials.merge!(:uri => uri) + credentials.merge!(uri: uri) @request.env["ORIGINAL_FULLPATH"] = path_info ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1]) end |