Description:
fix pop3 authen
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r395:52cd3037bb5e - - 1 file changed: 2 inserted, 1 deleted
@@ -1,163 +1,164 | |||||
|
1 | require 'digest/sha1' |
|
1 | require 'digest/sha1' |
|
2 | require 'net/pop' |
|
2 | require 'net/pop' |
|
3 |
|
3 | ||
|
4 | class User < ActiveRecord::Base |
|
4 | class User < ActiveRecord::Base |
|
5 |
|
5 | ||
|
6 | has_and_belongs_to_many :roles |
|
6 | has_and_belongs_to_many :roles |
|
7 |
|
7 | ||
|
8 | has_many :test_requests, :order => "submitted_at DESC" |
|
8 | has_many :test_requests, :order => "submitted_at DESC" |
|
9 |
|
9 | ||
|
10 | has_many :messages, |
|
10 | has_many :messages, |
|
11 | :class_name => "Message", |
|
11 | :class_name => "Message", |
|
12 | :foreign_key => "sender_id", |
|
12 | :foreign_key => "sender_id", |
|
13 | :order => 'created_at DESC' |
|
13 | :order => 'created_at DESC' |
|
14 |
|
14 | ||
|
15 | has_many :replied_messages, |
|
15 | has_many :replied_messages, |
|
16 | :class_name => "Message", |
|
16 | :class_name => "Message", |
|
17 | :foreign_key => "receiver_id", |
|
17 | :foreign_key => "receiver_id", |
|
18 | :order => 'created_at DESC' |
|
18 | :order => 'created_at DESC' |
|
19 |
|
19 | ||
|
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 && user.authenticated_by_pop3?(password) |
|
67 | user.password = password |
|
67 | user.password = password |
|
|
68 | + user.save | ||
|
68 | return user |
|
69 | return user |
|
69 | end |
|
70 | end |
|
70 | end |
|
71 | end |
|
71 |
|
72 | ||
|
72 | def authenticated?(password) |
|
73 | def authenticated?(password) |
|
73 | if self.activated |
|
74 | if self.activated |
|
74 | hashed_password == User.encrypt(password,self.salt) |
|
75 | hashed_password == User.encrypt(password,self.salt) |
|
75 | else |
|
76 | else |
|
76 | false |
|
77 | false |
|
77 | end |
|
78 | end |
|
78 | end |
|
79 | end |
|
79 |
|
80 | ||
|
80 | def authenticated_by_pop3?(password) |
|
81 | def authenticated_by_pop3?(password) |
|
81 | Net::POP3.enable_ssl |
|
82 | Net::POP3.enable_ssl |
|
82 | pop = Net::POP3.new('pops.it.chula.ac.th') |
|
83 | pop = Net::POP3.new('pops.it.chula.ac.th') |
|
83 | authen = true |
|
84 | authen = true |
|
84 | begin |
|
85 | begin |
|
85 | pop.start(login, password) # (1) |
|
86 | pop.start(login, password) # (1) |
|
86 | pop.finish |
|
87 | pop.finish |
|
87 | return true |
|
88 | return true |
|
88 | rescue |
|
89 | rescue |
|
89 | return false |
|
90 | return false |
|
90 | end |
|
91 | end |
|
91 | end |
|
92 | end |
|
92 |
|
93 | ||
|
93 | def admin? |
|
94 | def admin? |
|
94 | self.roles.detect {|r| r.name == 'admin' } |
|
95 | self.roles.detect {|r| r.name == 'admin' } |
|
95 | end |
|
96 | end |
|
96 |
|
97 | ||
|
97 | def email_for_editing |
|
98 | def email_for_editing |
|
98 | if self.email==nil |
|
99 | if self.email==nil |
|
99 | "(unknown)" |
|
100 | "(unknown)" |
|
100 | elsif self.email=='' |
|
101 | elsif self.email=='' |
|
101 | "(blank)" |
|
102 | "(blank)" |
|
102 | else |
|
103 | else |
|
103 | self.email |
|
104 | self.email |
|
104 | end |
|
105 | end |
|
105 | end |
|
106 | end |
|
106 |
|
107 | ||
|
107 | def email_for_editing=(e) |
|
108 | def email_for_editing=(e) |
|
108 | self.email=e |
|
109 | self.email=e |
|
109 | end |
|
110 | end |
|
110 |
|
111 | ||
|
111 | def alias_for_editing |
|
112 | def alias_for_editing |
|
112 | if self.alias==nil |
|
113 | if self.alias==nil |
|
113 | "(unknown)" |
|
114 | "(unknown)" |
|
114 | elsif self.alias=='' |
|
115 | elsif self.alias=='' |
|
115 | "(blank)" |
|
116 | "(blank)" |
|
116 | else |
|
117 | else |
|
117 | self.alias |
|
118 | self.alias |
|
118 | end |
|
119 | end |
|
119 | end |
|
120 | end |
|
120 |
|
121 | ||
|
121 | def alias_for_editing=(e) |
|
122 | def alias_for_editing=(e) |
|
122 | self.alias=e |
|
123 | self.alias=e |
|
123 | end |
|
124 | end |
|
124 |
|
125 | ||
|
125 | def activation_key |
|
126 | def activation_key |
|
126 | if self.hashed_password==nil |
|
127 | if self.hashed_password==nil |
|
127 | encrypt_new_password |
|
128 | encrypt_new_password |
|
128 | end |
|
129 | end |
|
129 | Digest::SHA1.hexdigest(self.hashed_password)[0..7] |
|
130 | Digest::SHA1.hexdigest(self.hashed_password)[0..7] |
|
130 | end |
|
131 | end |
|
131 |
|
132 | ||
|
132 | def verify_activation_key(key) |
|
133 | def verify_activation_key(key) |
|
133 | key == activation_key |
|
134 | key == activation_key |
|
134 | end |
|
135 | end |
|
135 |
|
136 | ||
|
136 | def self.random_password(length=5) |
|
137 | def self.random_password(length=5) |
|
137 | chars = 'abcdefghjkmnopqrstuvwxyz' |
|
138 | chars = 'abcdefghjkmnopqrstuvwxyz' |
|
138 | password = '' |
|
139 | password = '' |
|
139 | length.times { password << chars[rand(chars.length - 1)] } |
|
140 | length.times { password << chars[rand(chars.length - 1)] } |
|
140 | password |
|
141 | password |
|
141 | end |
|
142 | end |
|
142 |
|
143 | ||
|
143 | def self.find_non_admin_with_prefix(prefix='') |
|
144 | def self.find_non_admin_with_prefix(prefix='') |
|
144 | users = User.find(:all) |
|
145 | users = User.find(:all) |
|
145 | return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 } |
|
146 | return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 } |
|
146 | end |
|
147 | end |
|
147 |
|
148 | ||
|
148 | # Contest information |
|
149 | # Contest information |
|
149 |
|
150 | ||
|
150 | def self.find_users_with_no_contest() |
|
151 | def self.find_users_with_no_contest() |
|
151 | users = User.find(:all) |
|
152 | users = User.find(:all) |
|
152 | return users.find_all { |u| u.contests.length == 0 } |
|
153 | return users.find_all { |u| u.contests.length == 0 } |
|
153 | end |
|
154 | end |
|
154 |
|
155 | ||
|
155 |
|
156 | ||
|
156 | def contest_time_left |
|
157 | def contest_time_left |
|
157 | if GraderConfiguration.contest_mode? |
|
158 | if GraderConfiguration.contest_mode? |
|
158 | return nil if site==nil |
|
159 | return nil if site==nil |
|
159 | return site.time_left |
|
160 | return site.time_left |
|
160 | elsif GraderConfiguration.indv_contest_mode? |
|
161 | elsif GraderConfiguration.indv_contest_mode? |
|
161 | time_limit = GraderConfiguration.contest_time_limit |
|
162 | time_limit = GraderConfiguration.contest_time_limit |
|
162 | if time_limit == nil |
|
163 | if time_limit == nil |
|
163 | return nil |
|
164 | return nil |
You need to be logged in to leave comments.
Login now