X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a9f4549327c9f19ac1ec14116d754077158ad8c9..9ef85e42ba4a3b10157b2aa0711e68acaf9e3f9e:/test/integration/oauth_test.rb diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index fbb947af4..b52f55ea5 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -1,81 +1,73 @@ -require File.dirname(__FILE__) + '/../test_helper' +require "test_helper" class OAuthTest < ActionDispatch::IntegrationTest fixtures :users, :client_applications, :gpx_files + set_fixture_class :gpx_files => Trace include OAuth::Helper def test_oauth10_web_app client = client_applications(:oauth_web_app) - post_via_redirect "/login", - :username => client.user.email, :password => "test" + post_via_redirect "/login", :username => client.user.email, :password => "test" assert_response :success - signed_get "/oauth/request_token", :consumer => client - assert_response :success - token = parse_token(response) - assert_instance_of RequestToken, token - assert_not_nil token.created_at - assert_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, client.permissions + oauth10_without_callback(client) + oauth10_with_callback(client, "http://another.web.app.org/callback") + oauth10_refused(client) + end - post "/oauth/authorize", - :oauth_token => token.token, - :allow_read_prefs => true, :allow_write_prefs => true - assert_response :redirect - assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}" - token.reload - assert_not_nil token.created_at - assert_not_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] + def test_oauth10_desktop_app + client = client_applications(:oauth_desktop_app) - signed_get "/oauth/access_token", :consumer => client, :token => token + post_via_redirect "/login", :username => client.user.email, :password => "test" assert_response :success - token.reload - assert_not_nil token.created_at - assert_not_nil token.authorized_at - assert_not_nil token.invalidated_at - token = parse_token(response) - assert_instance_of AccessToken, token - assert_not_nil token.created_at - assert_not_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + oauth10_without_callback(client) + oauth10_refused(client) + end + + def test_oauth10a_web_app + client = client_applications(:oauth_web_app) + + post_via_redirect "/login", :username => client.user.email, :password => "test" assert_response :success - post "/oauth/revoke", :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 + oauth10a_without_callback(client) + oauth10a_with_callback(client, "http://another.web.app.org/callback") + oauth10a_refused(client) + end - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token - assert_response :unauthorized + def test_oauth10a_desktop_app + client = client_applications(:oauth_desktop_app) - signed_get "/oauth/request_token", :consumer => client + post_via_redirect "/login", :username => client.user.email, :password => "test" assert_response :success - token = parse_token(response) - assert_instance_of RequestToken, token - assert_not_nil token.created_at - assert_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, client.permissions - post "/oauth/authorize", - :oauth_token => token.token, - :oauth_callback => "http://another.web.app.org/callback", - :allow_write_api => true, :allow_read_gpx => true - assert_response :redirect - assert_redirected_to "http://another.web.app.org/callback?oauth_token=#{token.token}" + oauth10a_without_callback(client) + oauth10a_refused(client) + end + + private + + def oauth10_without_callback(client) + token = get_request_token(client) + + post "/oauth/authorize", + :oauth_token => token.token, + :allow_read_prefs => true, :allow_write_prefs => true + if client.callback_url + assert_response :redirect + assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}" + else + assert_response :success + assert_template :authorize_success + end token.reload assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_write_api, :allow_read_gpx ] + assert_allowed token, [:allow_read_prefs] signed_get "/oauth/access_token", :consumer => client, :token => token assert_response :success @@ -88,46 +80,56 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_write_api, :allow_read_gpx ] + assert_allowed token, [:allow_read_prefs] - signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + signed_get "/api/0.6/user/preferences", :consumer => client, :token => token assert_response :success + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + assert_response :forbidden + post "/oauth/revoke", :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/user/preferences", :consumer => client, :token => token assert_response :unauthorized end - def test_oauth10_desktop_app - client = client_applications(:oauth_desktop_app) + def oauth10_refused(client) + token = get_request_token(client) - post_via_redirect "/login", - :username => client.user.email, :password => "test" + post "/oauth/authorize", :oauth_token => token.token assert_response :success + assert_template :authorize_failure + assert_select "p", "You have denied application #{client.name} access to your account." + token.reload + assert_nil token.authorized_at + assert_not_nil token.invalidated_at - signed_get "/oauth/request_token", :consumer => client + post "/oauth/authorize", :oauth_token => token.token assert_response :success - token = parse_token(response) - assert_instance_of RequestToken, token - assert_not_nil token.created_at + assert_template :authorize_failure + assert_select "p", "The authorization token is not valid." + token.reload assert_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, client.permissions + assert_not_nil token.invalidated_at + end - post "/oauth/authorize", - :oauth_token => token.token, - :allow_read_prefs => true, :allow_write_prefs => true - assert_response :success - assert_template "authorize_success" + def oauth10_with_callback(client, callback_url) + token = get_request_token(client) + + post "/oauth/authorize", + :oauth_token => token.token, :oauth_callback => callback_url, + :allow_write_api => true, :allow_read_gpx => true + assert_response :redirect + assert_redirected_to "#{callback_url}?oauth_token=#{token.token}" token.reload assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] + assert_allowed token, [:allow_write_api, :allow_read_gpx] signed_get "/oauth/access_token", :consumer => client, :token => token assert_response :success @@ -140,54 +142,51 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] + assert_allowed token, [:allow_write_api, :allow_read_gpx] - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token assert_response :success + signed_get "/api/0.6/user/details", :consumer => client, :token => token + assert_response :forbidden + post "/oauth/revoke", :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/gpx/2", :consumer => client, :token => token assert_response :unauthorized end - def test_oauth10a_web_app - client = client_applications(:oauth_web_app) - - post_via_redirect "/login", - :username => client.user.email, :password => "test" - assert_response :success - - signed_get "/oauth/request_token", - :consumer => client, :oauth_callback => "oob" - assert_response :success - token = parse_token(response) - assert_instance_of RequestToken, token - assert_not_nil token.created_at - assert_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, client.permissions + def oauth10a_without_callback(client) + token = get_request_token(client, :oauth_callback => "oob") post "/oauth/authorize", - :oauth_token => token.token, - :allow_read_prefs => true, :allow_write_prefs => true - assert_response :redirect - verifier = parse_verifier(response) - assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}" + :oauth_token => token.token, + :allow_read_prefs => true, :allow_write_prefs => true + if client.callback_url + assert_response :redirect + verifier = parse_verifier(response) + assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}" + else + assert_response :success + assert_template :authorize_success + m = response.body.match("

