X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b7e795e1e18c91ce9be79cc8d0d773e5588fe847..d3d6e9902c8b03fcd31df253cf395f06f757880a:/test/integration/oauth_test.rb?ds=sidebyside

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index eb4a599bd..62eab0dee 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,81 +1,81 @@
-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
 
+  setup do
+    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+  end
+
   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
+    oauth10_without_callback(client)
+    oauth10_with_callback(client, "http://another.web.app.org/callback")
+    oauth10_refused(client)
+  end
+
+  def test_oauth10_desktop_app
+    client = client_applications(:oauth_desktop_app)
+
+    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, 
-      :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 ]
+    oauth10_without_callback(client)
+    oauth10_refused(client)
+  end
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+  def test_oauth10a_web_app
+    client = client_applications(:oauth_web_app)
+
+    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
+    oauth10a_without_callback(client)
+    oauth10a_with_callback(client, "http://another.web.app.org/callback")
+    oauth10a_refused(client)
+  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
 
-    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_refused(client)
+  end
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
-    assert_response :unauthorized
+  private
 
-    signed_get "/oauth/request_token", :consumer => client
+  def oauth10_without_callback(client)
+    token = get_request_token(client)
+
+    get "/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_nil token.authorized_at
-    assert_nil token.invalidated_at
-    assert_allowed token, client.permissions
+    assert_template :authorize
 
-    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}"
+    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 +88,72 @@ 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)
+    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"
+    get "/oauth/authorize", :oauth_token => token.token
     assert_response :success
+    assert_template :authorize
 
-    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", "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
+    get "/oauth/authorize", :oauth_token => token.token
     assert_response :success
-    assert_template "authorize_success"
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
+    post "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+  end
+
+  def oauth10_with_callback(client, callback_url)
+    token = get_request_token(client)
+
+    get "/oauth/authorize", :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
+    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 +166,55 @@ 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)
+    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)
+  def oauth10a_without_callback(client)
+    token = get_request_token(client, :oauth_callback => "oob")
 
-    post_via_redirect "/login",
-      :username => client.user.email, :password => "test"
+    get "/oauth/authorize", :oauth_token => token.token
     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
+    assert_template :authorize
 
     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("<p>The verification code is ([A-Za-z0-9]+).</p>")
+      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,47 +225,47 @@ 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)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
     assert_response :unauthorized
+  end
+
+  def oauth10a_with_callback(client, callback_url)
+    token = get_request_token(client, :oauth_callback => callback_url)
 
-    signed_get "/oauth/request_token",
-      :consumer => client,
-      :oauth_callback => "http://another.web.app.org/callback"
+    get "/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_nil token.authorized_at
-    assert_nil token.invalidated_at
-    assert_allowed token, client.permissions
+    assert_template :authorize
 
     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,82 +276,69 @@ 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)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
     assert_response :unauthorized
   end
 
-  def test_oauth10a_desktop_app
-    client = client_applications(:oauth_desktop_app)
+  def oauth10a_refused(client)
+    token = get_request_token(client, :oauth_callback => "oob")
 
-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
+    get "/oauth/authorize", :oauth_token => token.token
     assert_response :success
+    assert_template :authorize
 
-    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
+    get "/oauth/authorize", :oauth_token => token.token
     assert_response :success
-    assert_template "authorize_success"
-    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+)</p>")
-    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
 
-    signed_get "/oauth/access_token",
-      :consumer => client, :token => token, :oauth_verifier => verifier
+    post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
+    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.authorized_at
     assert_not_nil token.invalidated_at
+  end
+
+  def get_request_token(client, options = {})
+    signed_get "/oauth/request_token", options.merge(:consumer => client)
+    assert_response :success
     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_equal options[:oauth_callback], token.callback_url
+    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"
@@ -346,7 +360,7 @@ private
   def parse_token(response)
     params = CGI.parse(response.body)
 
-    token = OauthToken.find_by_token(params["oauth_token"].first)
+    token = OauthToken.find_by(:token => params["oauth_token"].first)
     assert_equal token.secret, params["oauth_token_secret"].first
 
     token