From b362de2232da2518381df51ceb71166d0693dd6f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 4 Dec 2016 19:07:02 +0100 Subject: Adding configurable e-mail blacklist --- app/lib/email_validator.rb | 18 ++++++++++++++++++ app/models/user.rb | 1 + 2 files changed, 19 insertions(+) create mode 100644 app/lib/email_validator.rb (limited to 'app') diff --git a/app/lib/email_validator.rb b/app/lib/email_validator.rb new file mode 100644 index 000000000..856b8b1f7 --- /dev/null +++ b/app/lib/email_validator.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class EmailValidator < ActiveModel::EachValidator + def validate_each(record, attribute, value) + return if Rails.configuration.x.email_domains_blacklist.empty? + + record.errors.add(attribute, I18n.t('users.invalid_email')) if blocked_email?(value) + end + + private + + def blocked_email?(value) + domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.') + regexp = Regexp.new("@(.+\\.)?(#{domains})", true) + + value =~ regexp + end +end diff --git a/app/models/user.rb b/app/models/user.rb index 423833d47..3fc028a6a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -8,6 +8,7 @@ class User < ApplicationRecord validates :account, presence: true validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?' + validates :email, email: true scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') } scope :recent, -> { order('id desc') } -- cgit