)
assert_routing(
{ :path => "/api/0.6/node/1/2", :method => :get },
- { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2" }
+ { :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2" }
)
assert_routing(
{ :path => "/api/0.6/node/1/history.json", :method => :get },
)
assert_routing(
{ :path => "/api/0.6/node/1/2.json", :method => :get },
- { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2", :format => "json" }
+ { :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/node/1/2/redact", :method => :post },
# FIXME: Move this test to being an integration test since it spans multiple controllers
def test_version
private_user = create(:user, :data_public => false)
- private_node = create(:node, :with_history, :version => 4, :changeset => create(:changeset, :user => private_user))
+ private_node = create(:node, :with_history, :version => 4, :lat => 0, :lon => 0, :changeset => create(:changeset, :user => private_user))
user = create(:user)
- node = create(:node, :with_history, :version => 4, :changeset => create(:changeset, :user => user))
+ node = create(:node, :with_history, :version => 4, :lat => 0, :lon => 0, :changeset => create(:changeset, :user => user))
create_list(:node_tag, 2, :node => node)
# Ensure that the current tags are propagated to the history too
propagate_tags(node, node.old_nodes.last)
## First try this with a non-public user
- auth_header = basic_authorization_header private_user.email, "test"
+ auth_header = bearer_authorization_header private_user
# setup a simple XML node
xml_doc = xml_for_node(private_node)
# randomly move the node about
3.times do
# move the node somewhere else
- xml_node["lat"] = precision(rand * 180 - 90).to_s
- xml_node["lon"] = precision(rand * 360 - 180).to_s
+ xml_node["lat"] = precision(rand - 0.5).to_s
+ xml_node["lon"] = precision(rand - 0.5).to_s
with_controller(NodesController.new) do
- put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
+ put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header
assert_response :forbidden, "Should have rejected node update"
xml_node["version"] = @response.body.to_s
end
xml_tag["v"] = random_string
xml_node << xml_tag
with_controller(NodesController.new) do
- put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
+ put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header
assert_response :forbidden,
"should have rejected node #{nodeid} (#{@response.body}) with forbidden"
xml_node["version"] = @response.body.to_s
# probably should check that they didn't get written to the database
## Now do it with the public user
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
# setup a simple XML node
# randomly move the node about
3.times do
# move the node somewhere else
- xml_node["lat"] = precision(rand * 180 - 90).to_s
- xml_node["lon"] = precision(rand * 360 - 180).to_s
+ xml_node["lat"] = precision(rand - 0.5).to_s
+ xml_node["lon"] = precision(rand - 0.5).to_s
with_controller(NodesController.new) do
- put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
+ put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header
assert_response :success
xml_node["version"] = @response.body.to_s
end
xml_tag["v"] = random_string
xml_node << xml_tag
with_controller(NodesController.new) do
- put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
+ put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header
assert_response :success,
"couldn't update node #{nodeid} (#{@response.body})"
xml_node["version"] = @response.body.to_s
# check all the versions
versions.each_key do |key|
- get node_version_path(:id => nodeid, :version => key.to_i)
+ get api_old_node_path(nodeid, key.to_i)
assert_response :success,
"couldn't get version #{key.to_i} of node #{nodeid}"
check_not_found_id_version(24356, create(:node).version)
end
- def check_not_found_id_version(id, version)
- get node_version_path(:id => id, :version => version)
- assert_response :not_found
- rescue ActionController::UrlGenerationError => e
- assert_match(/No route matches/, e.to_s)
- end
-
##
# Test that getting the current version is identical to picking
# that version with the version URI call.
check_current_version(node_with_versions)
end
+ # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
+ def test_lat_lon_xml_format
+ old_node = create(:old_node, :latitude => (0.00004 * OldNode::SCALE).to_i, :longitude => (0.00008 * OldNode::SCALE).to_i)
+
+ get api_node_history_path(old_node.node_id)
+ assert_match(/lat="0.0000400"/, response.body)
+ assert_match(/lon="0.0000800"/, response.body)
+ end
+
##
# test the redaction of an old version of a node, while not being
# authorised.
# test the redaction of an old version of a node, while being
# authorised as a normal user.
def test_redact_node_normal_user
- auth_header = basic_authorization_header create(:user).email, "test"
+ auth_header = bearer_authorization_header
node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
# test that, even as moderator, the current version of a node
# can't be redacted.
def test_redact_node_current_version
- auth_header = basic_authorization_header create(:moderator_user).email, "test"
+ auth_header = bearer_authorization_header create(:moderator_user)
node = create(:node, :with_history, :version => 4)
node_v4 = node.old_nodes.find_by(:version => 4)
assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
end
+ def test_redact_node_by_regular_with_read_prefs_scope
+ auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs])
+ do_redact_redactable_node(auth_header)
+ assert_response :forbidden, "should need to be moderator to redact."
+ end
+
+ def test_redact_node_by_regular_with_write_api_scope
+ auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api])
+ do_redact_redactable_node(auth_header)
+ assert_response :forbidden, "should need to be moderator to redact."
+ end
+
+ def test_redact_node_by_regular_with_write_redactions_scope
+ auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
+ do_redact_redactable_node(auth_header)
+ assert_response :forbidden, "should need to be moderator to redact."
+ end
+
+ def test_redact_node_by_moderator_with_read_prefs_scope
+ auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs])
+ do_redact_redactable_node(auth_header)
+ assert_response :forbidden, "should need to have write_redactions scope to redact."
+ end
+
+ def test_redact_node_by_moderator_with_write_api_scope
+ auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api])
+ do_redact_redactable_node(auth_header)
+ assert_response :success, "should be OK to redact old version as moderator with write_api scope."
+ # assert_response :forbidden, "should need to have write_redactions scope to redact."
+ end
+
+ def test_redact_node_by_moderator_with_write_redactions_scope
+ auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
+ do_redact_redactable_node(auth_header)
+ assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
+ end
+
##
# test that redacted nodes aren't visible, regardless of
# authorisation except as moderator...
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
- get node_version_path(:id => node_v1.node_id, :version => node_v1.version)
+ get api_old_node_path(node_v1.node_id, node_v1.version)
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# not even to a logged-in user
- auth_header = basic_authorization_header create(:user).email, "test"
- get node_version_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
+ auth_header = bearer_authorization_header
+ get api_old_node_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in."
end
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
- get api_node_history_path(:id => node_v1.node_id)
+ get api_node_history_path(node)
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history."
+ assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0,
+ "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history."
# not even to a logged-in user
- auth_header = basic_authorization_header create(:user).email, "test"
- get api_node_history_path(:id => node_v1.node_id), :headers => auth_header
+ auth_header = bearer_authorization_header
+ get api_node_history_path(node), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in."
+ assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0,
+ "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in."
end
##
def test_redact_node_moderator
node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
- auth_header = basic_authorization_header create(:moderator_user).email, "test"
+ auth_header = bearer_authorization_header create(:moderator_user)
do_redact_node(node_v3, create(:redaction), auth_header)
assert_response :success, "should be OK to redact old version as moderator."
# check moderator can still see the redacted data, when passing
# the appropriate flag
- get node_version_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header
+ get api_old_node_path(node_v3.node_id, node_v3.version), :headers => auth_header
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
- get node_version_path(:id => node_v3.node_id, :version => node_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
+ get api_old_node_path(node_v3.node_id, node_v3.version, :show_redactions => "true"), :headers => auth_header
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
- get api_node_history_path(:id => node_v3.node_id)
+ get api_node_history_path(node)
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, "node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag."
- get api_node_history_path(:id => node_v3.node_id), :params => { :show_redactions => "true" }, :headers => auth_header
+ assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0,
+ "node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag."
+ get api_node_history_path(node, :show_redactions => "true"), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1, "node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag."
+ assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1,
+ "node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag."
end
# testing that if the moderator drops auth, he can't see the
def test_redact_node_is_redacted
node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
- auth_header = basic_authorization_header create(:moderator_user).email, "test"
+ auth_header = bearer_authorization_header create(:moderator_user)
do_redact_node(node_v3, create(:redaction), auth_header)
assert_response :success, "should be OK to redact old version as moderator."
# re-auth as non-moderator
- auth_header = basic_authorization_header create(:user).email, "test"
+ auth_header = bearer_authorization_header
# check can't see the redacted data
- get node_version_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header
+ get api_old_node_path(node_v3.node_id, node_v3.version), :headers => auth_header
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
- get api_node_history_path(:id => node_v3.node_id), :headers => auth_header
+ get api_node_history_path(node), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, "redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history."
+ assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0,
+ "redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history."
end
##
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
- post node_version_redact_path(:id => node_v1.node_id, :version => node_v1.version)
+ post node_version_redact_path(node_v1.node_id, node_v1.version)
assert_response :unauthorized, "should need to be authenticated to unredact."
end
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
- auth_header = basic_authorization_header user.email, "test"
+ auth_header = bearer_authorization_header user
- post node_version_redact_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
+ post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :forbidden, "should need to be moderator to unredact."
end
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
- auth_header = basic_authorization_header moderator_user.email, "test"
+ auth_header = bearer_authorization_header moderator_user
- post node_version_redact_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
+ post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :success, "should be OK to unredact old version as moderator."
# check moderator can now see the redacted data, when not
# passing the aspecial flag
- get node_version_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
+ get api_old_node_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :success, "After unredaction, node should not be gone for moderator."
# and when accessed via history
- get api_node_history_path(:id => node_v1.node_id)
+ get api_node_history_path(node)
assert_response :success, "Unredaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag."
+ assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1,
+ "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag."
- auth_header = basic_authorization_header create(:user).email, "test"
+ auth_header = bearer_authorization_header
# check normal user can now see the redacted data
- get node_version_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
+ get api_old_node_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :success, "After unredaction, node should be visible to normal users."
# and when accessed via history
- get api_node_history_path(:id => node_v1.node_id)
+ get api_node_history_path(node)
assert_response :success, "Unredaction shouldn't have stopped history working."
- assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag."
+ assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1,
+ "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag."
end
private
+ def do_redact_redactable_node(headers = {})
+ node = create(:node, :with_history, :version => 4)
+ node_v3 = node.old_nodes.find_by(:version => 3)
+ do_redact_node(node_v3, create(:redaction), headers)
+ end
+
def do_redact_node(node, redaction, headers = {})
- get node_version_path(:id => node.node_id, :version => node.version), :headers => headers
+ get api_old_node_path(node.node_id, node.version), :headers => headers
assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."
# now redact it
- post node_version_redact_path(:id => node.node_id, :version => node.version), :params => { :redaction => redaction.id }, :headers => headers
+ post node_version_redact_path(node.node_id, node.version), :params => { :redaction => redaction.id }, :headers => headers
end
def check_current_version(node_id)
# get the current version of the node
current_node = with_controller(NodesController.new) do
- get api_node_path(:id => node_id)
+ get api_node_path(node_id)
assert_response :success, "cant get current node #{node_id}"
Node.from_xml(@response.body)
end
assert_not_nil current_node, "getting node #{node_id} returned nil"
# get the "old" version of the node from the old_node interface
- get node_version_path(:id => node_id, :version => current_node.version)
+ get api_old_node_path(node_id, current_node.version)
assert_response :success, "cant get old node #{node_id}, v#{current_node.version}"
old_node = Node.from_xml(@response.body)
assert_nodes_are_equal current_node, old_node
end
+ def check_not_found_id_version(id, version)
+ get api_old_node_path(id, version)
+ assert_response :not_found
+ rescue ActionController::UrlGenerationError => e
+ assert_match(/No route matches/, e.to_s)
+ end
+
##
# returns a 16 character long string with some nasty characters in it.
# this ought to stress-test the tag handling as well as the versioning.
("a".."z").to_a,
("A".."Z").to_a,
("0".."9").to_a].flatten
- (1..16).map { |_i| letters[rand(letters.length)] }.join
+ (1..16).map { letters[rand(letters.length)] }.join
end
##
projects / rails.git / blobdiff