Merge pull request #2556 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to f92d8c6
glitch-soc · Jan 3, 2024 · dfbf960 · dfbf960
2 parents 0cf9f32 + 0b5783f
commit dfbf960
Show file tree

Hide file tree

Showing 10 changed files with 432 additions and 147 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -74,14 +74,12 @@ Metrics/ModuleLength:
 Metrics/AbcSize:
   Exclude:
     - 'lib/mastodon/cli/*.rb'
-    - db/*migrate/**/*
 
 # Reason: Currently disabled in .rubocop_todo.yml
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricscyclomaticcomplexity
 Metrics/CyclomaticComplexity:
   Exclude:
     - lib/mastodon/cli/*.rb
-    - db/*migrate/**/*
 
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsparameterlists

diff --git a/SECURITY.md b/SECURITY.md
@@ -13,10 +13,8 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 
 ## Supported Versions
 
-| Version | Supported        |
-| ------- | ---------------- |
-| 4.2.x   | Yes              |
-| 4.1.x   | Yes              |
-| 4.0.x   | No               |
-| 3.5.x   | Until 2023-12-31 |
-| < 3.5   | No               |
+| Version | Supported |
+| ------- | --------- |
+| 4.2.x   | Yes       |
+| 4.1.x   | Yes       |
+| < 4.1   | No        |
diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb
@@ -68,7 +68,7 @@ def export_headers
 
     def export_data
       CSV.generate(headers: export_headers, write_headers: true) do |content|
-        DomainBlock.with_limitations.each do |instance|
+        DomainBlock.with_limitations.order(id: :asc).each do |instance|
           content << [instance.domain, instance.severity, instance.reject_media, instance.reject_reports, instance.public_comment, instance.obfuscate]
         end
       end

diff --git a/db/post_migrate/20221101190723_backfill_admin_action_logs.rb b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
@@ -77,90 +77,135 @@ class AdminActionLog < ApplicationRecord
 
   def up
     safety_assured do
-      AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
-        next if log.account.nil?
+      process_logs_for_account
+      process_logs_for_user
+      process_logs_for_report
+      process_logs_for_domain_block
+      process_logs_for_domain_allow
+      process_logs_for_email_domain_block
+      process_logs_for_unavailable_domain
+      process_logs_for_status
+      process_logs_for_account_warning
+      process_logs_for_announcement
+      process_logs_for_ip_block
+      process_logs_for_custom_emoji
+      process_logs_for_canonical_email_block
+      process_logs_for_appeal
+    end
+  end
 
-        log.update_attribute('human_identifier', log.account.acct)
-      end
+  def down; end
 
-      AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
-        next if log.user.nil?
+  private
 
-        log.update_attribute('human_identifier', log.user.account.acct)
-        log.update_attribute('route_param', log.user.account_id)
-      end
+  def process_logs_for_account
+    AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
+      next if log.account.nil?
 
-      AdminActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+      log.update_attribute('human_identifier', log.account.acct)
+    end
+  end
 
-      AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
-        next if log.domain_block.nil?
+  def process_logs_for_user
+    AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
+      next if log.user.nil?
 
-        log.update_attribute('human_identifier', log.domain_block.domain)
-      end
+      log.update_attribute('human_identifier', log.user.account.acct)
+      log.update_attribute('route_param', log.user.account_id)
+    end
+  end
 
-      AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
-        next if log.domain_allow.nil?
+  def process_logs_for_report
+    AdminActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+  end
 
-        log.update_attribute('human_identifier', log.domain_allow.domain)
-      end
+  def process_logs_for_domain_block
+    AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
+      next if log.domain_block.nil?
 
-      AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
-        next if log.email_domain_block.nil?
+      log.update_attribute('human_identifier', log.domain_block.domain)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.email_domain_block.domain)
-      end
+  def process_logs_for_domain_allow
+    AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
+      next if log.domain_allow.nil?
 
-      AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
-        next if log.unavailable_domain.nil?
+      log.update_attribute('human_identifier', log.domain_allow.domain)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.unavailable_domain.domain)
-      end
+  def process_logs_for_email_domain_block
+    AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
+      next if log.email_domain_block.nil?
 
-      AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
-        next if log.status.nil?
+      log.update_attribute('human_identifier', log.email_domain_block.domain)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.status.account.acct)
-        log.update_attribute('permalink', log.status.uri)
-      end
+  def process_logs_for_unavailable_domain
+    AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
+      next if log.unavailable_domain.nil?
 
-      AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
-        next if log.account_warning.nil?
+      log.update_attribute('human_identifier', log.unavailable_domain.domain)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.account_warning.account.acct)
-      end
+  def process_logs_for_status
+    AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
+      next if log.status.nil?
 
-      AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
-        next if log.announcement.nil?
+      log.update_attribute('human_identifier', log.status.account.acct)
+      log.update_attribute('permalink', log.status.uri)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.announcement.text)
-      end
+  def process_logs_for_account_warning
+    AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
+      next if log.account_warning.nil?
 
-      AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
-        next if log.ip_block.nil?
+      log.update_attribute('human_identifier', log.account_warning.account.acct)
+    end
+  end
 
-        log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
-      end
+  def process_logs_for_announcement
+    AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
+      next if log.announcement.nil?
 
-      AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
-        next if log.custom_emoji.nil?
+      log.update_attribute('human_identifier', log.announcement.text)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.custom_emoji.shortcode)
-      end
+  def process_logs_for_ip_block
+    AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
+      next if log.ip_block.nil?
 
-      AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
-        next if log.canonical_email_block.nil?
+      log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
+    end
+  end
 
-        log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
-      end
+  def process_logs_for_custom_emoji
+    AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
+      next if log.custom_emoji.nil?
 
-      AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
-        next if log.appeal.nil?
+      log.update_attribute('human_identifier', log.custom_emoji.shortcode)
+    end
+  end
 
-        log.update_attribute('human_identifier', log.appeal.account.acct)
-        log.update_attribute('route_param', log.appeal.account_warning_id)
-      end
+  def process_logs_for_canonical_email_block
+    AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
+      next if log.canonical_email_block.nil?
+
+      log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
     end
   end
 
-  def down; end
+  def process_logs_for_appeal
+    AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
+      next if log.appeal.nil?
+
+      log.update_attribute('human_identifier', log.appeal.account.acct)
+      log.update_attribute('route_param', log.appeal.account_warning_id)
+    end
+  end
 end