From: Anton Khorev Date: Tue, 11 Feb 2025 03:43:09 +0000 (+0300) Subject: Create way version redaction resource X-Git-Tag: live~148^2~3 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8ccdc50313737f43d5f007b299977568ee0e8689?hp=--cc Create way version redaction resource --- 8ccdc50313737f43d5f007b299977568ee0e8689 diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb index 08ec993dc..caa4969bc 100644 --- a/app/abilities/api_ability.rb +++ b/app/abilities/api_ability.rb @@ -44,7 +44,7 @@ class ApiAbility can :destroy, Note if scopes.include?("write_notes") - can :redact, [OldWay, OldRelation] if user.terms_agreed? && scopes.include?("write_redactions") + can :redact, [OldRelation] if user.terms_agreed? && scopes.include?("write_redactions") can [:create, :destroy], :element_version_redaction if user.terms_agreed? && scopes.include?("write_redactions") can :create, UserBlock if scopes.include?("write_blocks") diff --git a/app/controllers/api/old_ways/redactions_controller.rb b/app/controllers/api/old_ways/redactions_controller.rb new file mode 100644 index 000000000..781d6ad98 --- /dev/null +++ b/app/controllers/api/old_ways/redactions_controller.rb @@ -0,0 +1,11 @@ +module Api + module OldWays + class RedactionsController < OldElements::RedactionsController + private + + def lookup_old_element + @old_element = OldWay.find([params[:way_id], params[:version]]) + end + end + end +end diff --git a/config/routes.rb b/config/routes.rb index db67eed98..6f38e35a5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,8 +30,6 @@ OpenStreetMap::Application.routes.draw do post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/ post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/ - post "way/:way_id/:version/redact" => "old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/ - post "relation/:relation_id/:version/redact" => "old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/ end @@ -61,9 +59,12 @@ OpenStreetMap::Application.routes.draw do resources :relations, :only => :index end resources :versions, :path => "history", :controller => :old_ways, :only => :index - resources :versions, :path => "", :version => /\d+/, :param => :version, :controller => :old_ways, :only => :show + resource :version, :path => ":version", :version => /\d+/, :controller => :old_ways, :only => :show do + resource :redaction, :module => :old_ways, :only => [:create, :destroy] + end end put "way/create" => "ways#create", :as => nil + post "way/:way_id/:version/redact" => "old_ways/redactions#create", :way_id => /\d+/, :version => /\d+/, :allow_delete => true, :as => nil resources :relations, :only => [:index, :create] resources :relations, :path => "relation", :id => /\d+/, :only => [:show, :update, :destroy] do diff --git a/test/controllers/api/old_ways/redactions_controller_test.rb b/test/controllers/api/old_ways/redactions_controller_test.rb new file mode 100644 index 000000000..f791d096b --- /dev/null +++ b/test/controllers/api/old_ways/redactions_controller_test.rb @@ -0,0 +1,171 @@ +require "test_helper" + +module Api + module OldWays + class RedactionsControllerTest < ActionDispatch::IntegrationTest + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/way/1/2/redaction", :method => :post }, + { :controller => "api/old_ways/redactions", :action => "create", :way_id => "1", :version => "2" } + ) + assert_routing( + { :path => "/api/0.6/way/1/2/redaction", :method => :delete }, + { :controller => "api/old_ways/redactions", :action => "destroy", :way_id => "1", :version => "2" } + ) + + assert_recognizes( + { :controller => "api/old_ways/redactions", :action => "create", :way_id => "1", :version => "2", :allow_delete => true }, + { :path => "/api/0.6/way/1/2/redact", :method => :post } + ) + end + + ## + # test that, even as moderator, the current version of a way + # can't be redacted. + def test_create_on_current_version + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 2) + redaction = create(:redaction) + auth_header = bearer_authorization_header create(:moderator_user) + + post api_way_version_redaction_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header + + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + assert_nil old_way.reload.redaction + end + + def test_create_without_redaction_id + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + auth_header = bearer_authorization_header create(:moderator_user) + + post api_way_version_redaction_path(*old_way.id), :headers => auth_header + + assert_response :bad_request, "should need redaction ID to redact." + assert_nil old_way.reload.redaction + end + + ## + # test the redaction of an old version of a way, while not being + # authorised. + def test_create_by_unauthorised + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + + post api_way_version_redaction_path(*old_way.id), :params => { :redaction => redaction.id } + + assert_response :unauthorized, "should need to be authenticated to redact." + assert_nil old_way.reload.redaction + end + + def test_create_by_normal_user_without_write_redactions_scope + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + auth_header = bearer_authorization_header create(:user), :scopes => %w[read_prefs write_api] + + post api_way_version_redaction_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header + + assert_response :forbidden, "should need to be moderator to redact." + assert_nil old_way.reload.redaction + end + + def test_create_by_normal_user_with_write_redactions_scope + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + auth_header = bearer_authorization_header create(:user), :scopes => %w[write_redactions] + + post api_way_version_redaction_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header + + assert_response :forbidden, "should need to be moderator to redact." + assert_nil old_way.reload.redaction + end + + def test_create_by_moderator_without_write_redactions_scope + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + auth_header = bearer_authorization_header create(:moderator_user), :scopes => %w[read_prefs write_api] + + post api_way_version_redaction_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header + + assert_response :forbidden, "should need to have write_redactions scope to redact." + assert_nil old_way.reload.redaction + end + + def test_create_by_moderator_with_write_redactions_scope + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + auth_header = bearer_authorization_header create(:moderator_user), :scopes => %w[write_redactions] + + post api_way_version_redaction_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header + + assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." + assert_equal redaction, old_way.reload.redaction + end + + ## + # test the unredaction of an old version of a way, while not being + # authorised. + def test_destroy_by_unauthorised + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + old_way.redact!(redaction) + + delete api_way_version_redaction_path(*old_way.id) + + assert_response :unauthorized, "should need to be authenticated to unredact." + assert_equal redaction, old_way.reload.redaction + end + + ## + # test the unredaction of an old version of a way, while being + # authorised as a normal user. + def test_destroy_by_normal_user + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + redaction = create(:redaction) + old_way.redact!(redaction) + auth_header = bearer_authorization_header + + delete api_way_version_redaction_path(*old_way.id), :headers => auth_header + + assert_response :forbidden, "should need to be moderator to unredact." + assert_equal redaction, old_way.reload.redaction + end + + ## + # test the unredaction of an old version of a way, while being + # authorised as a moderator. + def test_destroy_by_moderator + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + old_way.redact!(create(:redaction)) + auth_header = bearer_authorization_header create(:moderator_user) + + delete api_way_version_redaction_path(*old_way.id), :headers => auth_header + + assert_response :success, "should be OK to unredact old version as moderator." + assert_nil old_way.reload.redaction + end + + def test_destroy_at_legacy_route + way = create(:way, :with_history, :version => 2) + old_way = way.old_ways.find_by(:version => 1) + old_way.redact!(create(:redaction)) + auth_header = bearer_authorization_header create(:moderator_user) + + post "/api/0.6/way/#{old_way.way_id}/#{old_way.version}/redact", :headers => auth_header + + assert_response :success, "should be OK to unredact old version as moderator." + assert_nil old_way.reload.redaction + end + end + end +end diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb index 6946d2ab1..31b66ae8b 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -21,10 +21,6 @@ module Api { :path => "/api/0.6/way/1/2.json", :method => :get }, { :controller => "api/old_ways", :action => "show", :way_id => "1", :version => "2", :format => "json" } ) - assert_routing( - { :path => "/api/0.6/way/1/2/redact", :method => :post }, - { :controller => "api/old_ways", :action => "redact", :way_id => "1", :version => "2" } - ) end ## @@ -195,129 +191,6 @@ module Api check_history_equals_versions(way_with_versions.id) end - ## - # test that, even as moderator, the current version of a way - # can't be redacted. - def test_redact_way_current_version - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 2) - redaction = create(:redaction) - auth_header = bearer_authorization_header create(:moderator_user) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header - - assert_response :bad_request, "shouldn't be OK to redact current version as moderator." - assert_nil old_way.reload.redaction - end - - ## - # test the redaction of an old version of a way, while not being - # authorised. - def test_redact_way_unauthorised - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id } - - assert_response :unauthorized, "should need to be authenticated to redact." - assert_nil old_way.reload.redaction - end - - def test_redact_way_by_regular_without_write_redactions_scope - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api]) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header - - assert_response :forbidden, "should need to be moderator to redact." - assert_nil old_way.reload.redaction - end - - def test_redact_way_by_regular_with_write_redactions_scope - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions]) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header - - assert_response :forbidden, "should need to be moderator to redact." - assert_nil old_way.reload.redaction - end - - def test_redact_way_by_moderator_without_write_redactions_scope - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api]) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header - - assert_response :forbidden, "should need to have write_redactions scope to redact." - assert_nil old_way.reload.redaction - end - - def test_redact_way_by_moderator_with_write_redactions_scope - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions]) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header - - assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." - assert_equal redaction, old_way.reload.redaction - end - - ## - # test the unredaction of an old version of a way, while not being - # authorised. - def test_unredact_way_unauthorised - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - old_way.redact!(redaction) - - post way_version_redact_path(*old_way.id) - - assert_response :unauthorized, "should need to be authenticated to unredact." - assert_equal redaction, old_way.reload.redaction - end - - ## - # test the unredaction of an old version of a way, while being - # authorised as a normal user. - def test_unredact_way_normal_user - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - redaction = create(:redaction) - old_way.redact!(redaction) - auth_header = bearer_authorization_header - - post way_version_redact_path(*old_way.id), :headers => auth_header - - assert_response :forbidden, "should need to be moderator to unredact." - assert_equal redaction, old_way.reload.redaction - end - - ## - # test the unredaction of an old version of a way, while being - # authorised as a moderator. - def test_unredact_way_moderator - way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) - old_way.redact!(create(:redaction)) - auth_header = bearer_authorization_header create(:moderator_user) - - post way_version_redact_path(*old_way.id), :headers => auth_header - - assert_response :success, "should be OK to unredact old version as moderator." - assert_nil old_way.reload.redaction - end - private ##