##// END OF EJS Templates
LDAP filter changed to text (#20929)....
Jean-Philippe Lang -
r14343:f053c1a5af4a
parent child
Show More
@@ -0,0 +1,9
1 class ChangeAuthSourcesFilterToText < ActiveRecord::Migration
2 def self.up
3 change_column :auth_sources, :filter, :text
4 end
5
6 def self.down
7 change_column :auth_sources, :filter, :string
8 end
9 end
@@ -1,196 +1,196
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2015 Jean-Philippe Lang
2 # Copyright (C) 2006-2015 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 require 'net/ldap'
18 require 'net/ldap'
19 require 'net/ldap/dn'
19 require 'net/ldap/dn'
20 require 'timeout'
20 require 'timeout'
21
21
22 class AuthSourceLdap < AuthSource
22 class AuthSourceLdap < AuthSource
23 validates_presence_of :host, :port, :attr_login
23 validates_presence_of :host, :port, :attr_login
24 validates_length_of :name, :host, :maximum => 60, :allow_nil => true
24 validates_length_of :name, :host, :maximum => 60, :allow_nil => true
25 validates_length_of :account, :account_password, :base_dn, :filter, :maximum => 255, :allow_blank => true
25 validates_length_of :account, :account_password, :base_dn, :maximum => 255, :allow_blank => true
26 validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
26 validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
27 validates_numericality_of :port, :only_integer => true
27 validates_numericality_of :port, :only_integer => true
28 validates_numericality_of :timeout, :only_integer => true, :allow_blank => true
28 validates_numericality_of :timeout, :only_integer => true, :allow_blank => true
29 validate :validate_filter
29 validate :validate_filter
30
30
31 before_validation :strip_ldap_attributes
31 before_validation :strip_ldap_attributes
32
32
33 def initialize(attributes=nil, *args)
33 def initialize(attributes=nil, *args)
34 super
34 super
35 self.port = 389 if self.port == 0
35 self.port = 389 if self.port == 0
36 end
36 end
37
37
38 def authenticate(login, password)
38 def authenticate(login, password)
39 return nil if login.blank? || password.blank?
39 return nil if login.blank? || password.blank?
40
40
41 with_timeout do
41 with_timeout do
42 attrs = get_user_dn(login, password)
42 attrs = get_user_dn(login, password)
43 if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password)
43 if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password)
44 logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
44 logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
45 return attrs.except(:dn)
45 return attrs.except(:dn)
46 end
46 end
47 end
47 end
48 rescue Net::LDAP::LdapError => e
48 rescue Net::LDAP::LdapError => e
49 raise AuthSourceException.new(e.message)
49 raise AuthSourceException.new(e.message)
50 end
50 end
51
51
52 # test the connection to the LDAP
52 # test the connection to the LDAP
53 def test_connection
53 def test_connection
54 with_timeout do
54 with_timeout do
55 ldap_con = initialize_ldap_con(self.account, self.account_password)
55 ldap_con = initialize_ldap_con(self.account, self.account_password)
56 ldap_con.open { }
56 ldap_con.open { }
57 end
57 end
58 rescue Net::LDAP::LdapError => e
58 rescue Net::LDAP::LdapError => e
59 raise AuthSourceException.new(e.message)
59 raise AuthSourceException.new(e.message)
60 end
60 end
61
61
62 def auth_method_name
62 def auth_method_name
63 "LDAP"
63 "LDAP"
64 end
64 end
65
65
66 # Returns true if this source can be searched for users
66 # Returns true if this source can be searched for users
67 def searchable?
67 def searchable?
68 !account.to_s.include?("$login") && %w(login firstname lastname mail).all? {|a| send("attr_#{a}?")}
68 !account.to_s.include?("$login") && %w(login firstname lastname mail).all? {|a| send("attr_#{a}?")}
69 end
69 end
70
70
71 # Searches the source for users and returns an array of results
71 # Searches the source for users and returns an array of results
72 def search(q)
72 def search(q)
73 q = q.to_s.strip
73 q = q.to_s.strip
74 return [] unless searchable? && q.present?
74 return [] unless searchable? && q.present?
75
75
76 results = []
76 results = []
77 search_filter = base_filter & Net::LDAP::Filter.begins(self.attr_login, q)
77 search_filter = base_filter & Net::LDAP::Filter.begins(self.attr_login, q)
78 ldap_con = initialize_ldap_con(self.account, self.account_password)
78 ldap_con = initialize_ldap_con(self.account, self.account_password)
79 ldap_con.search(:base => self.base_dn,
79 ldap_con.search(:base => self.base_dn,
80 :filter => search_filter,
80 :filter => search_filter,
81 :attributes => ['dn', self.attr_login, self.attr_firstname, self.attr_lastname, self.attr_mail],
81 :attributes => ['dn', self.attr_login, self.attr_firstname, self.attr_lastname, self.attr_mail],
82 :size => 10) do |entry|
82 :size => 10) do |entry|
83 attrs = get_user_attributes_from_ldap_entry(entry)
83 attrs = get_user_attributes_from_ldap_entry(entry)
84 attrs[:login] = AuthSourceLdap.get_attr(entry, self.attr_login)
84 attrs[:login] = AuthSourceLdap.get_attr(entry, self.attr_login)
85 results << attrs
85 results << attrs
86 end
86 end
87 results
87 results
88 rescue Net::LDAP::LdapError => e
88 rescue Net::LDAP::LdapError => e
89 raise AuthSourceException.new(e.message)
89 raise AuthSourceException.new(e.message)
90 end
90 end
91
91
92 private
92 private
93
93
94 def with_timeout(&block)
94 def with_timeout(&block)
95 timeout = self.timeout
95 timeout = self.timeout
96 timeout = 20 unless timeout && timeout > 0
96 timeout = 20 unless timeout && timeout > 0
97 Timeout.timeout(timeout) do
97 Timeout.timeout(timeout) do
98 return yield
98 return yield
99 end
99 end
100 rescue Timeout::Error => e
100 rescue Timeout::Error => e
101 raise AuthSourceTimeoutException.new(e.message)
101 raise AuthSourceTimeoutException.new(e.message)
102 end
102 end
103
103
104 def ldap_filter
104 def ldap_filter
105 if filter.present?
105 if filter.present?
106 Net::LDAP::Filter.construct(filter)
106 Net::LDAP::Filter.construct(filter)
107 end
107 end
108 rescue Net::LDAP::LdapError
108 rescue Net::LDAP::LdapError
109 nil
109 nil
110 end
110 end
111
111
112 def base_filter
112 def base_filter
113 filter = Net::LDAP::Filter.eq("objectClass", "*")
113 filter = Net::LDAP::Filter.eq("objectClass", "*")
114 if f = ldap_filter
114 if f = ldap_filter
115 filter = filter & f
115 filter = filter & f
116 end
116 end
117 filter
117 filter
118 end
118 end
119
119
120 def validate_filter
120 def validate_filter
121 if filter.present? && ldap_filter.nil?
121 if filter.present? && ldap_filter.nil?
122 errors.add(:filter, :invalid)
122 errors.add(:filter, :invalid)
123 end
123 end
124 end
124 end
125
125
126 def strip_ldap_attributes
126 def strip_ldap_attributes
127 [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr|
127 [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr|
128 write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
128 write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
129 end
129 end
130 end
130 end
131
131
132 def initialize_ldap_con(ldap_user, ldap_password)
132 def initialize_ldap_con(ldap_user, ldap_password)
133 options = { :host => self.host,
133 options = { :host => self.host,
134 :port => self.port,
134 :port => self.port,
135 :encryption => (self.tls ? :simple_tls : nil)
135 :encryption => (self.tls ? :simple_tls : nil)
136 }
136 }
137 options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
137 options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
138 Net::LDAP.new options
138 Net::LDAP.new options
139 end
139 end
140
140
141 def get_user_attributes_from_ldap_entry(entry)
141 def get_user_attributes_from_ldap_entry(entry)
142 {
142 {
143 :dn => entry.dn,
143 :dn => entry.dn,
144 :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
144 :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
145 :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
145 :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
146 :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
146 :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
147 :auth_source_id => self.id
147 :auth_source_id => self.id
148 }
148 }
149 end
149 end
150
150
151 # Return the attributes needed for the LDAP search. It will only
151 # Return the attributes needed for the LDAP search. It will only
152 # include the user attributes if on-the-fly registration is enabled
152 # include the user attributes if on-the-fly registration is enabled
153 def search_attributes
153 def search_attributes
154 if onthefly_register?
154 if onthefly_register?
155 ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]
155 ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]
156 else
156 else
157 ['dn']
157 ['dn']
158 end
158 end
159 end
159 end
160
160
161 # Check if a DN (user record) authenticates with the password
161 # Check if a DN (user record) authenticates with the password
162 def authenticate_dn(dn, password)
162 def authenticate_dn(dn, password)
163 if dn.present? && password.present?
163 if dn.present? && password.present?
164 initialize_ldap_con(dn, password).bind
164 initialize_ldap_con(dn, password).bind
165 end
165 end
166 end
166 end
167
167
168 # Get the user's dn and any attributes for them, given their login
168 # Get the user's dn and any attributes for them, given their login
169 def get_user_dn(login, password)
169 def get_user_dn(login, password)
170 ldap_con = nil
170 ldap_con = nil
171 if self.account && self.account.include?("$login")
171 if self.account && self.account.include?("$login")
172 ldap_con = initialize_ldap_con(self.account.sub("$login", Net::LDAP::DN.escape(login)), password)
172 ldap_con = initialize_ldap_con(self.account.sub("$login", Net::LDAP::DN.escape(login)), password)
173 else
173 else
174 ldap_con = initialize_ldap_con(self.account, self.account_password)
174 ldap_con = initialize_ldap_con(self.account, self.account_password)
175 end
175 end
176 attrs = {}
176 attrs = {}
177 search_filter = base_filter & Net::LDAP::Filter.eq(self.attr_login, login)
177 search_filter = base_filter & Net::LDAP::Filter.eq(self.attr_login, login)
178 ldap_con.search( :base => self.base_dn,
178 ldap_con.search( :base => self.base_dn,
179 :filter => search_filter,
179 :filter => search_filter,
180 :attributes=> search_attributes) do |entry|
180 :attributes=> search_attributes) do |entry|
181 if onthefly_register?
181 if onthefly_register?
182 attrs = get_user_attributes_from_ldap_entry(entry)
182 attrs = get_user_attributes_from_ldap_entry(entry)
183 else
183 else
184 attrs = {:dn => entry.dn}
184 attrs = {:dn => entry.dn}
185 end
185 end
186 logger.debug "DN found for #{login}: #{attrs[:dn]}" if logger && logger.debug?
186 logger.debug "DN found for #{login}: #{attrs[:dn]}" if logger && logger.debug?
187 end
187 end
188 attrs
188 attrs
189 end
189 end
190
190
191 def self.get_attr(entry, attr_name)
191 def self.get_attr(entry, attr_name)
192 if !attr_name.blank?
192 if !attr_name.blank?
193 entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
193 entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
194 end
194 end
195 end
195 end
196 end
196 end
@@ -1,24 +1,24
1 <%= error_messages_for 'auth_source' %>
1 <%= error_messages_for 'auth_source' %>
2
2
3 <div class="box tabular">
3 <div class="box tabular">
4 <p><%= f.text_field :name, :required => true %></p>
4 <p><%= f.text_field :name, :required => true %></p>
5 <p><%= f.text_field :host, :required => true %></p>
5 <p><%= f.text_field :host, :required => true %></p>
6 <p><%= f.text_field :port, :required => true, :size => 6 %> <%= f.check_box :tls, :no_label => true %> LDAPS</p>
6 <p><%= f.text_field :port, :required => true, :size => 6 %> <%= f.check_box :tls, :no_label => true %> LDAPS</p>
7 <p><%= f.text_field :account %></p>
7 <p><%= f.text_field :account %></p>
8 <p><%= f.password_field :account_password, :label => :field_password,
8 <p><%= f.password_field :account_password, :label => :field_password,
9 :name => 'dummy_password',
9 :name => 'dummy_password',
10 :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
10 :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
11 :onfocus => "this.value=''; this.name='auth_source[account_password]';",
11 :onfocus => "this.value=''; this.name='auth_source[account_password]';",
12 :onchange => "this.name='auth_source[account_password]';" %></p>
12 :onchange => "this.name='auth_source[account_password]';" %></p>
13 <p><%= f.text_field :base_dn, :required => true, :size => 60 %></p>
13 <p><%= f.text_field :base_dn, :required => true, :size => 60 %></p>
14 <p><%= f.text_field :filter, :size => 60, :label => :field_auth_source_ldap_filter %></p>
14 <p><%= f.text_area :filter, :size => 60, :label => :field_auth_source_ldap_filter %></p>
15 <p><%= f.text_field :timeout, :size => 4 %></p>
15 <p><%= f.text_field :timeout, :size => 4 %></p>
16 <p><%= f.check_box :onthefly_register, :label => :field_onthefly %></p>
16 <p><%= f.check_box :onthefly_register, :label => :field_onthefly %></p>
17 </div>
17 </div>
18
18
19 <fieldset class="box tabular"><legend><%=l(:label_attribute_plural)%></legend>
19 <fieldset class="box tabular"><legend><%=l(:label_attribute_plural)%></legend>
20 <p><%= f.text_field :attr_login, :required => true, :size => 20 %></p>
20 <p><%= f.text_field :attr_login, :required => true, :size => 20 %></p>
21 <p><%= f.text_field :attr_firstname, :size => 20 %></p>
21 <p><%= f.text_field :attr_firstname, :size => 20 %></p>
22 <p><%= f.text_field :attr_lastname, :size => 20 %></p>
22 <p><%= f.text_field :attr_lastname, :size => 20 %></p>
23 <p><%= f.text_field :attr_mail, :size => 20 %></p>
23 <p><%= f.text_field :attr_mail, :size => 20 %></p>
24 </fieldset>
24 </fieldset>
General Comments 0
You need to be logged in to leave comments. Login now