cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add show_redactions param to changeset downloads

Browse source
This commit is contained in:
Anton Khorev 2025-02-22 22:08:45 +03:00
parent 3cfb8b7d05
commit 316ce7b4e9
2 changed files with 73 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/api/changesets/downloads_controller.rb
View file

@ -1,6 +1,8 @@
module Api
module Changesets
class DownloadsController < ApiController
before_action :setup_user_auth
authorize_resource :changeset
before_action :set_request_formats
@ -22,9 +24,15 @@ module Api
# get all the elements in the changeset which haven't been redacted
# and stick them in a big array.
elements = [changeset.old_nodes.unredacted,
elements = if show_redactions?
[changeset.old_nodes,
changeset.old_ways,
changeset.old_relations].flatten
else
[changeset.old_nodes.unredacted,
changeset.old_ways.unredacted,
changeset.old_relations.unredacted].flatten
end
# sort the elements by timestamp and version number, as this is the
# almost sensible ordering available. this would be much nicer if
@ -56,6 +64,12 @@ module Api
format.xml
end
end
private
def show_redactions?
current_user&.moderator? && params[:show_redactions] == "true"
end
end
end
end

64
test/controllers/api/changesets/downloads_controller_test.rb
View file

@ -242,19 +242,67 @@ module Api
# check that the changeset download for a changeset with a redacted
# element in it doesn't contain that element.
def test_show_redacted
check_redacted do |changeset|
get api_changeset_download_path(changeset)
end
end
def test_show_redacted_unauthorized
check_redacted do |changeset|
get api_changeset_download_path(changeset, :show_redactions => "true")
end
end
def test_show_redacted_normal_user
auth_header = bearer_authorization_header
check_redacted do |changeset|
get api_changeset_download_path(changeset, :show_redactions => "true"), :headers => auth_header
end
end
def test_show_redacted_moderator_without_show_redactions
auth_header = bearer_authorization_header create(:moderator_user)
check_redacted do |changeset|
get api_changeset_download_path(changeset), :headers => auth_header
end
end
def test_show_redacted_moderator
auth_header = bearer_authorization_header create(:moderator_user)
check_redacted(:redacted_included => true) do |changeset|
get api_changeset_download_path(changeset, :show_redactions => "true"), :headers => auth_header
end
end
private
def check_redacted(redacted_included: false)
redaction = create(:redaction)
changeset = create(:changeset)
node = create(:node, :with_history, :version => 2, :changeset => changeset)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
node_v1.redact!(redaction)
way = create(:way, :with_history, :version => 2, :changeset => changeset)
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(redaction)
relation = create(:relation, :with_history, :version => 2, :changeset => changeset)
relation_v1 = relation.old_relations.find_by(:version => 1)
relation_v1.redact!(redaction)
yield changeset
get api_changeset_download_path(changeset)
assert_response :success
assert_select "osmChange", 1
# this changeset contains the node in versions 1 & 2, but 1 should
# be hidden.
assert_select "osmChange node[id='#{node.id}']", 1
assert_select "osmChange node[id='#{node.id}'][version='1']", 0
assert_dom "osmChange", 1 do
assert_dom "node[id='#{node.id}'][version='1']", redacted_included ? 1 : 0
assert_dom "node[id='#{node.id}'][version='2']", 1
assert_dom "way[id='#{way.id}'][version='1']", redacted_included ? 1 : 0
assert_dom "way[id='#{way.id}'][version='2']", 1
assert_dom "relation[id='#{relation.id}'][version='1']", redacted_included ? 1 : 0
assert_dom "relation[id='#{relation.id}'][version='2']", 1
end
end
end
end