Add tootctl email-domain-blocks (#13589)
* Add tootctl email_domains (block|unblock) * fix codeclimate issues. * fix codeclimate issues. * fix codeclimate issues. * add list subcommand, remove log_action. * fix codeclimate issues. * filter duplicate hostnames,ips before block * rebase from currnet master branch. rename email_domains_cli.rb to email_domain_blocks_cli.rb . rename Mastodon::EmailDomainsCLI to Mastodon::EmailDomainBlocksCLI . rename command email_domains to email-domain-blocks . (Thor recognizes both of - and _ ) rename subcommand block to add . rename subcommand unblock to remove . change the color in list subcommand to while for domain or cyan for childlen. don't use include() in list subcommand. suppress console output about succeeded entry. add console output about count of processed/skipped. remove capitalization in subcommand description. remove long_desc in subcommand 'remove'. remove duplicate where in subcommand 'remove'. * fix codeclimate issue.gh/stable
parent
62ef6406cd
commit
370e38ee15
|
@ -12,6 +12,7 @@ require_relative 'mastodon/domains_cli'
|
||||||
require_relative 'mastodon/preview_cards_cli'
|
require_relative 'mastodon/preview_cards_cli'
|
||||||
require_relative 'mastodon/cache_cli'
|
require_relative 'mastodon/cache_cli'
|
||||||
require_relative 'mastodon/upgrade_cli'
|
require_relative 'mastodon/upgrade_cli'
|
||||||
|
require_relative 'mastodon/email_domain_blocks_cli'
|
||||||
require_relative 'mastodon/version'
|
require_relative 'mastodon/version'
|
||||||
|
|
||||||
module Mastodon
|
module Mastodon
|
||||||
|
@ -53,6 +54,9 @@ module Mastodon
|
||||||
desc 'upgrade SUBCOMMAND ...ARGS', 'Various version upgrade utilities'
|
desc 'upgrade SUBCOMMAND ...ARGS', 'Various version upgrade utilities'
|
||||||
subcommand 'upgrade', Mastodon::UpgradeCLI
|
subcommand 'upgrade', Mastodon::UpgradeCLI
|
||||||
|
|
||||||
|
desc 'email-domain-blocks SUBCOMMAND ...ARGS', 'Manage E-mail domain blocks'
|
||||||
|
subcommand 'email_domain_blocks', Mastodon::EmailDomainBlocksCLI
|
||||||
|
|
||||||
option :dry_run, type: :boolean
|
option :dry_run, type: :boolean
|
||||||
desc 'self-destruct', 'Erase the server from the federation'
|
desc 'self-destruct', 'Erase the server from the federation'
|
||||||
long_desc <<~LONG_DESC
|
long_desc <<~LONG_DESC
|
||||||
|
|
|
@ -0,0 +1,133 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'concurrent'
|
||||||
|
require_relative '../../config/boot'
|
||||||
|
require_relative '../../config/environment'
|
||||||
|
require_relative 'cli_helper'
|
||||||
|
|
||||||
|
module Mastodon
|
||||||
|
class EmailDomainBlocksCLI < Thor
|
||||||
|
include CLIHelper
|
||||||
|
|
||||||
|
def self.exit_on_failure?
|
||||||
|
true
|
||||||
|
end
|
||||||
|
|
||||||
|
desc 'list', 'list E-mail domain blocks'
|
||||||
|
long_desc <<-LONG_DESC
|
||||||
|
list up all E-mail domain blocks.
|
||||||
|
LONG_DESC
|
||||||
|
def list
|
||||||
|
EmailDomainBlock.where(parent_id: nil).order(id: 'DESC').find_each do |entry|
|
||||||
|
say(entry.domain.to_s, :white)
|
||||||
|
EmailDomainBlock.where(parent_id: entry.id).order(id: 'DESC').find_each do |child|
|
||||||
|
say(" #{child.domain}", :cyan)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
option :with_dns_records, type: :boolean
|
||||||
|
desc 'add [DOMAIN...]', 'add E-mail domain blocks'
|
||||||
|
long_desc <<-LONG_DESC
|
||||||
|
add E-mail domain blocks from a given DOMAIN.
|
||||||
|
|
||||||
|
When the --with-dns-records option is given, An attempt to resolve the
|
||||||
|
given domain's DNS records will be made and the results will also be
|
||||||
|
blacklisted.
|
||||||
|
LONG_DESC
|
||||||
|
def add(*domains)
|
||||||
|
if domains.empty?
|
||||||
|
say('No domain(s) given', :red)
|
||||||
|
exit(1)
|
||||||
|
end
|
||||||
|
|
||||||
|
skipped = 0
|
||||||
|
processed = 0
|
||||||
|
|
||||||
|
domains.each do |domain|
|
||||||
|
if EmailDomainBlock.where(domain: domain).exists?
|
||||||
|
say("#{domain} is already blocked.", :yellow)
|
||||||
|
skipped += 1
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
email_domain_block = EmailDomainBlock.new(domain: domain, with_dns_records: options[:with_dns_records] || false)
|
||||||
|
email_domain_block.save!
|
||||||
|
processed += 1
|
||||||
|
|
||||||
|
next unless email_domain_block.with_dns_records?
|
||||||
|
|
||||||
|
hostnames = []
|
||||||
|
ips = []
|
||||||
|
|
||||||
|
Resolv::DNS.open do |dns|
|
||||||
|
dns.timeouts = 1
|
||||||
|
hostnames = dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
|
||||||
|
|
||||||
|
([email_domain_block.domain] + hostnames).uniq.each do |hostname|
|
||||||
|
ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
|
||||||
|
ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::AAAA).to_a.map { |e| e.address.to_s })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
(hostnames + ips).uniq.each do |hostname|
|
||||||
|
another_email_domain_block = EmailDomainBlock.new(domain: hostname, parent: email_domain_block)
|
||||||
|
if EmailDomainBlock.where(domain: hostname).exists?
|
||||||
|
say("#{hostname} is already blocked.", :yellow)
|
||||||
|
skipped += 1
|
||||||
|
next
|
||||||
|
end
|
||||||
|
another_email_domain_block.save!
|
||||||
|
processed += 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
say("Added #{processed}, skipped #{skipped}", color(processed, 0))
|
||||||
|
end
|
||||||
|
|
||||||
|
desc 'remove [DOMAIN...]', 'remove E-mail domain blocks'
|
||||||
|
def remove(*domains)
|
||||||
|
if domains.empty?
|
||||||
|
say('No domain(s) given', :red)
|
||||||
|
exit(1)
|
||||||
|
end
|
||||||
|
|
||||||
|
skipped = 0
|
||||||
|
processed = 0
|
||||||
|
failed = 0
|
||||||
|
|
||||||
|
domains.each do |domain|
|
||||||
|
entry = EmailDomainBlock.find_by(domain: domain)
|
||||||
|
if entry.nil?
|
||||||
|
say("#{domain} is not yet blocked.", :yellow)
|
||||||
|
skipped += 1
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
children_count = EmailDomainBlock.where(parent_id: entry.id).count
|
||||||
|
|
||||||
|
result = entry.destroy
|
||||||
|
if result
|
||||||
|
processed += 1 + children_count
|
||||||
|
else
|
||||||
|
say("#{domain} was not unblocked. 'destroy' returns false.", :red)
|
||||||
|
failed += 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
say("Removed #{processed}, skipped #{skipped}, failed #{failed}", color(processed, failed))
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def color(processed, failed)
|
||||||
|
if !processed.zero? && failed.zero?
|
||||||
|
:green
|
||||||
|
elsif failed.zero?
|
||||||
|
:yellow
|
||||||
|
else
|
||||||
|
:red
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Reference in New Issue