X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/671467a6ddfac77183c9af83abb119a849aa5e95..8ecb2c79f7146ecbb69d08cd38954836dc6d1b4c:/test/integration/oauth_test.rb?ds=sidebyside diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index 9eedd1ff4..70f161fc9 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -3,15 +3,11 @@ require "test_helper" class OAuthTest < ActionDispatch::IntegrationTest include OAuth::Helper - def setup - stub_hostip_requests - end - def test_oauth10_web_app client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) + user = create(:user) - post_via_redirect "/login", :username => client.user.email, :password => "test" - assert_response :success + session_for(user) oauth10_without_callback(client) oauth10_with_callback(client, "http://another.web.app.example.org/callback") @@ -20,9 +16,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10_desktop_app client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) + user = create(:user) - post_via_redirect "/login", :username => client.user.email, :password => "test" - assert_response :success + session_for(user) oauth10_without_callback(client) oauth10_refused(client) @@ -30,9 +26,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10a_web_app client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) + user = create(:user) - post_via_redirect "/login", :username => client.user.email, :password => "test" - assert_response :success + session_for(user) oauth10a_without_callback(client) oauth10a_with_callback(client, "http://another.web.app.example.org/callback") @@ -41,9 +37,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10a_desktop_app client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) + user = create(:user) - post_via_redirect "/login", :username => client.user.email, :password => "test" - assert_response :success + session_for(user) oauth10a_without_callback(client) oauth10a_refused(client) @@ -54,13 +50,13 @@ class OAuthTest < ActionDispatch::IntegrationTest def oauth10_without_callback(client) token = get_request_token(client) - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize post "/oauth/authorize", - :oauth_token => token.token, - :allow_read_prefs => true, :allow_write_prefs => true + :params => { :oauth_token => token.token, + :allow_read_prefs => "1", :allow_write_prefs => "1" } if client.callback_url assert_response :redirect assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}" @@ -74,7 +70,7 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_read_prefs] - signed_get "/oauth/access_token", :consumer => client, :token => token + signed_get "/oauth/access_token", :oauth => { :token => token } assert_response :success token.reload assert_not_nil token.created_at @@ -87,29 +83,45 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_read_prefs] - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + post logout_path + + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } assert_response :success - signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + signed_get "/api/0.6/gpx/2", :oauth => { :token => token } + assert_response :forbidden + + token.user.suspend! + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } + assert_response :forbidden + + token.user.hide! + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } assert_response :forbidden - post "/oauth/revoke", :token => token.token + token.user.unhide! + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } + assert_response :success + + session_for(token.user) + + post "/oauth/revoke", :params => { :token => token.token } assert_redirected_to oauth_clients_url(token.user.display_name) token = OauthToken.find_by(:token => token.token) assert_not_nil token.invalidated_at - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } assert_response :unauthorized end def oauth10_refused(client) token = get_request_token(client) - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize - post "/oauth/authorize", :oauth_token => token.token + post "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize_failure assert_select "p", "You have denied application #{client.name} access to your account." @@ -117,7 +129,7 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.authorized_at assert_not_nil token.invalidated_at - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize_failure assert_select "p", "The authorization token is not valid." @@ -125,7 +137,7 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.authorized_at assert_not_nil token.invalidated_at - post "/oauth/authorize", :oauth_token => token.token + post "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize_failure assert_select "p", "The authorization token is not valid." @@ -137,13 +149,13 @@ class OAuthTest < ActionDispatch::IntegrationTest def oauth10_with_callback(client, callback_url) token = get_request_token(client) - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize post "/oauth/authorize", - :oauth_token => token.token, :oauth_callback => callback_url, - :allow_write_api => true, :allow_read_gpx => true + :params => { :oauth_token => token.token, :oauth_callback => callback_url, + :allow_write_api => "1", :allow_read_gpx => "1" } assert_response :redirect assert_redirected_to "#{callback_url}?oauth_token=#{token.token}" token.reload @@ -152,7 +164,7 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_write_api, :allow_read_gpx] - signed_get "/oauth/access_token", :consumer => client, :token => token + signed_get "/oauth/access_token", :oauth => { :token => token } assert_response :success token.reload assert_not_nil token.created_at @@ -165,32 +177,48 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_write_api, :allow_read_gpx] - trace = create(:trace, :user => client.user) - signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token + post logout_path + + trace = create(:trace, :user => token.user) + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } assert_response :success - signed_get "/api/0.6/user/details", :consumer => client, :token => token + signed_get "/api/0.6/user/details", :oauth => { :token => token } + assert_response :forbidden + + token.user.suspend! + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } assert_response :forbidden - post "/oauth/revoke", :token => token.token + token.user.hide! + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } + assert_response :forbidden + + token.user.unhide! + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } + assert_response :success + + session_for(token.user) + + post "/oauth/revoke", :params => { :token => token.token } assert_redirected_to oauth_clients_url(token.user.display_name) token = OauthToken.find_by(:token => token.token) assert_not_nil token.invalidated_at - signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + signed_get "/api/0.6/gpx/2", :oauth => { :token => token } assert_response :unauthorized end def oauth10a_without_callback(client) token = get_request_token(client, :oauth_callback => "oob") - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize post "/oauth/authorize", - :oauth_token => token.token, - :allow_read_prefs => true, :allow_write_prefs => true + :params => { :oauth_token => token.token, + :allow_read_prefs => "1", :allow_write_prefs => "1" } if client.callback_url assert_response :redirect verifier = parse_verifier(response) @@ -208,11 +236,10 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_read_prefs] - signed_get "/oauth/access_token", :consumer => client, :token => token + signed_get "/oauth/access_token", :oauth => { :token => token } assert_response :unauthorized - signed_get "/oauth/access_token", - :consumer => client, :token => token, :oauth_verifier => verifier + signed_get "/oauth/access_token", :oauth => { :token => token, :oauth_verifier => verifier } assert_response :success token.reload assert_not_nil token.created_at @@ -225,32 +252,48 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_read_prefs] - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + post logout_path + + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } assert_response :success - trace = create(:trace, :user => client.user) - signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token + trace = create(:trace, :user => token.user) + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } + assert_response :forbidden + + token.user.suspend! + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } assert_response :forbidden - post "/oauth/revoke", :token => token.token + token.user.hide! + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } + assert_response :forbidden + + token.user.unhide! + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } + assert_response :success + + session_for(token.user) + + post "/oauth/revoke", :params => { :token => token.token } assert_redirected_to oauth_clients_url(token.user.display_name) token = OauthToken.find_by(:token => token.token) assert_not_nil token.invalidated_at - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + signed_get "/api/0.6/user/preferences", :oauth => { :token => token } assert_response :unauthorized end def oauth10a_with_callback(client, callback_url) token = get_request_token(client, :oauth_callback => callback_url) - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize post "/oauth/authorize", - :oauth_token => token.token, - :allow_write_api => true, :allow_read_gpx => true + :params => { :oauth_token => token.token, + :allow_write_api => "1", :allow_read_gpx => "1" } assert_response :redirect verifier = parse_verifier(response) assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}" @@ -260,11 +303,10 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_write_api, :allow_read_gpx] - signed_get "/oauth/access_token", :consumer => client, :token => token + signed_get "/oauth/access_token", :oauth => { :token => token } assert_response :unauthorized - signed_get "/oauth/access_token", - :consumer => client, :token => token, :oauth_verifier => verifier + signed_get "/oauth/access_token", :oauth => { :token => token, :oauth_verifier => verifier } assert_response :success token.reload assert_not_nil token.created_at @@ -277,30 +319,46 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.invalidated_at assert_allowed token, [:allow_write_api, :allow_read_gpx] - trace = create(:trace, :user => client.user) - signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token + post logout_path + + trace = create(:trace, :user => token.user) + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } assert_response :success - signed_get "/api/0.6/user/details", :consumer => client, :token => token + signed_get "/api/0.6/user/details", :oauth => { :token => token } + assert_response :forbidden + + token.user.suspend! + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } assert_response :forbidden - post "/oauth/revoke", :token => token.token + token.user.hide! + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } + assert_response :forbidden + + token.user.unhide! + signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token } + assert_response :success + + session_for(token.user) + + post "/oauth/revoke", :params => { :token => token.token } assert_redirected_to oauth_clients_url(token.user.display_name) token = OauthToken.find_by(:token => token.token) assert_not_nil token.invalidated_at - signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + signed_get "/api/0.6/gpx/2", :oauth => { :token => token } assert_response :unauthorized end def oauth10a_refused(client) token = get_request_token(client, :oauth_callback => "oob") - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize - post "/oauth/authorize", :oauth_token => token.token + post "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize_failure assert_select "p", "You have denied application #{client.name} access to your account." @@ -308,7 +366,7 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.authorized_at assert_not_nil token.invalidated_at - get "/oauth/authorize", :oauth_token => token.token + get "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize_failure assert_select "p", "The authorization token is not valid." @@ -316,7 +374,7 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_nil token.authorized_at assert_not_nil token.invalidated_at - post "/oauth/authorize", :oauth_token => token.token + post "/oauth/authorize", :params => { :oauth_token => token.token } assert_response :success assert_template :authorize_failure assert_select "p", "The authorization token is not valid." @@ -326,7 +384,7 @@ class OAuthTest < ActionDispatch::IntegrationTest end def get_request_token(client, options = {}) - signed_get "/oauth/request_token", options.merge(:consumer => client) + signed_get "/oauth/request_token", :oauth => options.merge(:consumer => client) assert_response :success token = parse_token(response) assert_instance_of RequestToken, token @@ -339,24 +397,6 @@ class OAuthTest < ActionDispatch::IntegrationTest token end - def signed_get(uri, options) - uri = URI.parse(uri) - uri.scheme ||= "http" - uri.host ||= "www.example.com" - - helper = OAuth::Client::Helper.new(nil, options) - - request = OAuth::RequestProxy.proxy( - "method" => "GET", - "uri" => uri, - "parameters" => helper.oauth_parameters - ) - - request.sign!(options) - - get request.signed_uri - end - def parse_token(response) params = CGI.parse(response.body) @@ -370,7 +410,7 @@ class OAuthTest < ActionDispatch::IntegrationTest params = CGI.parse(URI.parse(response.location).query) assert_not_nil params["oauth_verifier"] - assert params["oauth_verifier"].first.present? + assert_predicate params["oauth_verifier"].first, :present? params["oauth_verifier"].first end