aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-12-06 23:38:03 +0100
committerGitHub <noreply@github.com>2022-12-06 23:38:03 +0100
commit66a70ebb6e64c97dd9e0b2ffaeaa33aad3a28beb (patch)
tree2f3aaccfc27e830681bcd6917d5c664dbf1ac1f1
parent05d4c50f64af33a7e3ec6d724a21ab8d0eeb17fa (diff)
downloadmastodon-66a70ebb6e64c97dd9e0b2ffaeaa33aad3a28beb.tar
mastodon-66a70ebb6e64c97dd9e0b2ffaeaa33aad3a28beb.tar.gz
mastodon-66a70ebb6e64c97dd9e0b2ffaeaa33aad3a28beb.tar.bz2
mastodon-66a70ebb6e64c97dd9e0b2ffaeaa33aad3a28beb.zip
Fix pre-4.0 admin action logs (#22091)
* Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again
-rw-r--r--db/post_migrate/20221101190723_backfill_admin_action_logs.rb29
-rw-r--r--db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb153
-rw-r--r--db/schema.rb2
-rw-r--r--lib/tasks/tests.rake14
4 files changed, 182 insertions, 16 deletions
diff --git a/db/post_migrate/20221101190723_backfill_admin_action_logs.rb b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
index 9a64d1715..48ef1e6e3 100644
--- a/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
+++ b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
@@ -79,69 +79,72 @@ class BackfillAdminActionLogs < ActiveRecord::Migration[6.1]
safety_assured do
AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
next if log.account.nil?
- log.update(human_identifier: log.account.acct)
+ log.update_attribute('human_identifier', log.account.acct)
end
AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
next if log.user.nil?
- log.update(human_identifier: log.user.account.acct, route_param: log.user.account_id)
+ log.update_attribute('human_identifier', log.user.account.acct)
+ log.update_attribute('route_param', log.user.account_id)
end
Admin::ActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
next if log.domain_block.nil?
- log.update(human_identifier: log.domain_block.domain)
+ log.update_attribute('human_identifier', log.domain_block.domain)
end
AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
next if log.domain_allow.nil?
- log.update(human_identifier: log.domain_allow.domain)
+ log.update_attribute('human_identifier', log.domain_allow.domain)
end
AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
next if log.email_domain_block.nil?
- log.update(human_identifier: log.email_domain_block.domain)
+ log.update_attribute('human_identifier', log.email_domain_block.domain)
end
AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
next if log.unavailable_domain.nil?
- log.update(human_identifier: log.unavailable_domain.domain)
+ log.update_attribute('human_identifier', log.unavailable_domain.domain)
end
AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
next if log.status.nil?
- log.update(human_identifier: log.status.account.acct, permalink: log.status.uri)
+ log.update_attribute('human_identifier', log.status.account.acct)
+ log.update_attribute('permalink', log.status.uri)
end
AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
next if log.account_warning.nil?
- log.update(human_identifier: log.account_warning.account.acct)
+ log.update_attribute('human_identifier', log.account_warning.account.acct)
end
AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
next if log.announcement.nil?
- log.update(human_identifier: log.announcement.text)
+ log.update_attribute('human_identifier', log.announcement.text)
end
AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
next if log.ip_block.nil?
- log.update(human_identifier: "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
+ log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
end
AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
next if log.custom_emoji.nil?
- log.update(human_identifier: log.custom_emoji.shortcode)
+ log.update_attribute('human_identifier', log.custom_emoji.shortcode)
end
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(human_identifier: log.canonical_email_block.canonical_email_hash)
+ log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
end
AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
next if log.appeal.nil?
- log.update(human_identifier: log.appeal.account.acct, route_param: log.appeal.account_warning_id)
+ log.update_attribute('human_identifier', log.appeal.account.acct)
+ log.update_attribute('route_param', log.appeal.account_warning_id)
end
end
end
diff --git a/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb b/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
new file mode 100644
index 000000000..279053ab9
--- /dev/null
+++ b/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+class BackfillAdminActionLogsAgain < ActiveRecord::Migration[6.1]
+ disable_ddl_transaction!
+
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ has_one :user, inverse_of: :account
+
+ def local?
+ domain.nil?
+ end
+
+ def acct
+ local? ? username : "#{username}@#{domain}"
+ end
+ end
+
+ class User < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account
+ end
+
+ class Status < ApplicationRecord
+ include RoutingHelper
+
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account
+
+ def local?
+ attributes['local'] || attributes['uri'].nil?
+ end
+
+ def uri
+ local? ? activity_account_status_url(account, self) : attributes['uri']
+ end
+ end
+
+ class DomainBlock < ApplicationRecord; end
+ class DomainAllow < ApplicationRecord; end
+ class EmailDomainBlock < ApplicationRecord; end
+ class UnavailableDomain < ApplicationRecord; end
+
+ class AccountWarning < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account
+ end
+
+ class Announcement < ApplicationRecord; end
+ class IpBlock < ApplicationRecord; end
+ class CustomEmoji < ApplicationRecord; end
+ class CanonicalEmailBlock < ApplicationRecord; end
+
+ class Appeal < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account
+ end
+
+ class AdminActionLog < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+
+ # Cannot use usual polymorphic support because of namespacing issues
+ belongs_to :status, foreign_key: :target_id
+ belongs_to :account, foreign_key: :target_id
+ belongs_to :user, foreign_key: :user_id
+ belongs_to :domain_block, foreign_key: :target_id
+ belongs_to :domain_allow, foreign_key: :target_id
+ belongs_to :email_domain_block, foreign_key: :target_id
+ belongs_to :unavailable_domain, foreign_key: :target_id
+ belongs_to :account_warning, foreign_key: :target_id
+ belongs_to :announcement, foreign_key: :target_id
+ belongs_to :ip_block, foreign_key: :target_id
+ belongs_to :custom_emoji, foreign_key: :target_id
+ belongs_to :canonical_email_block, foreign_key: :target_id
+ belongs_to :appeal, foreign_key: :target_id
+ end
+
+ def up
+ safety_assured do
+ AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
+ next if log.account.nil?
+ log.update_attribute('human_identifier', log.account.acct)
+ end
+
+ 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.user.account.acct)
+ log.update_attribute('route_param', log.user.account_id)
+ end
+
+ Admin::ActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+
+ AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
+ next if log.domain_block.nil?
+ log.update_attribute('human_identifier', log.domain_block.domain)
+ end
+
+ AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
+ next if log.domain_allow.nil?
+ log.update_attribute('human_identifier', log.domain_allow.domain)
+ end
+
+ 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.email_domain_block.domain)
+ end
+
+ AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
+ next if log.unavailable_domain.nil?
+ log.update_attribute('human_identifier', log.unavailable_domain.domain)
+ end
+
+ 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.status.account.acct)
+ log.update_attribute('permalink', log.status.uri)
+ end
+
+ 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.account_warning.account.acct)
+ end
+
+ 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.announcement.text)
+ end
+
+ 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.ip_block.ip}/#{log.ip_block.ip.prefix}")
+ end
+
+ 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.custom_emoji.shortcode)
+ end
+
+ 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
+
+ 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
+
+ def down; end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 09d07fcca..704cef122 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_11_04_133904) do
+ActiveRecord::Schema.define(version: 2022_12_06_114142) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 96d2f7112..1dd25abb9 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -43,6 +43,16 @@ namespace :tests do
puts 'CustomFilterKeyword records not created as expected'
exit(1)
end
+
+ unless Admin::ActionLog.find_by(target_type: 'DomainBlock', target_id: 1).human_identifier == 'example.org'
+ puts 'Admin::ActionLog domain block records not updated as expected'
+ exit(1)
+ end
+
+ unless Admin::ActionLog.find_by(target_type: 'EmailDomainBlock', target_id: 1).human_identifier == 'example.org'
+ puts 'Admin::ActionLog email domain block records not updated as expected'
+ exit(1)
+ end
end
desc 'Populate the database with test data for 2.4.3'
@@ -84,8 +94,8 @@ namespace :tests do
VALUES
(1, 'destroy', 'Account', 1, now(), now()),
(1, 'destroy', 'User', 1, now(), now()),
- (1, 'destroy', 'DomainBlock', 1312, now(), now()),
- (1, 'destroy', 'EmailDomainBlock', 1312, now(), now()),
+ (1, 'destroy', 'DomainBlock', 1, now(), now()),
+ (1, 'destroy', 'EmailDomainBlock', 1, now(), now()),
(1, 'destroy', 'Status', 1, now(), now()),
(1, 'destroy', 'CustomEmoji', 3, now(), now());
SQL