user newer-style validation methods, add banned usernames
This commit is contained in:
parent
e727c65f03
commit
68690647ab
|
@ -14,13 +14,19 @@ class User < ActiveRecord::Base
|
||||||
|
|
||||||
has_secure_password
|
has_secure_password
|
||||||
|
|
||||||
validates_format_of :username, :with => /\A[A-Za-z0-9][A-Za-z0-9_-]*\Z/
|
validates :email, :format => { :with => /\A[^@ ]+@[^@ ]+\.[^@ ]+\Z/ },
|
||||||
validates_uniqueness_of :username, :case_sensitive => false
|
:uniqueness => { :case_sensitive => false }
|
||||||
|
|
||||||
validates_format_of :email, :with => /\A[^@ ]+@[^@ ]+\.[^@ ]+\Z/
|
validates :password, :presence => true, :on => :create
|
||||||
validates_uniqueness_of :email, :case_sensitive => false
|
|
||||||
|
|
||||||
validates_presence_of :password, :on => :create
|
validates :username, :format => { :with => /\A[A-Za-z0-9][A-Za-z0-9_-]*\Z/ },
|
||||||
|
:uniqueness => { :case_sensitive => false }
|
||||||
|
|
||||||
|
validates_each :username do |record,attr,value|
|
||||||
|
if BANNED_USERNAMES.include?(value.to_s.downcase)
|
||||||
|
record.errors.add(attr, "is not permitted")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
attr_accessible :username, :email, :password, :password_confirmation,
|
attr_accessible :username, :email, :password, :password_confirmation,
|
||||||
:about, :email_replies, :pushover_replies, :pushover_user_key,
|
:about, :email_replies, :pushover_replies, :pushover_user_key,
|
||||||
|
@ -30,6 +36,9 @@ class User < ActiveRecord::Base
|
||||||
before_save :check_session_token
|
before_save :check_session_token
|
||||||
after_create :create_default_tag_filters, :create_rss_token
|
after_create :create_default_tag_filters, :create_rss_token
|
||||||
|
|
||||||
|
BANNED_USERNAMES = [ "admin", "administrator", "hostmaster", "mailer-daemon",
|
||||||
|
"postmaster", "root", "security", "support", "webmaster", ]
|
||||||
|
|
||||||
def as_json(options = {})
|
def as_json(options = {})
|
||||||
h = super(:only => [
|
h = super(:only => [
|
||||||
:username,
|
:username,
|
||||||
|
|
Loading…
Reference in a new issue