zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #500 from neocities/fileuploadrefactor

Browse source 
whitelist emails capability
This commit is contained in:
Kyle Drake 2024-03-13 16:22:49 -05:00 • committed by GitHub
commit 9dbec11353
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -20,6 +20,7 @@ files/sslsites.zip
.vagrant .vagrant
public/banned_sites public/banned_sites
public/deleted_sites public/deleted_sites
files/disposable_email_whitelist.conf
files/disposable_email_blacklist.conf files/disposable_email_blacklist.conf
files/banned_email_blacklist.conf files/banned_email_blacklist.conf
files/letsencrypt.key files/letsencrypt.key

14
models/site.rb
View file

@ -141,6 +141,7 @@ class Site < Sequel::Model
EMAIL_VALIDATION_CUTOFF_DATE = Time.parse('May 16, 2016') EMAIL_VALIDATION_CUTOFF_DATE = Time.parse('May 16, 2016')
DISPOSABLE_EMAIL_BLACKLIST_PATH = File.join(DIR_ROOT, 'files', 'disposable_email_blacklist.conf') DISPOSABLE_EMAIL_BLACKLIST_PATH = File.join(DIR_ROOT, 'files', 'disposable_email_blacklist.conf')
BANNED_EMAIL_BLACKLIST_PATH = File.join(DIR_ROOT, 'files', 'banned_email_blacklist.conf') BANNED_EMAIL_BLACKLIST_PATH = File.join(DIR_ROOT, 'files', 'banned_email_blacklist.conf')
DISPOSABLE_EMAIL_WHITELIST_PATH = File.join(DIR_ROOT, 'files', 'disposable_email_whitelist.conf')
BLOCK_JERK_PERCENTAGE = 30 BLOCK_JERK_PERCENTAGE = 30
BLOCK_JERK_THRESHOLD = 25 BLOCK_JERK_THRESHOLD = 25
@ -663,6 +664,10 @@ class Site < Sequel::Model
!username.empty? && username.match(/^[a-zA-Z0-9][a-zA-Z0-9_\-]+[a-zA-Z0-9]$/i) !username.empty? && username.match(/^[a-zA-Z0-9][a-zA-Z0-9_\-]+[a-zA-Z0-9]$/i)
end end
def self.disposable_email_domains_whitelist
File.readlines(DISPOSABLE_EMAIL_WHITELIST_PATH).collect {|d| d.strip}
end
def self.disposable_email_domains def self.disposable_email_domains
File.readlines(DISPOSABLE_EMAIL_BLACKLIST_PATH).collect {|d| d.strip} File.readlines(DISPOSABLE_EMAIL_BLACKLIST_PATH).collect {|d| d.strip}
end end
@ -672,6 +677,9 @@ class Site < Sequel::Model
end end
def self.disposable_mx_record?(email) def self.disposable_mx_record?(email)
return false unless File.exist?(DISPOSABLE_EMAIL_BLACKLIST_PATH)
return false unless File.exist?(DISPOSABLE_EMAIL_WHITELIST_PATH)
email_domain = email.match(/@(.+)/).captures.first email_domain = email.match(/@(.+)/).captures.first
begin begin
@ -682,16 +690,22 @@ class Site < Sequel::Model
return false return false
end end
return false if disposable_email_domains_whitelist.include? email_root_domain
return true if disposable_email_domains.include? email_root_domain return true if disposable_email_domains.include? email_root_domain
false false
end end
def self.disposable_email?(email) def self.disposable_email?(email)
return false unless File.exist?(DISPOSABLE_EMAIL_BLACKLIST_PATH) return false unless File.exist?(DISPOSABLE_EMAIL_BLACKLIST_PATH)
return false unless File.exist?(DISPOSABLE_EMAIL_WHITELIST_PATH)
return false if email.blank? return false if email.blank?
email.strip! email.strip!
disposable_email_domains_whitelist.each do |whitelisted_disposable_email_domain|
return false if email.match /@#{whitelisted_disposable_email_domain}$/i
end
disposable_email_domains.each do |disposable_email_domain| disposable_email_domains.each do |disposable_email_domain|
return true if email.match /@#{disposable_email_domain}$/i return true if email.match /@#{disposable_email_domain}$/i
end end