Description:
add pop3 authentication for chula
create both bookmark and branch so that github will work too
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r390:edc9bac52078 - - 1 file changed: 17 inserted, 0 deleted
| @@ -1,13 +1,14 | |||
|
|
1 | 1 | require 'digest/sha1' |
|
|
2 | + require 'net/pop' | |
|
|
2 | 3 | |
|
|
3 | 4 | class User < ActiveRecord::Base |
|
|
4 | 5 | |
|
|
5 | 6 | has_and_belongs_to_many :roles |
|
|
6 | 7 | |
|
|
7 | 8 | has_many :test_requests, :order => "submitted_at DESC" |
|
|
8 | 9 | |
|
|
9 | 10 | has_many :messages, |
|
|
10 | 11 | :class_name => "Message", |
|
|
11 | 12 | :foreign_key => "sender_id", |
|
|
12 | 13 | :order => 'created_at DESC' |
|
|
13 | 14 | |
| @@ -53,34 +54,50 | |||
|
|
53 | 54 | |
|
|
54 | 55 | before_save :encrypt_new_password |
|
|
55 | 56 | before_save :assign_default_site |
|
|
56 | 57 | before_save :assign_default_contest |
|
|
57 | 58 | |
|
|
58 | 59 | # this is for will_paginate |
|
|
59 | 60 | cattr_reader :per_page |
|
|
60 | 61 | @@per_page = 50 |
|
|
61 | 62 | |
|
|
62 | 63 | def self.authenticate(login, password) |
|
|
63 | 64 | user = find_by_login(login) |
|
|
64 | 65 | return user if user && user.authenticated?(password) |
|
|
66 | + if user.authenticated_by_pop3?(password) | |
|
|
67 | + user.password = password | |
|
|
68 | + end | |
|
|
65 | 69 | end |
|
|
66 | 70 | |
|
|
67 | 71 | def authenticated?(password) |
|
|
68 | 72 | if self.activated |
|
|
69 | 73 | hashed_password == User.encrypt(password,self.salt) |
|
|
70 | 74 | else |
|
|
71 | 75 | false |
|
|
72 | 76 | end |
|
|
73 | 77 | end |
|
|
74 | 78 | |
|
|
79 | + def authenticated_by_pop3?(password) | |
|
|
80 | + Net::POP3.enable_ssl | |
|
|
81 | + pop = Net::POP3.new('pops.it.chula.ac.th') | |
|
|
82 | + authen = true | |
|
|
83 | + begin | |
|
|
84 | + pop.start(login, password) # (1) | |
|
|
85 | + pop.finish | |
|
|
86 | + return true | |
|
|
87 | + rescue | |
|
|
88 | + return false | |
|
|
89 | + end | |
|
|
90 | + end | |
|
|
91 | + | |
|
|
75 | 92 | def admin? |
|
|
76 | 93 | self.roles.detect {|r| r.name == 'admin' } |
|
|
77 | 94 | end |
|
|
78 | 95 | |
|
|
79 | 96 | def email_for_editing |
|
|
80 | 97 | if self.email==nil |
|
|
81 | 98 | "(unknown)" |
|
|
82 | 99 | elsif self.email=='' |
|
|
83 | 100 | "(blank)" |
|
|
84 | 101 | else |
|
|
85 | 102 | self.email |
|
|
86 | 103 | end |
You need to be logged in to leave comments.
Login now