##// END OF EJS Templates
jro_apps » redmine
RSS
remove trailing white-spaces from app/models/auth_source_ldap.rb....
Toshi MARUYAMA -
r6392:66a1504db677
parent child
Show More
Side by Side Unified
Context file:
r6392:66a1504db677 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,16 +1,16
1 # redMine - project management software
2 # Copyright (C) 2006 Jean-Philippe Lang
1 # Redmine - project management software
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 #
8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 #
13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -18,23 +18,23
18 18 require 'net/ldap'
19 19 require 'iconv'
20 20
21 class AuthSourceLdap < AuthSource
21 class AuthSourceLdap < AuthSource
22 22 validates_presence_of :host, :port, :attr_login
23 23 validates_length_of :name, :host, :maximum => 60, :allow_nil => true
24 24 validates_length_of :account, :account_password, :base_dn, :maximum => 255, :allow_nil => true
25 25 validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
26 26 validates_numericality_of :port, :only_integer => true
27
27
28 28 before_validation :strip_ldap_attributes
29
29
30 30 def after_initialize
31 31 self.port = 389 if self.port == 0
32 32 end
33
33
34 34 def authenticate(login, password)
35 35 return nil if login.blank? || password.blank?
36 36 attrs = get_user_dn(login)
37
37
38 38 if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password)
39 39 logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
40 40 return attrs.except(:dn)
@@ -50,19 +50,19 class AuthSourceLdap < AuthSource
50 50 rescue Net::LDAP::LdapError => text
51 51 raise "LdapError: " + text
52 52 end
53
53
54 54 def auth_method_name
55 55 "LDAP"
56 56 end
57
57
58 58 private
59
59
60 60 def strip_ldap_attributes
61 61 [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr|
62 62 write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
63 63 end
64 64 end
65
65
66 66 def initialize_ldap_con(ldap_user, ldap_password)
67 67 options = { :host => self.host,
68 68 :port => self.port,
@@ -102,12 +102,12 class AuthSourceLdap < AuthSource
102 102 # Get the user's dn and any attributes for them, given their login
103 103 def get_user_dn(login)
104 104 ldap_con = initialize_ldap_con(self.account, self.account_password)
105 login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
106 object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
105 login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
106 object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
107 107 attrs = {}
108
109 ldap_con.search( :base => self.base_dn,
110 :filter => object_filter & login_filter,
108
109 ldap_con.search( :base => self.base_dn,
110 :filter => object_filter & login_filter,
111 111 :attributes=> search_attributes) do |entry|
112 112
113 113 if onthefly_register?
@@ -121,7 +121,7 class AuthSourceLdap < AuthSource
121 121
122 122 attrs
123 123 end
124
124
125 125 def self.get_attr(entry, attr_name)
126 126 if !attr_name.blank?
127 127 entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
General Comments 0
You need to be logged in to leave comments. Login now