mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 06:06:45 +00:00
Fix pre-4.0 admin action logs (#22091)
* Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again
This commit is contained in:
parent
05d4c50f64
commit
66a70ebb6e
|
@ -79,69 +79,72 @@ class BackfillAdminActionLogs < ActiveRecord::Migration[6.1]
|
||||||
safety_assured do
|
safety_assured do
|
||||||
AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
|
||||||
next if log.account.nil?
|
next if log.account.nil?
|
||||||
log.update(human_identifier: log.account.acct)
|
log.update_attribute('human_identifier', log.account.acct)
|
||||||
end
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
|
||||||
next if log.user.nil?
|
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
|
end
|
||||||
|
|
||||||
Admin::ActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
|
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|
|
AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
|
||||||
next if log.domain_block.nil?
|
next if log.domain_block.nil?
|
||||||
log.update(human_identifier: log.domain_block.domain)
|
log.update_attribute('human_identifier', log.domain_block.domain)
|
||||||
end
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
|
AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
|
||||||
next if log.domain_allow.nil?
|
next if log.domain_allow.nil?
|
||||||
log.update(human_identifier: log.domain_allow.domain)
|
log.update_attribute('human_identifier', log.domain_allow.domain)
|
||||||
end
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
|
AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
|
||||||
next if log.email_domain_block.nil?
|
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
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
|
AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
|
||||||
next if log.unavailable_domain.nil?
|
next if log.unavailable_domain.nil?
|
||||||
log.update(human_identifier: log.unavailable_domain.domain)
|
log.update_attribute('human_identifier', log.unavailable_domain.domain)
|
||||||
end
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
|
||||||
next if log.status.nil?
|
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
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
|
||||||
next if log.account_warning.nil?
|
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
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
|
||||||
next if log.announcement.nil?
|
next if log.announcement.nil?
|
||||||
log.update(human_identifier: log.announcement.text)
|
log.update_attribute('human_identifier', log.announcement.text)
|
||||||
end
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
|
||||||
next if log.ip_block.nil?
|
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
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
|
||||||
next if log.custom_emoji.nil?
|
next if log.custom_emoji.nil?
|
||||||
log.update(human_identifier: log.custom_emoji.shortcode)
|
log.update_attribute('human_identifier', log.custom_emoji.shortcode)
|
||||||
end
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
|
||||||
next if log.canonical_email_block.nil?
|
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
|
end
|
||||||
|
|
||||||
AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
|
AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
|
||||||
next if log.appeal.nil?
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -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
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# 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
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
|
|
@ -43,6 +43,16 @@ namespace :tests do
|
||||||
puts 'CustomFilterKeyword records not created as expected'
|
puts 'CustomFilterKeyword records not created as expected'
|
||||||
exit(1)
|
exit(1)
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
desc 'Populate the database with test data for 2.4.3'
|
desc 'Populate the database with test data for 2.4.3'
|
||||||
|
@ -84,8 +94,8 @@ namespace :tests do
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'destroy', 'Account', 1, now(), now()),
|
(1, 'destroy', 'Account', 1, now(), now()),
|
||||||
(1, 'destroy', 'User', 1, now(), now()),
|
(1, 'destroy', 'User', 1, now(), now()),
|
||||||
(1, 'destroy', 'DomainBlock', 1312, now(), now()),
|
(1, 'destroy', 'DomainBlock', 1, now(), now()),
|
||||||
(1, 'destroy', 'EmailDomainBlock', 1312, now(), now()),
|
(1, 'destroy', 'EmailDomainBlock', 1, now(), now()),
|
||||||
(1, 'destroy', 'Status', 1, now(), now()),
|
(1, 'destroy', 'Status', 1, now(), now()),
|
||||||
(1, 'destroy', 'CustomEmoji', 3, now(), now());
|
(1, 'destroy', 'CustomEmoji', 3, now(), now());
|
||||||
SQL
|
SQL
|
||||||
|
|
Loading…
Reference in a new issue