jro_apps/redmine Commit - r9114:a8e392c0e573

Fixed that LDAP error is not displayed when testing connection....

Jean-Philippe Lang -

r9114:a8e392c0e573

parent child

Context file:

r9114:a8e392c0e573

Collapse all files

app/models/auth_source_ldap.rb +2 -2

             # 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.
             require 'iconv'
             require 'net/ldap'
             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, :filter, :maximum => 255, :allow_blank => true
               validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
               validates_numericality_of :port, :only_integer => true
               validate :validate_filter
               before_validation :strip_ldap_attributes
               def initialize(attributes=nil, *args)
                 super
                 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)
                 end
               rescue  Net::LDAP::LdapError => e
                 raise AuthSourceException.new(e.message)
               end
               # test the connection to the LDAP
               def test_connection
                 ldap_con = initialize_ldap_con(self.account, self.account_password)
                 ldap_con.open { }
-              rescue  Net::LDAP::LdapError => text
+              rescue  Net::LDAP::LdapError => e
-                raise "LdapError: " + text
+                raise "LdapError: " + e.message
               end
               def auth_method_name
                 "LDAP"
               end
               private
               def ldap_filter
                 if filter.present?
                   Net::LDAP::Filter.construct(filter)
                 end
               rescue Net::LDAP::LdapError
                 nil
               end
               def validate_filter
                 if filter.present? && ldap_filter.nil?
                   errors.add(:filter, :invalid)
                 end
               end
               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,
                             :encryption => (self.tls ? :simple_tls : nil)
                           }
                 options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
                 Net::LDAP.new options
               end
               def get_user_attributes_from_ldap_entry(entry)
                 {
                  :dn => entry.dn,
                  :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
                  :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
                  :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
                  :auth_source_id => self.id
                 }
               end
               # Return the attributes needed for the LDAP search.  It will only
               # include the user attributes if on-the-fly registration is enabled
               def search_attributes
                 if onthefly_register?
                   ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]
                 else
                   ['dn']
                 end
               end
               # Check if a DN (user record) authenticates with the password
               def authenticate_dn(dn, password)
                 if dn.present? && password.present?
                   initialize_ldap_con(dn, password).bind
                 end
               end
               # 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", "*" )
                 attrs = {}
                 search_filter = object_filter & login_filter
                 if f = ldap_filter
                   search_filter = search_filter & f
                 end
                 ldap_con.search( :base => self.base_dn,
                                  :filter => search_filter,
                                  :attributes=> search_attributes) do |entry|
                   if onthefly_register?
                     attrs = get_user_attributes_from_ldap_entry(entry)
                   else
                     attrs = {:dn => entry.dn}
                   end
                   logger.debug "DN found for #{login}: #{attrs[:dn]}" if logger && logger.debug?
                 end
                 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]
                 end
               end
             end

test/functional/auth_sources_controller_test.rb +2 -2

             # 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.
             require File.expand_path('../../test_helper', __FILE__)
             class AuthSourcesControllerTest < ActionController::TestCase
               fixtures :users, :auth_sources
               def setup
                 @request.session[:user_id] = 1
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:auth_sources)
               end
               def test_new
                 get :new
                 assert_response :success
                 assert_template 'new'
                 source = assigns(:auth_source)
                 assert_equal AuthSourceLdap, source.class
                 assert source.new_record?
                 assert_tag 'input', :attributes => {:name => 'type', :value => 'AuthSourceLdap'}
                 assert_tag 'input', :attributes => {:name => 'auth_source[host]'}
               end
               def test_create
                 assert_difference 'AuthSourceLdap.count' do
                   post :create, :type => 'AuthSourceLdap', :auth_source => {:name => 'Test', :host => '127.0.0.1', :port => '389', :attr_login => 'cn'}
                   assert_redirected_to '/auth_sources'
                 end
                 source = AuthSourceLdap.first(:order => 'id DESC')
                 assert_equal 'Test', source.name
                 assert_equal '127.0.0.1', source.host
                 assert_equal 389, source.port
                 assert_equal 'cn', source.attr_login
               end
               def test_create_with_failure
                 assert_no_difference 'AuthSourceLdap.count' do
                   post :create, :type => 'AuthSourceLdap', :auth_source => {:name => 'Test', :host => '', :port => '389', :attr_login => 'cn'}
                   assert_response :success
                   assert_template 'new'
                 end
                 assert_error_tag :content => /host can't be blank/i
               end
               def test_edit
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_tag 'input', :attributes => {:name => 'auth_source[host]'}
               end
               def test_update
                 put :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '192.168.0.10', :port => '389', :attr_login => 'uid'}
                 assert_redirected_to '/auth_sources'
                 source = AuthSourceLdap.find(1)
                 assert_equal 'Renamed', source.name
                 assert_equal '192.168.0.10', source.host
               end
               def test_update_with_failure
                 put :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '', :port => '389', :attr_login => 'uid'}
                 assert_response :success
                 assert_template 'edit'
                 assert_error_tag :content => /host can't be blank/i
               end
               def test_destroy
                 assert_difference 'AuthSourceLdap.count', -1 do
                   delete :destroy, :id => 1
                 end
               end
               def test_destroy_auth_source_in_use
                 User.find(2).update_attribute :auth_source_id, 1
                 assert_no_difference 'AuthSourceLdap.count' do
                   delete :destroy, :id => 1
                 end
               end
               def test_test_connection
                 AuthSourceLdap.any_instance.stubs(:test_connection).returns(true)
                 get :test_connection, :id => 1
                 assert_redirected_to '/auth_sources'
                 assert_not_nil flash[:notice]
                 assert_match /successful/i, flash[:notice]
               end
               def test_test_connection_with_failure
-                AuthSourceLdap.any_instance.stubs(:test_connection).raises(Exception.new("Something went wrong"))
+                AuthSourceLdap.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::LdapError.new("Something went wrong"))
                 get :test_connection, :id => 1
                 assert_redirected_to '/auth_sources'
                 assert_not_nil flash[:error]
-                assert_include '(Something went wrong)', flash[:error]
+                assert_include 'Something went wrong', flash[:error]
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages