X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/10fdeb2021af554ee818ab6a47e06700f78f68c1..e37a9ec0b52ead11543660ca45fee33c7f7bb1d7:/test/functional/node_controller_test.rb?ds=sidebyside
diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb
index f7b96e291..b5f93c458 100644
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -5,6 +5,24 @@ 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
+ # 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
+ 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
@@ -14,6 +32,24 @@ class NodeControllerTest < ActionController::TestCase
changeset = changesets(:normal_user_first_change)
# create a minimal xml file
content("")
+ 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
+ # normal user has a changeset open, so we'll use that.
+ changeset = changesets(:public_user_first_change)
+ # create a minimal xml file
+ content("")
put :create
# hope for success
assert_response :success, "node upload did not return success status"
@@ -25,25 +61,33 @@ class NodeControllerTest < ActionController::TestCase
# compare values
assert_in_delta lat * 10000000, checknode.latitude, 1, "saved node does not match requested latitude"
assert_in_delta lon * 10000000, checknode.longitude, 1, "saved node does not match requested longitude"
- assert_equal changesets(:normal_user_first_change).id, checknode.changeset_id, "saved node does not belong to changeset that it was created in"
+ assert_equal changesets(:public_user_first_change).id, checknode.changeset_id, "saved node does not belong to changeset that it was created in"
assert_equal true, checknode.visible, "saved node is not visible"
end
def test_create_invalid_xml
+ ## Only test public user here, as test_create should cover what's the forbiddens
+ ## that would occur here
# Initial setup
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(users(:public_user).email, "test")
# normal user has a changeset open, so we'll use that.
- changeset = changesets(:normal_user_first_change)
+ 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
+ assert_response :bad_request, "node upload did not return bad_request status"
+ assert_equal "Cannot parse valid node from xml string . XML doesn't contain an osm/node element.", @response.body
+
# test that the upload is rejected when no lat is supplied
# create a minimal xml file
content("")
put :create
# hope for success
assert_response :bad_request, "node upload did not return bad_request status"
- assert_equal 'Cannot parse valid node from xml string . lat missing', @response.body
+ assert_equal "Cannot parse valid node from xml string . lat missing", @response.body
# test that the upload is rejected when no lon is supplied
# create a minimal xml file
@@ -51,7 +95,13 @@ class NodeControllerTest < ActionController::TestCase
put :create
# hope for success
assert_response :bad_request, "node upload did not return bad_request status"
- assert_equal 'Cannot parse valid node from xml string . lon missing', @response.body
+ assert_equal "Cannot parse valid node from xml string . lon missing", @response.body
+
+ # test that the upload is rejected when we have a tag which is too long
+ 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]+:/)
end
@@ -72,32 +122,88 @@ class NodeControllerTest < ActionController::TestCase
# this tests deletion restrictions - basic deletion is tested in the unit
# tests for node!
def test_delete
- # first try to delete node without auth
+ ## first try to delete node without auth
delete :delete, :id => current_nodes(:visible_node).id
assert_response :unauthorized
-
- # now set auth
+
+
+ ## now set auth for the non-data public user
basic_authorization(users(:normal_user).email, "test");
# try to delete with an invalid (closed) changeset
content update_changeset(current_nodes(:visible_node).to_xml,
changesets(:normal_user_closed_change).id)
delete :delete, :id => current_nodes(:visible_node).id
- assert_response :conflict
+ 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)
delete :delete, :id => current_nodes(:visible_node).id
- assert_response :conflict
+ assert_require_public_data("shouldn't be able to delete node, when user's data is private")
# valid delete now takes a payload
content(nodes(:visible_node).to_xml)
delete :delete, :id => current_nodes(:visible_node).id
+ assert_require_public_data("shouldn't be able to delete node when user's data isn't public'")
+
+ # this won't work since the node is already deleted
+ content(nodes(:invisible_node).to_xml)
+ delete :delete, :id => current_nodes(:invisible_node).id
+ assert_require_public_data
+
+ # this won't work since the node never existed
+ delete :delete, :id => 0
+ assert_require_public_data
+
+ ## these test whether nodes which are in-use can be deleted:
+ # 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})"
+
+ # 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})"
+
+
+
+ ## now set auth for the public data user
+ basic_authorization(users(:public_user).email, "test");
+
+ # try to delete with an invalid (closed) changeset
+ content update_changeset(current_nodes(:visible_node).to_xml,
+ changesets(:normal_user_closed_change).id)
+ delete :delete, :id => current_nodes(:visible_node).id
+ assert_response :conflict
+
+ # try to delete with an invalid (non-existent) changeset
+ 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"
+
+ # 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"
+
+ # valid delete now takes a payload
+ content(nodes(:public_visible_node).to_xml)
+ delete :delete, :id => current_nodes(:public_visible_node).id
assert_response :success
# valid delete should return the new version number, which should
# be greater than the old version number
- assert @response.body.to_i > current_nodes(:visible_node).version,
+ assert @response.body.to_i > current_nodes(:public_visible_node).version,
"delete request should return a new version number for node"
# this won't work since the node is already deleted
@@ -115,12 +221,14 @@ class NodeControllerTest < ActionController::TestCase
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})"
+ assert_equal "Precondition failed: Node 3 is still used by way 1.", @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})"
+ assert_match /Precondition failed: Node 5 is still used by relation [13]./, @response.body
end
##
@@ -181,9 +289,6 @@ class NodeControllerTest < ActionController::TestCase
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
@@ -254,6 +359,18 @@ class NodeControllerTest < ActionController::TestCase
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"
+
+ ## 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."
+
## finally, produce a good request which should work
content current_nodes(:public_visible_node).to_xml
put :update, :id => current_nodes(:public_visible_node).id
@@ -264,30 +381,44 @@ class NodeControllerTest < ActionController::TestCase
# test adding tags to a node
def test_duplicate_tags
# setup auth
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(users(:public_user).email, "test")
# add an identical tag to the node
tag_xml = XML::Node.new("tag")
- tag_xml['k'] = current_node_tags(:t1).k
- tag_xml['v'] = current_node_tags(: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(:visible_node).to_xml
+ node_xml = current_nodes(:public_visible_node).to_xml
node_xml.find("//osm/node").first << tag_xml
# try and upload it
content node_xml
- put :update, :id => current_nodes(:visible_node).id
+ 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_equal "Element node/#{current_nodes(:visible_node).id} has duplicate tags with key #{current_node_tags(:t1).k}.", @response.body
+ assert_equal "Element node/#{current_nodes(:public_visible_node).id} has duplicate tags with key #{current_node_tags(:t1).k}", @response.body
end
# test whether string injection is possible
def test_string_injection
+ ## First try with the non-data public user
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
+ # 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
# use unquoted and therefore allow code injection...
content "" +