luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix IP blocks not having a unique index (#19456)

Browse source
This commit is contained in:
Eugen Rochko 2022-10-25 21:43:44 +02:00 committed by GitHub
parent 6f01111863
commit 487d81fb92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/ip_blocks_controller.rb
View file

@ -5,7 +5,7 @@ module Admin
def index
authorize :ip_block, :index?
@ip_blocks = IpBlock.page(params[:page])
@ip_blocks = IpBlock.order(ip: :asc).page(params[:page])
@form = Form::IpBlockBatch.new
end

1
app/models/ip_block.rb
View file

@ -25,6 +25,7 @@ class IpBlock < ApplicationRecord
}
validates :ip, :severity, presence: true
validates :ip, uniqueness: true
after_commit :reset_cache

17
db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb Normal file
View file

@ -0,0 +1,17 @@
class AddIndexIpBlocksOnIp < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
def up
duplicates = IpBlock.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM ip_blocks GROUP BY ip HAVING count(*) > 1').to_ary
duplicates.each do |row|
IpBlock.where(id: row['ids'].split(',')[0...-1]).destroy_all
end
add_index :ip_blocks, :ip, unique: true, algorithm: :concurrently
end
def down
remove_index :ip_blocks, :ip, unique: true
end
end

3
db/schema.rb
View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2022_10_21_055441) do
ActiveRecord::Schema.define(version: 2022_10_25_171544) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -521,6 +521,7 @@ ActiveRecord::Schema.define(version: 2022_10_21_055441) do
t.inet "ip", default: "0.0.0.0", null: false
t.integer "severity", default: 0, null: false
t.text "comment", default: "", null: false
t.index ["ip"], name: "index_ip_blocks_on_ip", unique: true
end
create_table "list_accounts", force: :cascade do |t|