A platform for community discussion. Free, open, simple.
FIX: Validate `resumableFilename` in `check_backup_chunk` to prevent path traversa... (#42098)
Bannon Tannerfc96c733db08
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rbindex b57fc035d60..a3defb577ae 100644--- a/app/controllers/admin/backups_controller.rb+++ b/app/controllers/admin/backups_controller.rb@@ -178,6 +178,7 @@ class Admin::BackupsController < Admin::AdminControllercurrent_chunk_size = params.fetch(:resumableCurrentChunkSize).to_iraise Discourse::InvalidParameters.new(:resumableIdentifier) unless valid_filename?(identifier)+ raise Discourse::InvalidParameters.new(:resumableFilename) unless valid_filename?(filename)# path to chunk filechunk = BackupRestore::LocalBackupStore.chunk_path(identifier, filename, chunk_number)diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rbindex c1657b4f8e7..57b7376fe9b 100644--- a/spec/requests/admin/backups_controller_spec.rb+++ b/spec/requests/admin/backups_controller_spec.rb@@ -765,6 +765,44 @@ RSpec.describe Admin::BackupsController doexpect(response.status).to eq(400)endend++ describe "when resumableFilename contains path traversal characters" do+ it "does not reveal the status of a chunk outside its upload directory" do+ traversed_chunk = backup_path("traversed-backup.tar.gz.part1")+ File.write(traversed_chunk, "secret")+ @paths = [traversed_chunk]+ chunk_directory = backup_path(File.join("tmp", "upload"))+ FileUtils.mkdir_p(chunk_directory)++ begin+ get "/admin/backups/upload.json",+ params: {+ resumableIdentifier: "upload",+ resumableFilename: "../../traversed-backup.tar.gz",+ resumableChunkNumber: "1",+ resumableCurrentChunkSize: File.size(traversed_chunk).to_s,+ }++ expect(response.status).to eq(400)+ expect(response.parsed_body["errors"]).to contain_exactly(+ I18n.t("invalid_params", message: "resumableFilename"),+ )++ get "/admin/backups/upload.json",+ params: {+ resumableIdentifier: "upload",+ resumableFilename: "missing-backup.tar.gz",+ resumableChunkNumber: "1",+ resumableCurrentChunkSize: "6",+ }++ expect(response.status).to eq(404)+ expect(response.body).to eq("")+ ensure+ FileUtils.rm_rf(chunk_directory)+ end+ end+ endendshared_examples "checking backup chunk not allowed" do