X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d7126736e48363bb57a6bc78dd83d4913c890a9..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/test/controllers/api/nodes_controller_test.rb
diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb
index 5fde0277c..9896c34a5 100644
--- a/test/controllers/api/nodes_controller_test.rb
+++ b/test/controllers/api/nodes_controller_test.rb
@@ -55,7 +55,7 @@ module Api
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 = ""
@@ -66,7 +66,7 @@ module Api
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 = ""
@@ -92,7 +92,7 @@ module Api
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
@@ -178,7 +178,7 @@ module Api
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)
@@ -226,7 +226,7 @@ module Api
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)
@@ -297,6 +297,8 @@ module Api
# 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
@@ -312,7 +314,7 @@ module Api
## 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
@@ -334,21 +336,11 @@ module Api
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)
@@ -364,7 +356,7 @@ module Api
assert_response :forbidden
# setup auth
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
## trying to break changesets
@@ -386,21 +378,11 @@ module Api
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
@@ -495,7 +477,7 @@ module Api
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")
@@ -521,7 +503,7 @@ module Api
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...
@@ -532,7 +514,7 @@ module Api
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...
@@ -570,7 +552,7 @@ module Api
: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 = ""
@@ -617,7 +599,7 @@ module Api
end
# create authentication header
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# try creating a node
xml = ""
@@ -657,12 +639,5 @@ module Api
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