Adding configurable e-mail blacklist
This commit is contained in:
		
							parent
							
								
									41b4be699f
								
							
						
					
					
						commit
						b362de2232
					
				
							
								
								
									
										18
									
								
								app/lib/email_validator.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								app/lib/email_validator.rb
									
									
									
									
									
										Normal file
									
								
							| @ -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 | ||||||
| @ -8,6 +8,7 @@ class User < ApplicationRecord | |||||||
| 
 | 
 | ||||||
|   validates :account, presence: true |   validates :account, presence: true | ||||||
|   validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?' |   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 :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') } |   scope :recent,   -> { order('id desc') } | ||||||
|  | |||||||
							
								
								
									
										5
									
								
								config/initializers/blacklists.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								config/initializers/blacklists.rb
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,5 @@ | |||||||
|  | # frozen_string_literal: true | ||||||
|  | 
 | ||||||
|  | Rails.application.configure do | ||||||
|  |   config.x.email_domains_blacklist = ENV.fetch('EMAIL_DOMAIN_BLACKLIST') { 'mvrht.com' } | ||||||
|  | end | ||||||
| @ -1,3 +1,5 @@ | |||||||
|  | # frozen_string_literal: true | ||||||
|  | 
 | ||||||
| port  = ENV.fetch('PORT') { 3000 } | port  = ENV.fetch('PORT') { 3000 } | ||||||
| host  = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } | host  = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } | ||||||
| https = ENV['LOCAL_HTTPS'] == 'true' | https = ENV['LOCAL_HTTPS'] == 'true' | ||||||
|  | |||||||
| @ -1,3 +1,5 @@ | |||||||
|  | # frozen_string_literal: true | ||||||
|  | 
 | ||||||
| if ENV['S3_ENABLED'] == 'true' | if ENV['S3_ENABLED'] == 'true' | ||||||
|   Aws.eager_autoload!(services: %w(S3)) |   Aws.eager_autoload!(services: %w(S3)) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -55,5 +55,7 @@ en: | |||||||
|   stream_entries: |   stream_entries: | ||||||
|     favourited: favourited a post by |     favourited: favourited a post by | ||||||
|     is_now_following: is now following |     is_now_following: is now following | ||||||
|  |   users: | ||||||
|  |     invalid_email: The e-mail address is invalid | ||||||
|   will_paginate: |   will_paginate: | ||||||
|     page_gap: "…" |     page_gap: "…" | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user