A platform for community discussion. Free, open, simple.
FIX: Race condition allows bypass of data export rate limit in Discourse (#41990)
Bannon Tannera3e825da5b5a
diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rbindex f20f6de49a4..82690e20f89 100644--- a/app/controllers/export_csv_controller.rb+++ b/app/controllers/export_csv_controller.rb@@ -17,24 +17,28 @@ class ExportCsvController < ApplicationControllerendif entity == "user_archive"+ archive_user_id = entity_id || current_user.idrequesting_user_id = current_user.id if entity_id# Rate limit user archive exports to 1 per day- unless current_user.admin ||- UserExport.where(- user_id: entity_id || current_user.id,- created_at: Time.zone.now.all_day,- ).count == 0+ reservation_key = reserve_user_archive_export!(archive_user_id)++ unless current_user.admin || reservation_keyrender_json_error I18n.t("csv_export.rate_limit_error")returnend- Jobs.enqueue(- :export_user_archive,- user_id: entity_id || current_user.id,- requesting_user_id:,- args: export_params[:args],- )+ begin+ Jobs.enqueue(+ :export_user_archive,+ user_id: archive_user_id,+ requesting_user_id:,+ args: export_params[:args],+ )+ rescue StandardError+ Discourse.redis.del(reservation_key) if reservation_key+ raise+ endelseJobs.enqueue(:export_csv_file,@@ -64,6 +68,24 @@ class ExportCsvController < ApplicationControllerprivate+ def reserve_user_archive_export!(user_id)+ return nil if UserExport.exists?(user_id: user_id, created_at: Time.zone.now.all_day)++ key = user_archive_export_rate_limit_key(user_id)+ return nil unless Discourse.redis.set(key, "1", nx: true, ex: seconds_until_tomorrow)++ key+ end++ def user_archive_export_rate_limit_key(user_id)+ "user_archive_export_rate_limit:#{user_id}:#{Time.zone.today}"+ end++ def seconds_until_tomorrow+ now = Time.zone.now+ [(now.end_of_day - now).ceil, 1].max+ end+def export_params@_export_params ||=begindiff --git a/spec/requests/export_csv_controller_spec.rb b/spec/requests/export_csv_controller_spec.rbindex 63e9d45c625..a32a6874ff6 100644--- a/spec/requests/export_csv_controller_spec.rb+++ b/spec/requests/export_csv_controller_spec.rb@@ -35,6 +35,31 @@ RSpec.describe ExportCsvController doexpect(Jobs::ExportUserArchive.jobs.size).to eq(0)end+ it "rate limits repeated archive requests while the export job is pending" do+ post "/export_csv/export_entity.json", params: { entity: "user_archive" }+ expect(response.status).to eq(200)+ expect(response.parsed_body["success"]).to eq("OK")++ post "/export_csv/export_entity.json", params: { entity: "user_archive" }+ expect(response.status).to eq(422)+ expect(response.parsed_body["errors"]).to contain_exactly(+ I18n.t("csv_export.rate_limit_error"),+ )+ expect(Jobs::ExportUserArchive.jobs.size).to eq(1)+ end++ it "releases the reservation if enqueuing the job raises" do+ Jobs::ExportUserArchive.stubs(:client_push).raises("boom").once+ post "/export_csv/export_entity.json", params: { entity: "user_archive" }+ expect(response.status).to eq(500)+ expect(Jobs::ExportUserArchive.jobs.size).to eq(0)++ Jobs::ExportUserArchive.unstub(:client_push)+ post "/export_csv/export_entity.json", params: { entity: "user_archive" }+ expect(response.status).to eq(200)+ expect(Jobs::ExportUserArchive.jobs.size).to eq(1)+ end+it "returns 404 when normal user tries to export admin entity" dopost "/export_csv/export_entity.json", params: { entity: "staff_action" }expect(response.status).to eq(422)