X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/427becc1db048c05576887e74b26c4118fa32d77..10fdeb2021af554ee818ab6a47e06700f78f68c1:/test/functional/node_controller_test.rb

diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb
index 9e5621f8b..f7b96e291 100644
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -1,12 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'node_controller'
 
 class NodeControllerTest < ActionController::TestCase
   api_fixtures
 
   def test_create
     # cannot read password from fixture as it is stored as MD5 digest
-    basic_authorization(users(:normal_user).email, "test");
+    basic_authorization(users(:normal_user).email, "test")
     
     # create a node with random lat/lon
     lat = rand(100)-50 + rand
@@ -30,6 +29,32 @@ class NodeControllerTest < ActionController::TestCase
     assert_equal true, checknode.visible, "saved node is not visible"
   end
 
+  def test_create_invalid_xml
+    # Initial setup
+    basic_authorization(users(:normal_user).email, "test")
+    # normal user has a changeset open, so we'll use that.
+    changeset = changesets(:normal_user_first_change)
+    lat = 3.434
+    lon = 3.23
+    
+    # test that the upload is rejected when no lat is supplied
+    # create a minimal xml file
+    content("<osm><node lon='#{lon}' changeset='#{changeset.id}'/></osm>")
+    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 <node lon="3.23" changeset="1"/>. lat missing', @response.body
+
+    # test that the upload is rejected when no lon is supplied
+    # create a minimal xml file
+    content("<osm><node lat='#{lat}' changeset='#{changeset.id}'/></osm>")
+    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 <node lat="3.434" changeset="1"/>. lon missing', @response.body
+
+  end
+
   def test_read
     # check that a visible node is returned properly
     get :read, :id => current_nodes(:visible_node).id
@@ -102,12 +127,17 @@ class NodeControllerTest < ActionController::TestCase
   # tests whether the API works and prevents incorrect use while trying
   # to update nodes.
   def test_update
+    ## 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
     assert_response :unauthorized
     
+    
+    
+    ## Second test with the private user
+    
     # setup auth
     basic_authorization(users(:normal_user).email, "test")
 
@@ -115,7 +145,62 @@ class NodeControllerTest < ActionController::TestCase
 
     # try and update in someone else's changeset
     content update_changeset(current_nodes(:visible_node).to_xml,
-                             changesets(:second_user_first_change).id)
+                             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"
+
+    # 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
+    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")
+
+    ## 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
+    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
+    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
+    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
+    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")
+
+    ## 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
     assert_response :conflict, "update with other user's changeset should be rejected"
 
@@ -170,8 +255,8 @@ class NodeControllerTest < ActionController::TestCase
        "should not be able to put 'p1r4at3s!' in the version field"
     
     ## finally, produce a good request which should work
-    content current_nodes(:visible_node).to_xml
-    put :update, :id => current_nodes(:visible_node).id
+    content current_nodes(:public_visible_node).to_xml
+    put :update, :id => current_nodes(:public_visible_node).id
     assert_response :success, "a valid update request failed"
   end
 
@@ -194,7 +279,8 @@ class NodeControllerTest < ActionController::TestCase
     content node_xml
     put :update, :id => current_nodes(:visible_node).id
     assert_response :bad_request, 
-       "adding duplicate tags to a node should fail with '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
   end
 
   # test whether string injection is possible
@@ -250,8 +336,7 @@ class NodeControllerTest < ActionController::TestCase
   ##
   # parse some xml
   def xml_parse(xml)
-    parser = XML::Parser.new
-    parser.string = xml
+    parser = XML::Parser.string(xml)
     parser.parse
   end
 end