The verification code is ([A-Za-z0-9]+).

") + assert_not_nil m + verifier = m[1] + end token.reload assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] + assert_allowed token, [:allow_read_prefs] signed_get "/oauth/access_token", :consumer => client, :token => token assert_response :unauthorized signed_get "/oauth/access_token", - :consumer => client, :token => token, :oauth_verifier => verifier + :consumer => client, :token => token, :oauth_verifier => verifier assert_response :success token.reload assert_not_nil token.created_at @@ -198,11 +197,14 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] + assert_allowed token, [:allow_read_prefs] signed_get "/api/0.6/user/preferences", :consumer => client, :token => token assert_response :success + signed_get "/api/0.6/gpx/2", :consumer => client, :token => token + assert_response :forbidden + post "/oauth/revoke", :token => token.token assert_redirected_to oauth_clients_url(token.user.display_name) token = OauthToken.find_by_token(token.token) @@ -210,35 +212,28 @@ class OAuthTest < ActionDispatch::IntegrationTest signed_get "/api/0.6/user/preferences", :consumer => client, :token => token assert_response :unauthorized + end - signed_get "/oauth/request_token", - :consumer => client, - :oauth_callback => "http://another.web.app.org/callback" - assert_response :success - token = parse_token(response) - assert_instance_of RequestToken, token - assert_not_nil token.created_at - assert_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, client.permissions + def oauth10a_with_callback(client, callback_url) + token = get_request_token(client, :oauth_callback => callback_url) post "/oauth/authorize", - :oauth_token => token.token, - :allow_write_api => true, :allow_read_gpx => true + :oauth_token => token.token, + :allow_write_api => true, :allow_read_gpx => true assert_response :redirect verifier = parse_verifier(response) - assert_redirected_to "http://another.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}" + assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}" token.reload assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_write_api, :allow_read_gpx ] + assert_allowed token, [:allow_write_api, :allow_read_gpx] signed_get "/oauth/access_token", :consumer => client, :token => token assert_response :unauthorized signed_get "/oauth/access_token", - :consumer => client, :token => token, :oauth_verifier => verifier + :consumer => client, :token => token, :oauth_verifier => verifier assert_response :success token.reload assert_not_nil token.created_at @@ -249,11 +244,14 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_not_nil token.created_at assert_not_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_write_api, :allow_read_gpx ] + assert_allowed token, [:allow_write_api, :allow_read_gpx] signed_get "/api/0.6/gpx/2", :consumer => client, :token => token assert_response :success + signed_get "/api/0.6/user/details", :consumer => client, :token => token + assert_response :forbidden + post "/oauth/revoke", :token => token.token assert_redirected_to oauth_clients_url(token.user.display_name) token = OauthToken.find_by_token(token.token) @@ -263,68 +261,39 @@ class OAuthTest < ActionDispatch::IntegrationTest assert_response :unauthorized end - def test_oauth10a_desktop_app - client = client_applications(:oauth_desktop_app) - - post_via_redirect "/login", - :username => client.user.email, :password => "test" - assert_response :success + def oauth10a_refused(client) + token = get_request_token(client, :oauth_callback => "oob") - signed_get "/oauth/request_token", - :consumer => client, :oauth_callback => "oob" + post "/oauth/authorize", :oauth_token => token.token assert_response :success - token = parse_token(response) - assert_instance_of RequestToken, token - assert_not_nil token.created_at + assert_template :authorize_failure + assert_select "p", "You have denied application #{client.name} access to your account." + token.reload assert_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, client.permissions + assert_not_nil token.invalidated_at - post "/oauth/authorize", - :oauth_token => token.token, - :allow_read_prefs => true, :allow_write_prefs => true + post "/oauth/authorize", :oauth_token => token.token assert_response :success - assert_template "authorize_success" - m = response.body.match("

