From 66a1504db677ed8a76d9a1008d6299941ca91efd Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 21 Aug 2011 04:43:55 +0000 Subject: [PATCH] remove trailing white-spaces from app/models/auth_source_ldap.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6512 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/auth_source_ldap.rb | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index 6b23c670c..b7ab0cf30 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -1,16 +1,16 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -18,23 +18,23 @@ require 'net/ldap' require 'iconv' -class AuthSourceLdap < AuthSource +class AuthSourceLdap < AuthSource validates_presence_of :host, :port, :attr_login validates_length_of :name, :host, :maximum => 60, :allow_nil => true validates_length_of :account, :account_password, :base_dn, :maximum => 255, :allow_nil => true validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true validates_numericality_of :port, :only_integer => true - + before_validation :strip_ldap_attributes - + def after_initialize self.port = 389 if self.port == 0 end - + def authenticate(login, password) return nil if login.blank? || password.blank? attrs = get_user_dn(login) - + if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password) logger.debug "Authentication successful for '#{login}'" if logger && logger.debug? return attrs.except(:dn) @@ -50,19 +50,19 @@ class AuthSourceLdap < AuthSource rescue Net::LDAP::LdapError => text raise "LdapError: " + text end - + def auth_method_name "LDAP" end - + private - + def strip_ldap_attributes [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr| write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil? end end - + def initialize_ldap_con(ldap_user, ldap_password) options = { :host => self.host, :port => self.port, @@ -102,12 +102,12 @@ class AuthSourceLdap < AuthSource # Get the user's dn and any attributes for them, given their login def get_user_dn(login) ldap_con = initialize_ldap_con(self.account, self.account_password) - login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) - object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) + login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) + object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) attrs = {} - - ldap_con.search( :base => self.base_dn, - :filter => object_filter & login_filter, + + ldap_con.search( :base => self.base_dn, + :filter => object_filter & login_filter, :attributes=> search_attributes) do |entry| if onthefly_register? @@ -121,7 +121,7 @@ class AuthSourceLdap < AuthSource attrs end - + def self.get_attr(entry, attr_name) if !attr_name.blank? entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] -- 2.39.5