A platform for community discussion. Free, open, simple.
FIX: Uploads Restorer -- Remap Safety (#42874)
Bannon Tanner2389a5cc2f44
diff --git a/lib/backup_restore/uploads_restorer.rb b/lib/backup_restore/uploads_restorer.rbindex 587cdb7099d..6248b1dbfa7 100644--- a/lib/backup_restore/uploads_restorer.rb+++ b/lib/backup_restore/uploads_restorer.rb@@ -131,7 +131,13 @@ module BackupRestoredef remap(from, to)log "Remapping '#{from}' to '#{to}'"- DbHelper.remap(from, to, verbose: true, excluded_tables: ["backup_metadata"])+ DbHelper.remap(+ from,+ to,+ verbose: true,+ excluded_tables: ["backup_metadata"],+ skip_max_length_violations: true,+ )enddef remap_s3(old_s3_base_url, uploads_folder)@@ -143,6 +149,7 @@ module BackupRestoreuploads_folder,verbose: true,excluded_tables: ["backup_metadata"],+ skip_max_length_violations: true,)elseremap(old_s3_base_url, uploads_folder)diff --git a/lib/db_helper.rb b/lib/db_helper.rbindex 86913a707ad..68e5d3c80d0 100644--- a/lib/db_helper.rb+++ b/lib/db_helper.rb@@ -190,13 +190,21 @@ class DbHelperparts[:length_constrained_columns] << "#{column[:name]}(#{column[:max_length]})"end- # Build SQL update statements for each column- parts[:updates] << %|"#{column[:name]}" = #{replace}|-# Build the base SQL condition clause for each columnbasic_condition = transforms[:condition].call(column[:name])if skip_max_length_violations && column[:max_length].present?+ # Per-column protection: preserve the original value when the transformed+ # value would exceed the column length limit. Without this, a row that+ # matches on any short column still assigns overflowing values to its+ # other constrained columns and triggers PG::StringDataRightTruncation.+ parts[:updates] << <<~SQL.strip+ "#{column[:name]}" = CASE+ WHEN LENGTH(#{replace}) <= #{column[:max_length]} THEN #{replace}+ ELSE "#{column[:name]}"+ END+ SQL+# Extend base condition to skip updates that would violate the column length constraintparts[:conditions@@ -213,6 +221,7 @@ class DbHelper) AS #{column[:name]}_skippedSQLelse+ parts[:updates] << %|"#{column[:name]}" = #{replace}|parts[:conditions] << "(#{basic_condition})"endenddiff --git a/spec/lib/backup_restore/uploads_restorer_spec.rb b/spec/lib/backup_restore/uploads_restorer_spec.rbindex 6de72ce0cb7..8607dbdf34e 100644--- a/spec/lib/backup_restore/uploads_restorer_spec.rb+++ b/spec/lib/backup_restore/uploads_restorer_spec.rb@@ -636,4 +636,36 @@ RSpec.describe BackupRestore::UploadsRestorer doFileUtils.mkdir_p(File.join(directory, "uploads", ".hidden"))endend++ describe "length-constrained columns during remap" do+ it "passes skip_max_length_violations to DbHelper.remap" do+ DbHelper+ .expects(:remap)+ .with { |_from, _to, args| args[:skip_max_length_violations] == true }+ .at_least_once++ with_temp_uploads_directory(name: "foo") do |directory|+ Discourse.store.class.any_instance.stubs(:copy_from)+ BackupMetadata.create!(name: "db_name", value: "foo")+ restorer.restore(directory)+ end+ end++ it "passes skip_max_length_violations to DbHelper.regexp_replace" do+ DbHelper.stubs(:remap)+ DbHelper+ .expects(:regexp_replace)+ .with { |_from, _to, args| args[:skip_max_length_violations] == true }+ .at_least_once++ with_temp_uploads_directory(name: "default") do |directory|+ Discourse.store.class.any_instance.stubs(:copy_from)+ BackupMetadata.create!(+ name: "s3_base_url",+ value: "//old-bucket.s3.dualstack.us-west-2.amazonaws.com",+ )+ restorer.restore(directory)+ end+ end+ endenddiff --git a/spec/lib/db_helper_spec.rb b/spec/lib/db_helper_spec.rbindex 9b4377cd4ac..f99956696c0 100644--- a/spec/lib/db_helper_spec.rb+++ b/spec/lib/db_helper_spec.rb@@ -86,6 +86,25 @@ RSpec.describe DbHelper doexpect(sidebar_url1.name).to eq("short-sidebar-url")expect(sidebar_url2.name).to eq("another-sidebar-url")end++ it "protects each length-constrained column independently on the same row" do+ value_limit = SidebarUrl.columns_hash["value"].limit+ # name(80) will fit after remap, value(1000) will overflow.+ row =+ SidebarUrl.create!(+ icon: "link",+ name: "TOK-name",+ value: "TOK" + ("x" * (value_limit - 3)),+ )++ expect {+ DbHelper.remap("TOK", "TOKENEXPANDED", skip_max_length_violations: true)+ }.not_to raise_error++ row.reload+ expect(row.name).to eq("TOKENEXPANDED-name")+ expect(row.value).to eq("TOK" + ("x" * (value_limit - 3)))+ endendend@@ -138,6 +157,24 @@ RSpec.describe DbHelper doexpect(sidebar_url1.name).to eq("short-sidebar-url")expect(sidebar_url2.name).to eq("another-sidebar-url")end++ it "protects each length-constrained column independently on the same row" do+ value_limit = SidebarUrl.columns_hash["value"].limit+ row =+ SidebarUrl.create!(+ icon: "link",+ name: "TOK-name",+ value: "TOK" + ("x" * (value_limit - 3)),+ )++ expect {+ DbHelper.regexp_replace("TOK", "TOKENEXPANDED", skip_max_length_violations: true)+ }.not_to raise_error++ row.reload+ expect(row.name).to eq("TOKENEXPANDED-name")+ expect(row.value).to eq("TOK" + ("x" * (value_limit - 3)))+ endendendend