Skip to content

A platform for community discussion. Free, open, simple.

DEV: Remove unused backup upload URL endpoint (#44848)

Osama Sayegh97f28a983512
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index 18b7c32a5e1..921d2544c28 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -248,28 +248,6 @@ class Admin::BackupsController < Admin::AdminController
render body: nil
end
- def create_upload_url
- params.require(:filename)
- filename = params.fetch(:filename)
-
- unless valid_extension?(filename)
- return render_json_error(I18n.t("backup.backup_file_should_be_tar_gz"))
- end
- return render_json_error(I18n.t("backup.invalid_filename")) unless valid_filename?(filename)
-
- store = BackupRestore::BackupStore.create
-
- begin
- upload_url = store.generate_upload_url(filename)
- rescue BackupRestore::BackupStore::BackupFileExists
- return render_json_error(I18n.t("backup.file_exists"))
- rescue BackupRestore::BackupStore::StorageError => e
- return render_json_error(e)
- end
-
- render json: success_json.merge(url: upload_url)
- end
-
private
def has_enough_space_on_disk?(size)
diff --git a/config/routes.rb b/config/routes.rb
index bbebe0267a3..6b7224189fa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -444,7 +444,6 @@ Discourse::Application.routes.draw do
put "readonly" => "backups#readonly"
get "upload" => "backups#check_backup_chunk"
post "upload" => "backups#upload_backup_chunk"
- get "upload_url" => "backups#create_upload_url"
end
end
diff --git a/lib/backup_restore/backup_store.rb b/lib/backup_restore/backup_store.rb
index 2f8e98cf0f1..961d508b6e9 100644
--- a/lib/backup_restore/backup_store.rb
+++ b/lib/backup_restore/backup_store.rb
@@ -73,10 +73,6 @@ module BackupRestore
fail NotImplementedError
end
- def generate_upload_url(filename)
- fail NotImplementedError
- end
-
def stats
{
used_bytes: used_bytes,
diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rb
index b342fefbf85..a5ef712a03f 100644
--- a/lib/backup_restore/s3_backup_store.rb
+++ b/lib/backup_restore/s3_backup_store.rb
@@ -2,8 +2,6 @@
module BackupRestore
class S3BackupStore < BackupStore
- UPLOAD_URL_EXPIRES_AFTER_SECONDS = 6.hours.to_i
-
delegate :abort_multipart,
:presign_multipart_part,
:list_multipart_parts,
@@ -49,20 +47,6 @@ module BackupRestore
reset_cache
end
- def generate_upload_url(filename)
- obj = s3_helper.object(filename)
- raise BackupFileExists.new if obj.exists?
-
- @s3_helper.ensure_cors!([S3CorsRulesets::BACKUP_DIRECT_UPLOAD])
-
- presigned_url(obj, :put, UPLOAD_URL_EXPIRES_AFTER_SECONDS)
- rescue Aws::Errors::ServiceError => e
- Rails.logger.warn(
- "Failed to generate upload URL for S3: #{e.message.presence || e.class.name}",
- )
- raise StorageError.new(e.message.presence || e.class.name)
- end
-
def temporary_upload_path(file_name)
FileStore::BaseStore.temporary_upload_path(file_name, folder_prefix: temporary_folder_prefix)
end
diff --git a/spec/lib/backup_restore/s3_backup_store_spec.rb b/spec/lib/backup_restore/s3_backup_store_spec.rb
index 8253b1b0299..e6b92ae2090 100644
--- a/spec/lib/backup_restore/s3_backup_store_spec.rb
+++ b/spec/lib/backup_restore/s3_backup_store_spec.rb
@@ -200,15 +200,6 @@ RSpec.describe BackupRestore::S3BackupStore do
%r{\Ahttps://#{bucket}.*#{prefix}/#{filename}\?.*X-Amz-Expires=#{expires}.*X-Amz-Signature=.*\z}
end
- def upload_url_regex(db_name, filename, multisite:)
- bucket = Regexp.escape(SiteSetting.s3_backup_bucket)
- prefix = file_prefix(db_name, multisite)
- filename = Regexp.escape(filename)
- expires = BackupRestore::S3BackupStore::UPLOAD_URL_EXPIRES_AFTER_SECONDS
-
- %r{\Ahttps://#{bucket}.*#{prefix}/#{filename}\?.*X-Amz-Expires=#{expires}.*X-Amz-Signature=.*\z}
- end
-
def file_prefix(db_name, multisite)
multisite ? "\\/#{db_name}" : ""
end
diff --git a/spec/lib/backup_restore/shared_examples_for_backup_store.rb b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
index 0d620b39d3e..6e2b46dcbed 100644
--- a/spec/lib/backup_restore/shared_examples_for_backup_store.rb
+++ b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
@@ -360,29 +360,5 @@ RSpec.shared_examples "remote backup store" do
end
end
end
-
- describe "#generate_upload_url" do
- it "generates upload URL" do
- filename = "foo.tar.gz"
- url = store.generate_upload_url(filename)
-
- expect(url).to match(upload_url_regex("default", filename, multisite: false))
- end
-
- it "raises an exception when a file with same filename exists" do
- expect { store.generate_upload_url(backup1.filename) }.to raise_exception(
- BackupRestore::BackupStore::BackupFileExists,
- )
- end
-
- it "works with multisite", type: :multisite do
- test_multisite_connection("second") do
- filename = "foo.tar.gz"
- url = store.generate_upload_url(filename)
-
- expect(url).to match(upload_url_regex("second", filename, multisite: true))
- end
- end
- end
end
end