X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/98184dfb9cacc74ac5bcb91a41a2d5804b3f4f7d..443080d7b05b5e2cc3310699f5e9d5edde010aca:/test/controllers/node_controller_test.rb?ds=inline diff --git a/test/controllers/node_controller_test.rb b/test/controllers/node_controller_test.rb index 3d689bb3f..0cfc2267c 100644 --- a/test/controllers/node_controller_test.rb +++ b/test/controllers/node_controller_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class NodeControllerTest < ActionController::TestCase api_fixtures @@ -31,46 +31,42 @@ class NodeControllerTest < ActionController::TestCase def test_create # cannot read password from fixture as it is stored as MD5 digest ## First try with no auth - + # create a node with random lat/lon - lat = rand(100)-50 + rand - lon = rand(100)-50 + rand + lat = rand(100) - 50 + rand + lon = rand(100) - 50 + rand # normal user has a changeset open, so we'll use that. changeset = changesets(:normal_user_first_change) # create a minimal xml file content("") - assert_difference('OldNode.count', 0) do + assert_difference("OldNode.count", 0) do put :create end # hope for unauthorized assert_response :unauthorized, "node upload did not return unauthorized status" - - ## Now try with the user which doesn't have their data public basic_authorization(users(:normal_user).email, "test") - + # create a node with random lat/lon - lat = rand(100)-50 + rand - lon = rand(100)-50 + rand + lat = rand(100) - 50 + rand + lon = rand(100) - 50 + rand # normal user has a changeset open, so we'll use that. changeset = changesets(:normal_user_first_change) # create a minimal xml file content("") - assert_difference('Node.count', 0) do + assert_difference("Node.count", 0) do put :create end # hope for success assert_require_public_data "node create did not return forbidden status" - - ## Now try with the user that has the public data basic_authorization(users(:public_user).email, "test") - + # create a node with random lat/lon - lat = rand(100)-50 + rand - lon = rand(100)-50 + rand + lat = rand(100) - 50 + rand + lon = rand(100) - 50 + rand # normal user has a changeset open, so we'll use that. changeset = changesets(:public_user_first_change) # create a minimal xml file @@ -99,7 +95,7 @@ class NodeControllerTest < ActionController::TestCase changeset = changesets(:public_user_first_change) lat = 3.434 lon = 3.23 - + # test that the upload is rejected when xml is valid, but osm doc isn't content("") put :create @@ -139,11 +135,10 @@ class NodeControllerTest < ActionController::TestCase assert_equal "Cannot parse valid node from xml string . lon not a number", @response.body # test that the upload is rejected when we have a tag which is too long - content("") + content("") put :create assert_response :bad_request, "node upload did not return bad_request status" - assert_equal ["NodeTag ", " v: is too long (maximum is 255 characters) (\"#{'x'*256}\")"], @response.body.split(/[0-9]+,foo:/) - + assert_equal ["NodeTag ", " v: is too long (maximum is 255 characters) (\"#{'x' * 256}\")"], @response.body.split(/[0-9]+,foo:/) end def test_read @@ -166,10 +161,9 @@ class NodeControllerTest < ActionController::TestCase ## first try to delete node without auth delete :delete, :id => current_nodes(:visible_node).id assert_response :unauthorized - - + ## now set auth for the non-data public user - basic_authorization(users(:normal_user).email, "test"); + basic_authorization(users(:normal_user).email, "test") # try to delete with an invalid (closed) changeset content update_changeset(current_nodes(:visible_node).to_xml, @@ -178,7 +172,7 @@ class NodeControllerTest < ActionController::TestCase assert_require_public_data("non-public user shouldn't be able to delete node") # try to delete with an invalid (non-existent) changeset - content update_changeset(current_nodes(:visible_node).to_xml,0) + content update_changeset(current_nodes(:visible_node).to_xml, 0) delete :delete, :id => current_nodes(:visible_node).id assert_require_public_data("shouldn't be able to delete node, when user's data is private") @@ -200,19 +194,15 @@ class NodeControllerTest < ActionController::TestCase # in a way... content(nodes(:used_node_1).to_xml) delete :delete, :id => current_nodes(:used_node_1).id - assert_require_public_data - "shouldn't be able to delete a node used in a way (#{@response.body})" + assert_require_public_data "shouldn't be able to delete a node used in a way (#{@response.body})" # in a relation... content(nodes(:node_used_by_relationship).to_xml) delete :delete, :id => current_nodes(:node_used_by_relationship).id - assert_require_public_data - "shouldn't be able to delete a node used in a relation (#{@response.body})" - - + assert_require_public_data "shouldn't be able to delete a node used in a relation (#{@response.body})" ## now set auth for the public data user - basic_authorization(users(:public_user).email, "test"); + basic_authorization(users(:public_user).email, "test") # try to delete with an invalid (closed) changeset content update_changeset(current_nodes(:visible_node).to_xml, @@ -221,21 +211,21 @@ class NodeControllerTest < ActionController::TestCase assert_response :conflict # try to delete with an invalid (non-existent) changeset - content update_changeset(current_nodes(:visible_node).to_xml,0) + content update_changeset(current_nodes(:visible_node).to_xml, 0) delete :delete, :id => current_nodes(:visible_node).id assert_response :conflict # try to delete a node with a different ID content(nodes(:public_visible_node).to_xml) delete :delete, :id => current_nodes(:visible_node).id - assert_response :bad_request, - "should not be able to delete a node with a different ID from the XML" + assert_response :bad_request, + "should not be able to delete a node with a different ID from the XML" # try to delete a node rubbish in the payloads content("") delete :delete, :id => current_nodes(:visible_node).id - assert_response :bad_request, - "should not be able to delete a node without a valid XML payload" + assert_response :bad_request, + "should not be able to delete a node without a valid XML payload" # valid delete now takes a payload content(nodes(:public_visible_node).to_xml) @@ -245,7 +235,7 @@ class NodeControllerTest < ActionController::TestCase # valid delete should return the new version number, which should # be greater than the old version number assert @response.body.to_i > current_nodes(:public_visible_node).version, - "delete request should return a new version number for node" + "delete request should return a new version number for node" # deleting the same node twice doesn't work content(nodes(:public_visible_node).to_xml) @@ -261,14 +251,14 @@ class NodeControllerTest < ActionController::TestCase content(nodes(:used_node_1).to_xml) delete :delete, :id => current_nodes(:used_node_1).id assert_response :precondition_failed, - "shouldn't be able to delete a node used in a way (#{@response.body})" + "shouldn't be able to delete a node used in a way (#{@response.body})" assert_equal "Precondition failed: Node 3 is still used by ways 1,3.", @response.body # in a relation... content(nodes(:node_used_by_relationship).to_xml) delete :delete, :id => current_nodes(:node_used_by_relationship).id assert_response :precondition_failed, - "shouldn't be able to delete a node used in a relation (#{@response.body})" + "shouldn't be able to delete a node used in a relation (#{@response.body})" assert_equal "Precondition failed: Node 5 is still used by relations 1,3.", @response.body end @@ -282,11 +272,9 @@ class NodeControllerTest < ActionController::TestCase content current_nodes(:visible_node).to_xml put :update, :id => current_nodes(:visible_node).id assert_response :unauthorized - - - + ## Second test with the private user - + # setup auth basic_authorization(users(:normal_user).email, "test") @@ -310,35 +298,35 @@ class NodeControllerTest < ActionController::TestCase assert_require_public_data("update with changeset=0 should be forbidden, when data isn't public") ## try and submit invalid updates - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lat', 91.0); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lat", 91.0) put :update, :id => current_nodes(:visible_node).id assert_require_public_data "node at lat=91 should be forbidden, when data isn't public" - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lat', -91.0); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lat", -91.0) put :update, :id => current_nodes(:visible_node).id assert_require_public_data "node at lat=-91 should be forbidden, when data isn't public" - - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lon', 181.0); + + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lon", 181.0) put :update, :id => current_nodes(:visible_node).id assert_require_public_data "node at lon=181 should be forbidden, when data isn't public" - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lon', -181.0); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lon", -181.0) put :update, :id => current_nodes(:visible_node).id assert_require_public_data "node at lon=-181 should be forbidden, when data isn't public" - + ## finally, produce a good request which should work content current_nodes(:visible_node).to_xml put :update, :id => current_nodes(:visible_node).id assert_require_public_data "should have failed with a forbidden when data isn't public" - + ## Finally test with the public user - + # try and update a node without authorisation # first try to delete node without auth content current_nodes(:visible_node).to_xml put :update, :id => current_nodes(:visible_node).id assert_response :forbidden - + # setup auth basic_authorization(users(:public_user).email, "test") @@ -346,7 +334,7 @@ class NodeControllerTest < ActionController::TestCase # try and update in someone else's changeset content update_changeset(current_nodes(:visible_node).to_xml, - changesets(:normal_user_first_change).id) + changesets(:normal_user_first_change).id) put :update, :id => current_nodes(:visible_node).id assert_response :conflict, "update with other user's changeset should be rejected" @@ -362,19 +350,19 @@ class NodeControllerTest < ActionController::TestCase assert_response :conflict, "update with changeset=0 should be rejected" ## try and submit invalid updates - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lat', 91.0); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lat", 91.0) put :update, :id => current_nodes(:visible_node).id assert_response :bad_request, "node at lat=91 should be rejected" - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lat', -91.0); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lat", -91.0) put :update, :id => current_nodes(:visible_node).id assert_response :bad_request, "node at lat=-91 should be rejected" - - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lon', 181.0); + + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lon", 181.0) put :update, :id => current_nodes(:visible_node).id assert_response :bad_request, "node at lon=181 should be rejected" - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, 'lon', -181.0); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, "lon", -181.0) put :update, :id => current_nodes(:visible_node).id assert_response :bad_request, "node at lon=-181 should be rejected" @@ -382,35 +370,35 @@ class NodeControllerTest < ActionController::TestCase current_node_version = current_nodes(:visible_node).version # try and submit a version behind - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, - 'version', current_node_version - 1); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, + "version", current_node_version - 1) put :update, :id => current_nodes(:visible_node).id assert_response :conflict, "should have failed on old version number" - + # try and submit a version ahead - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, - 'version', current_node_version + 1); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, + "version", current_node_version + 1) put :update, :id => current_nodes(:visible_node).id assert_response :conflict, "should have failed on skipped version number" # try and submit total crap in the version field - content xml_attr_rewrite(current_nodes(:visible_node).to_xml, - 'version', 'p1r4t3s!'); + content xml_attr_rewrite(current_nodes(:visible_node).to_xml, + "version", "p1r4t3s!") put :update, :id => current_nodes(:visible_node).id - assert_response :conflict, - "should not be able to put 'p1r4at3s!' in the version field" - + assert_response :conflict, + "should not be able to put 'p1r4at3s!' in the version field" + ## try an update with the wrong ID content current_nodes(:public_visible_node).to_xml put :update, :id => current_nodes(:visible_node).id - assert_response :bad_request, - "should not be able to update a node with a different ID from the XML" + assert_response :bad_request, + "should not be able to update a node with a different ID from the XML" ## try an update with a minimal valid XML doc which isn't a well-formed OSM doc. content "" put :update, :id => current_nodes(:visible_node).id - assert_response :bad_request, - "should not be able to update a node with non-OSM XML doc." + assert_response :bad_request, + "should not be able to update a node with non-OSM XML doc." ## finally, produce a good request which should work content current_nodes(:public_visible_node).to_xml @@ -434,11 +422,11 @@ class NodeControllerTest < ActionController::TestCase assert_response :success assert_select "osm" do assert_select "node", :count => 5 - assert_select "node[id=1][visible=true]", :count => 1 - assert_select "node[id=2][visible=false]", :count => 1 - assert_select "node[id=4][visible=true]", :count => 1 - assert_select "node[id=15][visible=true]", :count => 1 - assert_select "node[id=17][visible=false]", :count => 1 + assert_select "node[id='1'][visible='true']", :count => 1 + assert_select "node[id='2'][visible='false']", :count => 1 + assert_select "node[id='4'][visible='true']", :count => 1 + assert_select "node[id='15'][visible='true']", :count => 1 + assert_select "node[id='17'][visible='false']", :count => 1 end # check error when a non-existent node is included @@ -454,8 +442,8 @@ class NodeControllerTest < ActionController::TestCase # add an identical tag to the node tag_xml = XML::Node.new("tag") - tag_xml['k'] = current_node_tags(:public_v_t1).k - tag_xml['v'] = current_node_tags(:public_v_t1).v + tag_xml["k"] = current_node_tags(:public_v_t1).k + tag_xml["v"] = current_node_tags(:public_v_t1).v # add the tag into the existing xml node_xml = current_nodes(:public_visible_node).to_xml @@ -464,8 +452,8 @@ class NodeControllerTest < ActionController::TestCase # try and upload it content node_xml put :update, :id => current_nodes(:public_visible_node).id - assert_response :bad_request, - "adding duplicate tags to a node should fail with 'bad request'" + assert_response :bad_request, + "adding duplicate tags to a node should fail with 'bad request'" assert_equal "Element node/#{current_nodes(:public_visible_node).id} has duplicate tags with key #{current_node_tags(:t1).k}", @response.body end @@ -475,24 +463,23 @@ class NodeControllerTest < ActionController::TestCase basic_authorization(users(:normal_user).email, "test") changeset_id = changesets(:normal_user_first_change).id - # try and put something into a string that the API might + # try and put something into a string that the API might # use unquoted and therefore allow code injection... content "" + - '' + - '' + '' + + "" put :create assert_require_public_data "Shouldn't be able to create with non-public user" - - + ## Then try with the public data user basic_authorization(users(:public_user).email, "test") changeset_id = changesets(:public_user_first_change).id - # try and put something into a string that the API might + # try and put something into a string that the API might # use unquoted and therefore allow code injection... content "" + - '' + - '' + '' + + "" put :create assert_response :success nodeid = @response.body @@ -500,37 +487,29 @@ class NodeControllerTest < ActionController::TestCase # find the node in the database checknode = Node.find(nodeid) assert_not_nil checknode, "node not found in data base after upload" - + # and grab it using the api get :read, :id => nodeid assert_response :success apinode = Node.from_xml(@response.body) assert_not_nil apinode, "downloaded node is nil, but shouldn't be" - + # check the tags are not corrupted assert_equal checknode.tags, apinode.tags - assert apinode.tags.include?('#{@user.inspect}') - 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 + assert apinode.tags.include?("\#{@user.inspect}") end ## # update the changeset_id of a node element def update_changeset(xml, changeset_id) - xml_attr_rewrite(xml, 'changeset', changeset_id) + xml_attr_rewrite(xml, "changeset", changeset_id) end ## # update an attribute in the node element def xml_attr_rewrite(xml, name, value) xml.find("//osm/node").first[name] = value.to_s - return xml + xml end ##