The verification code is ([A-Za-z0-9]+).

") - assert_not_nil m - verifier = m[1] + assert_template :authorize_failure + assert_select "p", "The authorization token is not valid." token.reload - assert_not_nil token.created_at - assert_not_nil token.authorized_at - assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] - - signed_get "/oauth/access_token", :consumer => client, :token => token - assert_response :unauthorized + assert_nil token.authorized_at + assert_not_nil token.invalidated_at + end - signed_get "/oauth/access_token", - :consumer => client, :token => token, :oauth_verifier => verifier + def get_request_token(client, options = {}) + signed_get "/oauth/request_token", options.merge(:consumer => client) assert_response :success - token.reload - assert_not_nil token.created_at - assert_not_nil token.authorized_at - assert_not_nil token.invalidated_at token = parse_token(response) - assert_instance_of AccessToken, token + assert_instance_of RequestToken, token assert_not_nil token.created_at - assert_not_nil token.authorized_at + assert_nil token.authorized_at assert_nil token.invalidated_at - assert_allowed token, [ :allow_read_prefs ] - - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token - assert_response :success - - post "/oauth/revoke", :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 + assert_allowed token, client.permissions - signed_get "/api/0.6/user/preferences", :consumer => client, :token => token - assert_response :unauthorized + token end -private - def signed_get(uri, options) uri = URI.parse(uri) uri.scheme ||= "http"