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

proper fix for validation of username length issue

Browse source
This commit is contained in:
Kyle Drake 2017-05-23 13:04:34 -07:00
parent 4b7bd4cdc5
commit f73b6e5a75
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
models/site.rb
View file

@ -138,8 +138,7 @@ class Site < Sequel::Model
BLOCK_JERK_THRESHOLD = 2 BLOCK_JERK_THRESHOLD = 2
MAXIMUM_TAGS = 5 MAXIMUM_TAGS = 5
MAX_USERNAME_LENGTH = 30.freeze MAX_USERNAME_LENGTH = 32.freeze
MAX_USERNAME_LENGTH_CUTOFF = Time.parse('May 23, 2017')
LEGACY_SUPPORTER_PRICES = { LEGACY_SUPPORTER_PRICES = {
plan_one: 1, plan_one: 1,
@ -564,10 +563,6 @@ class Site < Sequel::Model
!username.empty? && username.match(/^[a-zA-Z0-9_\-]+$/i) !username.empty? && username.match(/^[a-zA-Z0-9_\-]+$/i)
end end
def username_too_long?
(new? || (created_at && created_at > MAX_USERNAME_LENGTH_CUTOFF)) && values[:username].length > MAX_USERNAME_LENGTH
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
@ -893,18 +888,14 @@ class Site < Sequel::Model
errors.add :username, 'Usernames can only contain letters, numbers, underscores and hyphens.' errors.add :username, 'Usernames can only contain letters, numbers, underscores and hyphens.'
end end
if username_too_long? if !values[:username].blank?
errors.add :username, "Username length cannot be greater than #{MAX_USERNAME_LENGTH} characters."
end
if new? && !values[:username].nil? && !values[:username].empty?
# TODO regex fails for usernames <= 2 chars, tempfix for now. # TODO regex fails for usernames <= 2 chars, tempfix for now.
if new? && values[:username].nil? || (values[:username].length > 2 && !values[:username].match(VALID_HOSTNAME)) if new? && values[:username].nil? || (values[:username].length > 2 && !values[:username].match(VALID_HOSTNAME))
errors.add :username, 'A valid user/site name is required.' errors.add :username, 'A valid user/site name is required.'
end end
if values[:username].length > 32 if values[:username].length > MAX_USERNAME_LENGTH
errors.add :username, 'User/site name cannot exceed 32 characters.' errors.add :username, "User/site name cannot exceed #{MAX_USERNAME_LENGTH} characters."
end end
end end