X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6a276202e559903cd0e21fb25b8f72a01cbd9314..e9cb282712bdd5f0e103a33c35c7ef3961506ab7:/test/functional/old_node_controller_test.rb?ds=inline diff --git a/test/functional/old_node_controller_test.rb b/test/functional/old_node_controller_test.rb index 4b0cf0363..44edc06a2 100644 --- a/test/functional/old_node_controller_test.rb +++ b/test/functional/old_node_controller_test.rb @@ -1,30 +1,42 @@ require File.dirname(__FILE__) + '/../test_helper' require 'old_node_controller' -# Re-raise errors caught by the controller. -class OldNodeController; def rescue_action(e) raise e end; end - -class OldNodeControllerTest < Test::Unit::TestCase +class OldNodeControllerTest < ActionController::TestCase api_fixtures - def setup - @controller = OldNodeController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - # # TODO: test history # + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/node/1/history", :method => :get }, + { :controller => "old_node", :action => "history", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/node/1/2", :method => :get }, + { :controller => "old_node", :action => "version", :id => "1", :version => "2" } + ) + assert_routing( + { :path => "/api/0.6/node/1/2/redact", :method => :post }, + { :controller => "old_node", :action => "redact", :id => "1", :version => "2" } + ) + end + ## # test the version call by submitting several revisions of a new node # to the API and ensuring that later calls to version return the # matching versions of the object. + # + ## + # FIXME Move this test to being an integration test since it spans multiple controllers def test_version + ## First try this with a non-public user basic_authorization(users(:normal_user).email, "test") changeset_id = changesets(:normal_user_first_change).id - + # setup a simple XML node xml_doc = current_nodes(:visible_node).to_xml xml_node = xml_doc.find("//osm/node").first @@ -37,6 +49,57 @@ class OldNodeControllerTest < Test::Unit::TestCase # save a version for later checking versions[xml_node['version']] = xml_doc.to_s + # randomly move the node about + 20.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 + with_controller(NodeController.new) do + content xml_doc + put :update, :id => nodeid + assert_response :forbidden, "Should have rejected node update" + xml_node['version'] = @response.body.to_s + end + # save a version for later checking + versions[xml_node['version']] = xml_doc.to_s + end + + # add a bunch of random tags + 30.times do + xml_tag = XML::Node.new("tag") + xml_tag['k'] = random_string + xml_tag['v'] = random_string + xml_node << xml_tag + with_controller(NodeController.new) do + content xml_doc + put :update, :id => nodeid + assert_response :forbidden, + "should have rejected node #{nodeid} (#{@response.body}) with forbidden" + xml_node['version'] = @response.body.to_s + end + # save a version for later checking + versions[xml_node['version']] = xml_doc.to_s + end + + # probably should check that they didn't get written to the database + + + ## Now do it with the public user + basic_authorization(users(:public_user).email, "test") + changeset_id = changesets(:public_user_first_change).id + + # setup a simple XML node + xml_doc = current_nodes(:node_with_versions).to_xml + xml_node = xml_doc.find("//osm/node").first + nodeid = current_nodes(:node_with_versions).id + + # keep a hash of the versions => string, as we'll need something + # to test against later + versions = Hash.new + + # save a version for later checking + versions[xml_node['version']] = xml_doc.to_s + # randomly move the node about 20.times do # move the node somewhere else @@ -82,7 +145,21 @@ class OldNodeControllerTest < Test::Unit::TestCase assert_nodes_are_equal check_node, api_node end end - + + def test_not_found_version + check_not_found_id_version(70000,312344) + check_not_found_id_version(-1, -13) + check_not_found_id_version(nodes(:visible_node).id, 24354) + check_not_found_id_version(24356, nodes(:visible_node).version) + end + + def check_not_found_id_version(id, version) + get :version, :id => id, :version => version + assert_response :not_found + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end + ## # Test that getting the current version is identical to picking # that version with the version URI call. @@ -93,7 +170,125 @@ class OldNodeControllerTest < Test::Unit::TestCase check_current_version(current_nodes(:node_used_by_relationship)) check_current_version(current_nodes(:node_with_versions)) end - + + ## + # test the redaction of an old version of a node, while not being + # authorised. + def test_redact_node_unauthorised + do_redact_node(nodes(:node_with_versions_v3), + redactions(:example)) + assert_response :unauthorized, "should need to be authenticated to redact." + end + + ## + # 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(users(:public_user).email, "test") + + do_redact_node(nodes(:node_with_versions_v3), + redactions(:example)) + assert_response :forbidden, "should need to be moderator to redact." + end + + ## + # test that, even as moderator, the current version of a node + # can't be redacted. + def test_redact_node_current_version + basic_authorization(users(:moderator_user).email, "test") + + do_redact_node(nodes(:node_with_versions_v4), + redactions(:example)) + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + end + + ## + # test that redacted nodes aren't visible, regardless of + # authorisation except as moderator... + def test_version_redacted + node = nodes(:redacted_node_redacted_version) + + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." + end + + ## + # test that redacted nodes aren't visible in the history + def test_history_redacted + node = nodes(:redacted_node_redacted_version) + + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history." + + # not even to a logged-in user + basic_authorization(users(:public_user).email, "test") + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history, even when logged in." + end + + ## + # test the redaction of an old version of a node, while being + # authorised as a moderator. + def test_redact_node_moderator + node = nodes(:node_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_node(node, redactions(:example)) + 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, :id => node.node_id, :version => node.version + assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." + get :version, :id => node.node_id, :version => node.version, :show_redactions => 'true' + assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." + + # and when accessed via history + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag." + get :history, :id => node.node_id, :show_redactions => 'true' + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 1, "node #{node.node_id} version #{node.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 + # redacted stuff any more. + def test_redact_node_is_redacted + node = nodes(:node_with_versions_v3) + basic_authorization(users(:moderator_user).email, "test") + + do_redact_node(node, redactions(:example)) + assert_response :success, "should be OK to redact old version as moderator." + + # re-auth as non-moderator + basic_authorization(users(:public_user).email, "test") + + # check can't see the redacted data + get :version, :id => node.node_id, :version => node.version + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." + + # and when accessed via history + get :history, :id => node.node_id + assert_response :success, "Redaction shouldn't have stopped history working." + assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history." + end + + def do_redact_node(node, redaction) + get :version, :id => node.node_id, :version => node.version + assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}." + + # now redact it + post :redact, :id => node.node_id, :version => node.version, :redaction => redaction.id + end + def check_current_version(node_id) # get the current version of the node current_node = with_controller(NodeController.new) do @@ -112,20 +307,6 @@ class OldNodeControllerTest < Test::Unit::TestCase assert_nodes_are_equal current_node, old_node end - ## - # for some reason a==b is false, but there doesn't seem to be any - # difference between the nodes, so i'm checking all the attributes - # manually and blaming it on ActiveRecord - def assert_nodes_are_equal(a, b) - assert_equal a.id, b.id, "node IDs" - assert_equal a.latitude, b.latitude, "latitude on node #{a.id}" - assert_equal a.longitude, b.longitude, "longitude on node #{a.id}" - assert_equal a.changeset_id, b.changeset_id, "changeset ID on node #{a.id}" - assert_equal a.visible, b.visible, "visible on node #{a.id}" - assert_equal a.version, b.version, "version on node #{a.id}" - assert_equal a.tags, b.tags, "tags on node #{a.id}" - 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. @@ -144,27 +325,4 @@ class OldNodeControllerTest < Test::Unit::TestCase def precision(f) return (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE end - - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") - end - - def content(c) - @request.env["RAW_POST_DATA"] = c.to_s - end - - ## - # takes a block which is executed in the context of a different - # ActionController instance. this is used so that code can call methods - # on the node controller whilst testing the old_node controller. - def with_controller(new_controller) - controller_save = @controller - begin - @controller = new_controller - yield - ensure - @controller = controller_save - end - end - end