# 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 * 180) - 90).to_s
+ xml_node["lon"] = precision((rand * 360) - 180).to_s
with_controller(NodesController.new) do
put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
assert_response :forbidden, "Should have rejected node update"
# 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 * 180) - 90).to_s
+ xml_node["lon"] = precision((rand * 360) - 180).to_s
with_controller(NodesController.new) do
put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header
assert_response :success
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(:id => old_node.node_id, :version => old_node.version)
+ 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.
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 = create_bearer_auth_header(create(:user), %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 = create_bearer_auth_header(create(:user), %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 = create_bearer_auth_header(create(:user), %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 = create_bearer_auth_header(create(:moderator_user), %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 = create_bearer_auth_header(create(:moderator_user), %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 = create_bearer_auth_header(create(:moderator_user), %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...
get api_node_history_path(:id => node_v1.node_id)
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
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
##
# and when accessed via history
get api_node_history_path(:id => node_v3.node_id)
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."
+ 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_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
# and when accessed via history
get api_node_history_path(:id => node_v3.node_id), :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
##
# and when accessed via history
get api_node_history_path(:id => node_v1.node_id)
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"
# and when accessed via history
get api_node_history_path(:id => node_v1.node_id)
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 create_bearer_auth_header(user, scopes)
+ token = create(:oauth_access_token,
+ :resource_owner_id => user.id,
+ :scopes => scopes)
+ bearer_authorization_header(token.token)
+ end
+
+ 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
assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."
("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
##