cafe-grader-web

Commit r391:ea41c9c1ace4 public

parent | child
Description:
fix authen by pop3 bug
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r391:ea41c9c1ace4 - - 1 file changed: 1 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -20,96 +20,97
20 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
20 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
21
21
22 belongs_to :site
22 belongs_to :site
23 belongs_to :country
23 belongs_to :country
24
24
25 has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
25 has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
26
26
27 scope :activated_users, :conditions => {:activated => true}
27 scope :activated_users, :conditions => {:activated => true}
28
28
29 validates_presence_of :login
29 validates_presence_of :login
30 validates_uniqueness_of :login
30 validates_uniqueness_of :login
31 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
31 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
32 validates_length_of :login, :within => 3..30
32 validates_length_of :login, :within => 3..30
33
33
34 validates_presence_of :full_name
34 validates_presence_of :full_name
35 validates_length_of :full_name, :minimum => 1
35 validates_length_of :full_name, :minimum => 1
36
36
37 validates_presence_of :password, :if => :password_required?
37 validates_presence_of :password, :if => :password_required?
38 validates_length_of :password, :within => 4..20, :if => :password_required?
38 validates_length_of :password, :within => 4..20, :if => :password_required?
39 validates_confirmation_of :password, :if => :password_required?
39 validates_confirmation_of :password, :if => :password_required?
40
40
41 validates_format_of :email,
41 validates_format_of :email,
42 :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
42 :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
43 :if => :email_validation?
43 :if => :email_validation?
44 validate :uniqueness_of_email_from_activated_users,
44 validate :uniqueness_of_email_from_activated_users,
45 :if => :email_validation?
45 :if => :email_validation?
46 validate :enough_time_interval_between_same_email_registrations,
46 validate :enough_time_interval_between_same_email_registrations,
47 :if => :email_validation?
47 :if => :email_validation?
48
48
49 # these are for ytopc
49 # these are for ytopc
50 # disable for now
50 # disable for now
51 #validates_presence_of :province
51 #validates_presence_of :province
52
52
53 attr_accessor :password
53 attr_accessor :password
54
54
55 before_save :encrypt_new_password
55 before_save :encrypt_new_password
56 before_save :assign_default_site
56 before_save :assign_default_site
57 before_save :assign_default_contest
57 before_save :assign_default_contest
58
58
59 # this is for will_paginate
59 # this is for will_paginate
60 cattr_reader :per_page
60 cattr_reader :per_page
61 @@per_page = 50
61 @@per_page = 50
62
62
63 def self.authenticate(login, password)
63 def self.authenticate(login, password)
64 user = find_by_login(login)
64 user = find_by_login(login)
65 return user if user && user.authenticated?(password)
65 return user if user && user.authenticated?(password)
66 if user.authenticated_by_pop3?(password)
66 if user.authenticated_by_pop3?(password)
67 user.password = password
67 user.password = password
68 + return user
68 end
69 end
69 end
70 end
70
71
71 def authenticated?(password)
72 def authenticated?(password)
72 if self.activated
73 if self.activated
73 hashed_password == User.encrypt(password,self.salt)
74 hashed_password == User.encrypt(password,self.salt)
74 else
75 else
75 false
76 false
76 end
77 end
77 end
78 end
78
79
79 def authenticated_by_pop3?(password)
80 def authenticated_by_pop3?(password)
80 Net::POP3.enable_ssl
81 Net::POP3.enable_ssl
81 pop = Net::POP3.new('pops.it.chula.ac.th')
82 pop = Net::POP3.new('pops.it.chula.ac.th')
82 authen = true
83 authen = true
83 begin
84 begin
84 pop.start(login, password) # (1)
85 pop.start(login, password) # (1)
85 pop.finish
86 pop.finish
86 return true
87 return true
87 rescue
88 rescue
88 return false
89 return false
89 end
90 end
90 end
91 end
91
92
92 def admin?
93 def admin?
93 self.roles.detect {|r| r.name == 'admin' }
94 self.roles.detect {|r| r.name == 'admin' }
94 end
95 end
95
96
96 def email_for_editing
97 def email_for_editing
97 if self.email==nil
98 if self.email==nil
98 "(unknown)"
99 "(unknown)"
99 elsif self.email==''
100 elsif self.email==''
100 "(blank)"
101 "(blank)"
101 else
102 else
102 self.email
103 self.email
103 end
104 end
104 end
105 end
105
106
106 def email_for_editing=(e)
107 def email_for_editing=(e)
107 self.email=e
108 self.email=e
108 end
109 end
109
110
110 def alias_for_editing
111 def alias_for_editing
111 if self.alias==nil
112 if self.alias==nil
112 "(unknown)"
113 "(unknown)"
113 elsif self.alias==''
114 elsif self.alias==''
114 "(blank)"
115 "(blank)"
115 else
116 else
You need to be logged in to leave comments. Login now