assert_response :unauthorized, "node upload did not return unauthorized status"
## Now try with the user which doesn't have their data public
- auth_header = basic_authorization_header private_user.email, "test"
+ auth_header = bearer_authorization_header private_user
# create a minimal xml file
xml = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{private_changeset.id}'/></osm>"
assert_require_public_data "node create did not return forbidden status"
## Now try with the user that has the public data
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# create a minimal xml file
xml = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{changeset.id}'/></osm>"
user = create(:user)
changeset = create(:changeset, :user => user)
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
lat = 3.434
lon = 3.23
assert_response :gone
# check chat a non-existent node is not returned
- get api_node_path(:id => 0)
+ get api_node_path(0)
assert_response :not_found
end
assert_response :unauthorized
## now set auth for the non-data public user
- auth_header = basic_authorization_header private_user.email, "test"
+ auth_header = bearer_authorization_header private_user
# try to delete with an invalid (closed) changeset
xml = update_changeset(xml_for_node(private_node), private_user_closed_changeset.id)
assert_require_public_data
# this won't work since the node never existed
- delete api_node_path(:id => 0), :headers => auth_header
+ delete api_node_path(0), :headers => auth_header
assert_require_public_data
## these test whether nodes which are in-use can be deleted:
changeset = create(:changeset, :user => user)
closed_changeset = create(:changeset, :closed, :user => user)
node = create(:node, :changeset => changeset)
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# try to delete with an invalid (closed) changeset
xml = update_changeset(xml_for_node(node), closed_changeset.id)
# try to delete a node with a different ID
other_node = create(:node)
xml = xml_for_node(other_node)
- delete api_node_path(node.id), :params => xml.to_s, :headers => auth_header
+ delete api_node_path(node), :params => xml.to_s, :headers => auth_header
assert_response :bad_request,
"should not be able to delete a node with a different ID from the XML"
assert_response :gone
# this won't work since the node never existed
- delete api_node_path(:id => 0), :headers => auth_header
+ delete api_node_path(0), :headers => auth_header
assert_response :not_found
## these test whether nodes which are in-use can be deleted:
# tests whether the API works and prevents incorrect use while trying
# to update nodes.
def test_update
+ invalid_attr_values = [["lat", 91.0], ["lat", -91.0], ["lon", 181.0], ["lon", -181.0]]
+
## First test with no user credentials
# try and update a node without authorisation
# first try to delete node without auth
## Second test with the private user
# setup auth
- auth_header = basic_authorization_header private_user.email, "test"
+ auth_header = bearer_authorization_header private_user
## trying to break changesets
assert_require_public_data "update with changeset=0 should be forbidden, when data isn't public"
## try and submit invalid updates
- xml = xml_attr_rewrite(xml_for_node(private_node), "lat", 91.0)
- put api_node_path(private_node), :params => xml.to_s, :headers => auth_header
- assert_require_public_data "node at lat=91 should be forbidden, when data isn't public"
-
- xml = xml_attr_rewrite(xml_for_node(private_node), "lat", -91.0)
- put api_node_path(private_node), :params => xml.to_s, :headers => auth_header
- assert_require_public_data "node at lat=-91 should be forbidden, when data isn't public"
-
- xml = xml_attr_rewrite(xml_for_node(private_node), "lon", 181.0)
- put api_node_path(private_node), :params => xml.to_s, :headers => auth_header
- assert_require_public_data "node at lon=181 should be forbidden, when data isn't public"
-
- xml = xml_attr_rewrite(xml_for_node(private_node), "lon", -181.0)
- put api_node_path(private_node), :params => xml.to_s, :headers => auth_header
- assert_require_public_data "node at lon=-181 should be forbidden, when data isn't public"
+ invalid_attr_values.each do |name, value|
+ xml = xml_attr_rewrite(xml_for_node(private_node), name, value)
+ put api_node_path(private_node), :params => xml.to_s, :headers => auth_header
+ assert_require_public_data "node at #{name}=#{value} should be forbidden, when data isn't public"
+ end
## finally, produce a good request which still won't work
xml = xml_for_node(private_node)
# try and update a node without authorisation
# first try to update node without auth
xml = xml_for_node(node)
- put api_node_path(node.id), :params => xml.to_s, :headers => auth_header
+ put api_node_path(node), :params => xml.to_s, :headers => auth_header
assert_response :forbidden
# setup auth
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
## trying to break changesets
assert_response :conflict, "update with changeset=0 should be rejected"
## try and submit invalid updates
- xml = xml_attr_rewrite(xml_for_node(node), "lat", 91.0)
- put api_node_path(node), :params => xml.to_s, :headers => auth_header
- assert_response :bad_request, "node at lat=91 should be rejected"
-
- xml = xml_attr_rewrite(xml_for_node(node), "lat", -91.0)
- put api_node_path(node), :params => xml.to_s, :headers => auth_header
- assert_response :bad_request, "node at lat=-91 should be rejected"
-
- xml = xml_attr_rewrite(xml_for_node(node), "lon", 181.0)
- put api_node_path(node), :params => xml.to_s, :headers => auth_header
- assert_response :bad_request, "node at lon=181 should be rejected"
-
- xml = xml_attr_rewrite(xml_for_node(node), "lon", -181.0)
- put api_node_path(node), :params => xml.to_s, :headers => auth_header
- assert_response :bad_request, "node at lon=-181 should be rejected"
+ invalid_attr_values.each do |name, value|
+ xml = xml_attr_rewrite(xml_for_node(node), name, value)
+ put api_node_path(node), :params => xml.to_s, :headers => auth_header
+ assert_response :bad_request, "node at #{name}=#{value} should be rejected"
+ end
## next, attack the versioning
current_node_version = node.version
assert_response :bad_request
# check error when no parameter value provided
- get nodes_path, :params => { :nodes => "" }
+ get nodes_path(:nodes => "")
assert_response :bad_request
# test a working call
- get nodes_path, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id}" }
+ get nodes_path(:nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id}")
assert_response :success
assert_select "osm" do
assert_select "node", :count => 5
end
# test a working call with json format
- get nodes_path, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id}", :format => "json" }
+ get nodes_path(:nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id}", :format => "json")
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal 1, (js["elements"].count { |a| a["id"] == node5.id && a["visible"] == false })
# check error when a non-existent node is included
- get nodes_path, :params => { :nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},0" }
+ get nodes_path(:nodes => "#{node1.id},#{node2.id},#{node3.id},#{node4.id},#{node5.id},0")
assert_response :not_found
end
existing_tag = create(:node_tag)
assert existing_tag.node.changeset.user.data_public
# setup auth
- auth_header = basic_authorization_header existing_tag.node.changeset.user.email, "test"
+ auth_header = bearer_authorization_header existing_tag.node.changeset.user
# add an identical tag to the node
tag_xml = XML::Node.new("tag")
changeset = create(:changeset, :user => user)
## First try with the non-data public user
- auth_header = basic_authorization_header private_user.email, "test"
+ auth_header = bearer_authorization_header private_user
# try and put something into a string that the API might
# use unquoted and therefore allow code injection...
assert_require_public_data "Shouldn't be able to create with non-public user"
## Then try with the public data user
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# try and put something into a string that the API might
# use unquoted and therefore allow code injection...
assert_not_nil checknode, "node not found in data base after upload"
# and grab it using the api
- get api_node_path(:id => nodeid)
+ get api_node_path(nodeid)
assert_response :success
apinode = Node.from_xml(@response.body)
assert_not_nil apinode, "downloaded node is nil, but shouldn't be"
:num_changes => Settings.initial_changes_per_hour - 1)
# create authentication header
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# try creating a node
xml = "<osm><node lat='0' lon='0' changeset='#{changeset.id}'/></osm>"
end
# create authentication header
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# try creating a node
xml = "<osm><node lat='0' lon='0' changeset='#{changeset.id}'/></osm>"
xml.find("//osm/node").first[name] = value.to_s
xml
end
-
- ##
- # parse some xml
- def xml_parse(xml)
- parser = XML::Parser.string(xml)
- parser.parse
- end
end
end
projects / rails.git / blobdiff