def test_read
# check that a visible node is returned properly
- get :read, :id => current_nodes(:visible_node).id
+ get :read, :id => create(:node).id
assert_response :success
- # check that an invisible node is not returned
- get :read, :id => current_nodes(:invisible_node).id
+ # check that an deleted node is not returned
+ get :read, :id => create(:node, :deleted).id
assert_response :gone
# check chat a non-existent node is not returned
# this tests deletion restrictions - basic deletion is tested in the unit
# tests for node!
def test_delete
+ private_user = create(:user, :data_public => false)
+ private_user_changeset = create(:changeset, :user => private_user)
+ private_user_closed_changeset = create(:changeset, :closed, :user => private_user)
+ private_node = create(:node, :changeset => private_user_changeset)
+ private_deleted_node = create(:node, :deleted, :changeset => private_user_changeset)
+
## first try to delete node without auth
- delete :delete, :id => current_nodes(:visible_node).id
+ delete :delete, :id => private_node.id
assert_response :unauthorized
## now set auth for the non-data public user
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(private_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
+ content update_changeset(private_node.to_xml, private_user_closed_changeset.id)
+ delete :delete, :id => private_node.id
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
+ content update_changeset(private_node.to_xml, 0)
+ delete :delete, :id => private_node.id
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
+ content(private_node.to_xml)
+ delete :delete, :id => private_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
+ content(private_deleted_node.to_xml)
+ delete :delete, :id => private_deleted_node.id
assert_require_public_data
# this won't work since the node never existed
## 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
+ private_used_node = create(:node, :changeset => private_user_changeset)
+ create(:way_node, :node => private_used_node)
+
+ content(private_used_node.to_xml)
+ delete :delete, :id => private_used_node.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
+ private_used_node2 = create(:node, :changeset => private_user_changeset)
+ create(:relation_member, :member => private_used_node2)
+
+ content(private_used_node2.to_xml)
+ delete :delete, :id => private_used_node2.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")
+ ## now setup for the public data user
+ user = create(:user, :data_public => true)
+ changeset = create(:changeset, :user => user)
+ closed_changeset = create(:changeset, :closed, :user => user)
+ node = create(:node, :changeset => changeset)
+ basic_authorization(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
+ content update_changeset(node.to_xml, closed_changeset.id)
+ delete :delete, :id => 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
+ content update_changeset(node.to_xml, 0)
+ delete :delete, :id => 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
+ other_node = create(:node)
+ content(other_node.to_xml)
+ delete :delete, :id => 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 :delete, :id => current_nodes(:visible_node).id
+ delete :delete, :id => 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
+ content(node.to_xml)
+ delete :delete, :id => 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(:public_visible_node).version,
+ assert @response.body.to_i > node.version,
"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)
- delete :delete, :id => current_nodes(:public_visible_node).id
+ content(node.to_xml)
+ delete :delete, :id => node.id
assert_response :gone
# this won't work since the node never existed
## 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
+ used_node = create(:node, :changeset => create(:changeset, :user => user))
+ way_node = create(:way_node, :node => used_node)
+ way_node2 = create(:way_node, :node => used_node)
+
+ content(used_node.to_xml)
+ delete :delete, :id => used_node.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 ways 1,3.", @response.body
+ assert_equal "Precondition failed: Node #{used_node.id} is still used by ways #{way_node.way.id},#{way_node2.way.id}.", @response.body
# in a relation...
- content(nodes(:node_used_by_relationship).to_xml)
- delete :delete, :id => current_nodes(:node_used_by_relationship).id
+ used_node2 = create(:node, :changeset => create(:changeset, :user => user))
+ relation_member = create(:relation_member, :member => used_node2)
+ relation_member2 = create(:relation_member, :member => used_node2)
+
+ content(used_node2.to_xml)
+ delete :delete, :id => used_node2.id
assert_response :precondition_failed,
"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
+ assert_equal "Precondition failed: Node #{used_node2.id} is still used by relations #{relation_member.relation.id},#{relation_member2.relation.id}.", @response.body
end
##
## First test with no user credentials
# 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
+ private_user = create(:user, :data_public => false)
+ private_node = create(:node, :changeset => create(:changeset, :user => private_user))
+ user = create(:user)
+ node = create(:node, :changeset => create(:changeset, :user => user))
+
+ content node.to_xml
+ put :update, :id => node.id
assert_response :unauthorized
## Second test with the private user
# setup auth
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(private_user.email, "test")
## trying to break changesets
# try and update in someone else's changeset
- content update_changeset(current_nodes(:visible_node).to_xml,
- changesets(:public_user_first_change).id)
- put :update, :id => current_nodes(:visible_node).id
- assert_require_public_data "update with other user's changeset should be forbidden when date isn't public"
+ content update_changeset(private_node.to_xml,
+ create(:changeset).id)
+ put :update, :id => private_node.id
+ assert_require_public_data "update with other user's changeset should be forbidden when data isn't public"
# try and update in a closed changeset
- content update_changeset(current_nodes(:visible_node).to_xml,
- changesets(:normal_user_closed_change).id)
- put :update, :id => current_nodes(:visible_node).id
+ content update_changeset(private_node.to_xml,
+ create(:changeset, :closed, :user => private_user).id)
+ put :update, :id => private_node.id
assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
# try and update in a non-existant changeset
- content update_changeset(current_nodes(:visible_node).to_xml, 0)
- put :update, :id => current_nodes(:visible_node).id
- assert_require_public_data("update with changeset=0 should be forbidden, when data isn't public")
+ content update_changeset(private_node.to_xml, 0)
+ put :update, :id => private_node.id
+ 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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(private_node.to_xml, "lat", 91.0)
+ put :update, :id => private_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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(private_node.to_xml, "lat", -91.0)
+ put :update, :id => private_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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(private_node.to_xml, "lon", 181.0)
+ put :update, :id => private_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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(private_node.to_xml, "lon", -181.0)
+ put :update, :id => private_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
+ ## finally, produce a good request which still won't work
+ content private_node.to_xml
+ put :update, :id => private_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
+ # first try to update node without auth
+ content node.to_xml
+ put :update, :id => node.id
assert_response :forbidden
# setup auth
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(user.email, "test")
## trying to break changesets
# try and update in someone else's changeset
- content update_changeset(current_nodes(:visible_node).to_xml,
- changesets(:normal_user_first_change).id)
- put :update, :id => current_nodes(:visible_node).id
+ content update_changeset(node.to_xml,
+ create(:changeset).id)
+ put :update, :id => node.id
assert_response :conflict, "update with other user's changeset should be rejected"
# try and update in a closed changeset
- content update_changeset(current_nodes(:visible_node).to_xml,
- changesets(:normal_user_closed_change).id)
- put :update, :id => current_nodes(:visible_node).id
+ content update_changeset(node.to_xml,
+ create(:changeset, :closed, :user => user).id)
+ put :update, :id => node.id
assert_response :conflict, "update with closed changeset should be rejected"
# try and update in a non-existant changeset
- content update_changeset(current_nodes(:visible_node).to_xml, 0)
- put :update, :id => current_nodes(:visible_node).id
+ content update_changeset(node.to_xml, 0)
+ put :update, :id => node.id
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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(node.to_xml, "lat", 91.0)
+ put :update, :id => 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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(node.to_xml, "lat", -91.0)
+ put :update, :id => 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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(node.to_xml, "lon", 181.0)
+ put :update, :id => 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)
- put :update, :id => current_nodes(:visible_node).id
+ content xml_attr_rewrite(node.to_xml, "lon", -181.0)
+ put :update, :id => node.id
assert_response :bad_request, "node at lon=-181 should be rejected"
## next, attack the versioning
- current_node_version = current_nodes(:visible_node).version
+ current_node_version = node.version
# try and submit a version behind
- content xml_attr_rewrite(current_nodes(:visible_node).to_xml,
+ content xml_attr_rewrite(node.to_xml,
"version", current_node_version - 1)
- put :update, :id => current_nodes(:visible_node).id
+ put :update, :id => 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,
+ content xml_attr_rewrite(node.to_xml,
"version", current_node_version + 1)
- put :update, :id => current_nodes(:visible_node).id
+ put :update, :id => 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,
+ content xml_attr_rewrite(node.to_xml,
"version", "p1r4t3s!")
- put :update, :id => current_nodes(:visible_node).id
+ put :update, :id => node.id
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
+ content create(:node).to_xml
+ put :update, :id => 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 "<update/>"
- put :update, :id => current_nodes(:visible_node).id
+ put :update, :id => 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
+ content node.to_xml
+ put :update, :id => node.id
assert_response :success, "a valid update request failed"
end
##
# test adding tags to a node
def test_duplicate_tags
+ existing_tag = create(:node_tag)
+ assert_equal true, existing_tag.node.changeset.user.data_public
# setup auth
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(existing_tag.node.changeset.user.email, "test")
# 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"] = existing_tag.k
+ tag_xml["v"] = existing_tag.v
# add the tag into the existing xml
- node_xml = current_nodes(:public_visible_node).to_xml
+ node_xml = existing_tag.node.to_xml
node_xml.find("//osm/node").first << tag_xml
# try and upload it
content node_xml
- put :update, :id => current_nodes(:public_visible_node).id
+ put :update, :id => existing_tag.node.id
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
+ assert_equal "Element node/#{existing_tag.node.id} has duplicate tags with key #{existing_tag.k}", @response.body
end
# test whether string injection is possible
# try and put something into a string that the API might
# use unquoted and therefore allow code injection...
content "<osm><node lat='0' lon='0' changeset='#{changeset_id}'>" +
- '<tag k="#{@user.inspect}" v="0"/>' +
- "</node></osm>"
+ '<tag k="#{@user.inspect}" v="0"/>' +
+ "</node></osm>"
put :create
assert_require_public_data "Shouldn't be able to create with non-public user"
# try and put something into a string that the API might
# use unquoted and therefore allow code injection...
content "<osm><node lat='0' lon='0' changeset='#{changeset_id}'>" +
- '<tag k="#{@user.inspect}" v="0"/>' +
- "</node></osm>"
+ '<tag k="#{@user.inspect}" v="0"/>' +
+ "</node></osm>"
put :create
assert_response :success
nodeid = @response.body
projects / rails.git / blobdiff