X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/24b138db094e4b5e8d062c5248ee867967dc0fd7..49f3bdddca927916b45ac18cd9e51da5825c386f:/test/controllers/api/old_nodes_controller_test.rb diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 0f8954541..badc7301b 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" module Api - class OldNodesControllerTest < ActionController::TestCase + class OldNodesControllerTest < ActionDispatch::IntegrationTest # # TODO: test history # @@ -15,7 +15,15 @@ module Api ) assert_routing( { :path => "/api/0.6/node/1/2", :method => :get }, - { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2" } + { :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2" } + ) + assert_routing( + { :path => "/api/0.6/node/1/history.json", :method => :get }, + { :controller => "api/old_nodes", :action => "history", :id => "1", :format => "json" } + ) + assert_routing( + { :path => "/api/0.6/node/1/2.json", :method => :get }, + { :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2", :format => "json" } ) assert_routing( { :path => "/api/0.6/node/1/2/redact", :method => :post }, @@ -40,10 +48,10 @@ module Api propagate_tags(node, node.old_nodes.last) ## First try this with a non-public user - basic_authorization private_user.email, "test" + auth_header = basic_authorization_header private_user.email, "test" # setup a simple XML node - xml_doc = private_node.to_xml + xml_doc = xml_for_node(private_node) xml_node = xml_doc.find("//osm/node").first nodeid = private_node.id @@ -57,10 +65,10 @@ module Api # randomly move the node about 3.times do # move the node somewhere else - xml_node["lat"] = precision(rand * 180 - 90).to_s - xml_node["lon"] = precision(rand * 360 - 180).to_s + xml_node["lat"] = precision((rand * 180) - 90).to_s + xml_node["lon"] = precision((rand * 360) - 180).to_s with_controller(NodesController.new) do - put :update, :params => { :id => nodeid }, :body => xml_doc.to_s + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :forbidden, "Should have rejected node update" xml_node["version"] = @response.body.to_s end @@ -75,7 +83,7 @@ module Api xml_tag["v"] = random_string xml_node << xml_tag with_controller(NodesController.new) do - put :update, :params => { :id => nodeid }, :body => xml_doc.to_s + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :forbidden, "should have rejected node #{nodeid} (#{@response.body}) with forbidden" xml_node["version"] = @response.body.to_s @@ -87,11 +95,11 @@ module Api # probably should check that they didn't get written to the database ## Now do it with the public user - basic_authorization user.email, "test" + auth_header = basic_authorization_header user.email, "test" # setup a simple XML node - xml_doc = node.to_xml + xml_doc = xml_for_node(node) xml_node = xml_doc.find("//osm/node").first nodeid = node.id @@ -105,10 +113,10 @@ module Api # randomly move the node about 3.times do # move the node somewhere else - xml_node["lat"] = precision(rand * 180 - 90).to_s - xml_node["lon"] = precision(rand * 360 - 180).to_s + xml_node["lat"] = precision((rand * 180) - 90).to_s + xml_node["lon"] = precision((rand * 360) - 180).to_s with_controller(NodesController.new) do - put :update, :params => { :id => nodeid }, :body => xml_doc.to_s + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :success xml_node["version"] = @response.body.to_s end @@ -123,7 +131,7 @@ module Api xml_tag["v"] = random_string xml_node << xml_tag with_controller(NodesController.new) do - put :update, :params => { :id => nodeid }, :body => xml_doc.to_s + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :success, "couldn't update node #{nodeid} (#{@response.body})" xml_node["version"] = @response.body.to_s @@ -134,7 +142,7 @@ module Api # check all the versions versions.each_key do |key| - get :version, :params => { :id => nodeid, :version => key.to_i } + get api_old_node_path(nodeid, key.to_i) assert_response :success, "couldn't get version #{key.to_i} of node #{nodeid}" @@ -153,13 +161,6 @@ module Api check_not_found_id_version(24356, create(:node).version) end - def check_not_found_id_version(id, version) - get :version, :params => { :id => id, :version => version } - assert_response :not_found - rescue ActionController::UrlGenerationError => e - assert_match(/No route matches/, e.to_s) - end - ## # Test that getting the current version is identical to picking # that version with the version URI call. @@ -186,6 +187,15 @@ module Api check_current_version(node_with_versions) end + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + def test_lat_lon_xml_format + old_node = create(:old_node, :latitude => (0.00004 * OldNode::SCALE).to_i, :longitude => (0.00008 * OldNode::SCALE).to_i) + + get api_node_history_path(old_node.node_id) + assert_match(/lat="0.0000400"/, response.body) + assert_match(/lon="0.0000800"/, response.body) + end + ## # test the redaction of an old version of a node, while not being # authorised. @@ -202,13 +212,14 @@ module Api # test the redaction of an old version of a node, while being # authorised as a normal user. def test_redact_node_normal_user - basic_authorization create(:user).email, "test" + auth_header = basic_authorization_header create(:user).email, "test" node = create(:node, :with_history, :version => 4) node_v3 = node.old_nodes.find_by(:version => 3) do_redact_node(node_v3, - create(:redaction)) + create(:redaction), + auth_header) assert_response :forbidden, "should need to be moderator to redact." end @@ -216,16 +227,54 @@ module Api # test that, even as moderator, the current version of a node # can't be redacted. def test_redact_node_current_version - basic_authorization create(:moderator_user).email, "test" + auth_header = basic_authorization_header create(:moderator_user).email, "test" node = create(:node, :with_history, :version => 4) node_v4 = node.old_nodes.find_by(:version => 4) do_redact_node(node_v4, - create(:redaction)) + create(:redaction), + auth_header) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end + def test_redact_node_by_regular_with_read_prefs_scope + auth_header = create_bearer_auth_header(create(:user), %w[read_prefs]) + do_redact_redactable_node(auth_header) + assert_response :forbidden, "should need to be moderator to redact." + end + + def test_redact_node_by_regular_with_write_api_scope + auth_header = create_bearer_auth_header(create(:user), %w[write_api]) + do_redact_redactable_node(auth_header) + assert_response :forbidden, "should need to be moderator to redact." + end + + def test_redact_node_by_regular_with_write_redactions_scope + auth_header = create_bearer_auth_header(create(:user), %w[write_redactions]) + do_redact_redactable_node(auth_header) + assert_response :forbidden, "should need to be moderator to redact." + end + + def test_redact_node_by_moderator_with_read_prefs_scope + auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs]) + do_redact_redactable_node(auth_header) + assert_response :forbidden, "should need to have write_redactions scope to redact." + end + + def test_redact_node_by_moderator_with_write_api_scope + auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api]) + do_redact_redactable_node(auth_header) + assert_response :success, "should be OK to redact old version as moderator with write_api scope." + # assert_response :forbidden, "should need to have write_redactions scope to redact." + end + + def test_redact_node_by_moderator_with_write_redactions_scope + auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions]) + do_redact_redactable_node(auth_header) + assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." + end + ## # test that redacted nodes aren't visible, regardless of # authorisation except as moderator... @@ -234,12 +283,12 @@ module Api node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - get :version, :params => { :id => node_v1.node_id, :version => node_v1.version } + get api_old_node_path(node_v1.node_id, node_v1.version) assert_response :forbidden, "Redacted node shouldn't be visible via the version API." # not even to a logged-in user - basic_authorization create(:user).email, "test" - get :version, :params => { :id => node_v1.node_id, :version => node_v1.version } + auth_header = basic_authorization_header create(:user).email, "test" + get api_old_node_path(node_v1.node_id, node_v1.version), :headers => auth_header assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." end @@ -250,15 +299,17 @@ module Api node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - get :history, :params => { :id => node_v1.node_id } + get api_node_history_path(node) assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, + "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history." # not even to a logged-in user - basic_authorization create(:user).email, "test" - get :history, :params => { :id => node_v1.node_id } + auth_header = basic_authorization_header create(:user).email, "test" + get api_node_history_path(node), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, + "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in." end ## @@ -267,25 +318,27 @@ module Api def test_redact_node_moderator node = create(:node, :with_history, :version => 4) node_v3 = node.old_nodes.find_by(:version => 3) - basic_authorization create(:moderator_user).email, "test" + auth_header = basic_authorization_header create(:moderator_user).email, "test" - do_redact_node(node_v3, create(:redaction)) + do_redact_node(node_v3, create(:redaction), auth_header) assert_response :success, "should be OK to redact old version as moderator." # check moderator can still see the redacted data, when passing # the appropriate flag - get :version, :params => { :id => node_v3.node_id, :version => node_v3.version } + get api_old_node_path(node_v3.node_id, node_v3.version), :headers => auth_header assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." - get :version, :params => { :id => node_v3.node_id, :version => node_v3.version, :show_redactions => "true" } + get api_old_node_path(node_v3.node_id, node_v3.version, :show_redactions => "true"), :headers => auth_header assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." # and when accessed via history - get :history, :params => { :id => node_v3.node_id } + get api_node_history_path(node) assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, "node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag." - get :history, :params => { :id => node_v3.node_id, :show_redactions => "true" } + assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, + "node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag." + get api_node_history_path(node, :show_redactions => "true"), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1, "node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag." + assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1, + "node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag." end # testing that if the moderator drops auth, he can't see the @@ -293,22 +346,23 @@ module Api def test_redact_node_is_redacted node = create(:node, :with_history, :version => 4) node_v3 = node.old_nodes.find_by(:version => 3) - basic_authorization create(:moderator_user).email, "test" + auth_header = basic_authorization_header create(:moderator_user).email, "test" - do_redact_node(node_v3, create(:redaction)) + do_redact_node(node_v3, create(:redaction), auth_header) assert_response :success, "should be OK to redact old version as moderator." # re-auth as non-moderator - basic_authorization create(:user).email, "test" + auth_header = basic_authorization_header create(:user).email, "test" # check can't see the redacted data - get :version, :params => { :id => node_v3.node_id, :version => node_v3.version } + get api_old_node_path(node_v3.node_id, node_v3.version), :headers => auth_header assert_response :forbidden, "Redacted node shouldn't be visible via the version API." # and when accessed via history - get :history, :params => { :id => node_v3.node_id } + get api_node_history_path(node), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, "redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history." + assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, + "redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history." end ## @@ -319,7 +373,7 @@ module Api node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - post :redact, :params => { :id => node_v1.node_id, :version => node_v1.version } + post node_version_redact_path(node_v1.node_id, node_v1.version) assert_response :unauthorized, "should need to be authenticated to unredact." end @@ -332,9 +386,9 @@ module Api node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - basic_authorization user.email, "test" + auth_header = basic_authorization_header user.email, "test" - post :redact, :params => { :id => node_v1.node_id, :version => node_v1.version } + post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header assert_response :forbidden, "should need to be moderator to unredact." end @@ -347,54 +401,69 @@ module Api node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - basic_authorization moderator_user.email, "test" + auth_header = basic_authorization_header moderator_user.email, "test" - post :redact, :params => { :id => node_v1.node_id, :version => node_v1.version } + post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header assert_response :success, "should be OK to unredact old version as moderator." # check moderator can now see the redacted data, when not # passing the aspecial flag - get :version, :params => { :id => node_v1.node_id, :version => node_v1.version } + get api_old_node_path(node_v1.node_id, node_v1.version), :headers => auth_header assert_response :success, "After unredaction, node should not be gone for moderator." # and when accessed via history - get :history, :params => { :id => node_v1.node_id } + get api_node_history_path(node) assert_response :success, "Unredaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, + "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag." - basic_authorization create(:user).email, "test" + auth_header = basic_authorization_header create(:user).email, "test" # check normal user can now see the redacted data - get :version, :params => { :id => node_v1.node_id, :version => node_v1.version } + get api_old_node_path(node_v1.node_id, node_v1.version), :headers => auth_header assert_response :success, "After unredaction, node should be visible to normal users." # and when accessed via history - get :history, :params => { :id => node_v1.node_id } + get api_node_history_path(node) assert_response :success, "Unredaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, + "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag." end private - def do_redact_node(node, redaction) - get :version, :params => { :id => node.node_id, :version => node.version } + def create_bearer_auth_header(user, scopes) + token = create(:oauth_access_token, + :resource_owner_id => user.id, + :scopes => scopes) + bearer_authorization_header(token.token) + end + + def do_redact_redactable_node(headers = {}) + node = create(:node, :with_history, :version => 4) + node_v3 = node.old_nodes.find_by(:version => 3) + do_redact_node(node_v3, create(:redaction), headers) + end + + def do_redact_node(node, redaction, headers = {}) + get api_old_node_path(node.node_id, node.version), :headers => headers assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}." # now redact it - post :redact, :params => { :id => node.node_id, :version => node.version, :redaction => redaction.id } + post node_version_redact_path(node.node_id, node.version), :params => { :redaction => redaction.id }, :headers => headers end def check_current_version(node_id) # get the current version of the node current_node = with_controller(NodesController.new) do - get :show, :params => { :id => node_id } + get api_node_path(node_id) assert_response :success, "cant get current node #{node_id}" Node.from_xml(@response.body) end assert_not_nil current_node, "getting node #{node_id} returned nil" # get the "old" version of the node from the old_node interface - get :version, :params => { :id => node_id, :version => current_node.version } + get api_old_node_path(node_id, current_node.version) assert_response :success, "cant get old node #{node_id}, v#{current_node.version}" old_node = Node.from_xml(@response.body) @@ -402,6 +471,13 @@ module Api assert_nodes_are_equal current_node, old_node end + def check_not_found_id_version(id, version) + get api_old_node_path(id, version) + assert_response :not_found + rescue ActionController::UrlGenerationError => e + assert_match(/No route matches/, e.to_s) + end + ## # returns a 16 character long string with some nasty characters in it. # this ought to stress-test the tag handling as well as the versioning. @@ -410,7 +486,7 @@ module Api ("a".."z").to_a, ("A".."Z").to_a, ("0".."9").to_a].flatten - (1..16).map { |_i| letters[rand(letters.length)] }.join + (1..16).map { letters[rand(letters.length)] }.join end ##