jro_apps/redmine Commit - r10850:7b8ebb7e3ffc

Auto-populate fields while creating a new user with LDAP (#10286)....

Jean-Philippe Lang -

r10850:7b8ebb7e3ffc

parent child

Context file:

r10850:7b8ebb7e3ffc

Collapse all files

app/controllers/auth_sources_controller.rb +14 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             class AuthSourcesController < ApplicationController
               layout 'admin'
               menu_item :ldap_authentication
               before_filter :require_admin
               before_filter :find_auth_source, :only => [:edit, :update, :test_connection, :destroy]
               def index
                 @auth_source_pages, @auth_sources = paginate AuthSource, :per_page => 25
               end
               def new
                 klass_name = params[:type] || 'AuthSourceLdap'
                 @auth_source = AuthSource.new_subclass_instance(klass_name, params[:auth_source])
                 render_404 unless @auth_source
               end
               def create
                 @auth_source = AuthSource.new_subclass_instance(params[:type], params[:auth_source])
                 if @auth_source.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to auth_sources_path
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 if @auth_source.update_attributes(params[:auth_source])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to auth_sources_path
                 else
                   render :action => 'edit'
                 end
               end
               def test_connection
                 begin
                   @auth_source.test_connection
                   flash[:notice] = l(:notice_successful_connection)
                 rescue Exception => e
                   flash[:error] = l(:error_unable_to_connect, e.message)
                 end
                 redirect_to auth_sources_path
               end
               def destroy
                 unless @auth_source.users.exists?
                   @auth_source.destroy
                   flash[:notice] = l(:notice_successful_delete)
                 end
                 redirect_to auth_sources_path
               end
+              def autocomplete_for_new_user
+                results = AuthSource.search(params[:term])
+                render :json => results.map {|result| {
+                  'value' => result[:login],
+                  'label' => "#{result[:login]} (#{result[:firstname]} #{result[:lastname]})",
+                  'login' => result[:login].to_s,
+                  'firstname' => result[:firstname].to_s,
+                  'lastname' => result[:lastname].to_s,
+                  'mail' => result[:mail].to_s,
+                  'auth_source_id' => result[:auth_source_id].to_s
+                }}
+              end
               private
               def find_auth_source
                 @auth_source = AuthSource.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/auth_source.rb +18 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             # Generic exception for when the AuthSource can not be reached
             # (eg. can not connect to the LDAP)
             class AuthSourceException < Exception; end
             class AuthSourceTimeoutException < AuthSourceException; end
             class AuthSource < ActiveRecord::Base
               include Redmine::SubclassFactory
               include Redmine::Ciphering
               has_many :users
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 60
               def authenticate(login, password)
               end
               def test_connection
               end
               def auth_method_name
                 "Abstract"
               end
               def account_password
                 read_ciphered_attribute(:account_password)
               end
               def account_password=(arg)
                 write_ciphered_attribute(:account_password, arg)
               end
+              def searchable?
+                false
+              end
+              def self.search(q)
+                results = []
+                AuthSource.all.each do |source|
+                  begin
+                    if source.searchable?
+                      results += source.search(q)
+                    end
+                  rescue AuthSourceException => e
+                    logger.error "Error while searching users in #{source.name}: #{e.message}"
+                  end
+                end
+                results
+              end
               def allow_password_changes?
                 self.class.allow_password_changes?
               end
               # Does this auth source backend allow password changes?
               def self.allow_password_changes?
                 false
               end
               # Try to authenticate a user not yet registered against available sources
               def self.authenticate(login, password)
                 AuthSource.where(:onthefly_register => true).all.each do |source|
                   begin
                     logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug?
                     attrs = source.authenticate(login, password)
                   rescue => e
                     logger.error "Error during authentication: #{e.message}"
                     attrs = nil
                   end
                   return attrs if attrs
                 end
                 return nil
               end
             end

app/models/auth_source_ldap.rb +35 -7

             # Redmine - project management software
             # Copyright (C) 2006-2012  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'
             require 'net/ldap/dn'
             require 'timeout'
             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
               validates_numericality_of :timeout, :only_integer => true, :allow_blank => 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?
                 with_timeout do
                   attrs = get_user_dn(login, password)
                   if attrs && attrs[:dn] && authenticate_dn(attrs[:dn], password)
                     logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
                     return attrs.except(:dn)
                   end
                 end
               rescue Net::LDAP::LdapError => e
                 raise AuthSourceException.new(e.message)
               end
               # test the connection to the LDAP
               def test_connection
                 with_timeout do
                   ldap_con = initialize_ldap_con(self.account, self.account_password)
                   ldap_con.open { }
                 end
               rescue Net::LDAP::LdapError => e
                 raise AuthSourceException.new(e.message)
               end
               def auth_method_name
                 "LDAP"
               end
+              # Returns true if this source can be searched for users
+              def searchable?
+                !account.to_s.include?("$login") && %w(login firstname lastname mail).all? {|a| send("attr_#{a}?")}
+              end
+              # Searches the source for users and returns an array of results
+              def search(q)
+                q = q.to_s.strip
+                return [] unless searchable? && q.present?
+                results = []
+                search_filter = base_filter & Net::LDAP::Filter.begins(self.attr_login, q)
+                ldap_con = initialize_ldap_con(self.account, self.account_password)
+                ldap_con.search(:base => self.base_dn,
+                                :filter => search_filter,
+                                :attributes => ['dn', self.attr_login, self.attr_firstname, self.attr_lastname, self.attr_mail],
+                                :size => 10) do |entry|
+                  attrs = get_user_attributes_from_ldap_entry(entry)
+                  attrs[:login] = AuthSourceLdap.get_attr(entry, self.attr_login)
+                  results << attrs
+                end
+                results
+              rescue Net::LDAP::LdapError => e
+                raise AuthSourceException.new(e.message)
+              end
               private
               def with_timeout(&block)
                 timeout = self.timeout
                 timeout = 20 unless timeout && timeout > 0
                 Timeout.timeout(timeout) do
                   return yield
                 end
               rescue Timeout::Error => e
                 raise AuthSourceTimeoutException.new(e.message)
               end
               def ldap_filter
                 if filter.present?
                   Net::LDAP::Filter.construct(filter)
                 end
               rescue Net::LDAP::LdapError
                 nil
               end
+              def base_filter
+                filter = Net::LDAP::Filter.eq("objectClass", "*")
+                if f = ldap_filter
+                  filter = filter & f
+                end
+                filter
+              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, password)
                 ldap_con = nil
                 if self.account && self.account.include?("$login")
                   ldap_con = initialize_ldap_con(self.account.sub("$login", Net::LDAP::DN.escape(login)), password)
                 else
                   ldap_con = initialize_ldap_con(self.account, self.account_password)
                 end
-                login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
-                object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
                 attrs = {}
+                search_filter = base_filter & Net::LDAP::Filter.eq(self.attr_login, login)
-                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

app/views/users/new.html.erb +18 0

@@ -1,12 +1,30
1	<h2><%= link_to l(:label_user_plural), users_path %> » <%=l(:label_user_new)%></h2>	1	<h2><%= link_to l(:label_user_plural), users_path %> » <%=l(:label_user_new)%></h2>
2		2
3	<%= labelled_form_for @user do \|f\| %>	3	<%= labelled_form_for @user do \|f\| %>
4	<%= render :partial => 'form', :locals => { :f => f } %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<% if email_delivery_enabled? %>	5	<% if email_delivery_enabled? %>
6	<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>	6	<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
7	<% end %>	7	<% end %>
8	<p>	8	<p>
9	<%= submit_tag l(:button_create) %>	9	<%= submit_tag l(:button_create) %>
10	<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	10	<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
11	</p>	11	</p>
12	<% end %>	12	<% end %>
		13
		14	<% if @auth_sources.present? && @auth_sources.any?(&:searchable?) %>
		15	<%= javascript_tag do %>
		16	observeAutocompleteField('user_login', '<%= escape_javascript autocomplete_for_new_user_auth_sources_path %>', {
		17	select: function(event, ui) {
		18	$('input#user_firstname').val(ui.item.firstname);
		19	$('input#user_lastname').val(ui.item.lastname);
		20	$('input#user_mail').val(ui.item.mail);
		21	$('select#user_auth_source_id option').each(function(){
		22	if ($(this).attr('value') == ui.item.auth_source_id) {
		23	$(this).attr('selected', true);
		24	$('select#user_auth_source_id').trigger('change');
		25	}
		26	});
		27	}
		28	});
		29	<% end %>
		30	<% end %>

config/routes.rb +3 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             RedmineApp::Application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu', :via => [:get, :post]
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes', :via => :get
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt'
               get '/issues/gantt', :to => 'gantts#show'
               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
               get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
               get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
               match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
               match 'watchers/new', :controller=> 'watchers', :action => 'new', :via => :get
               match 'watchers', :controller=> 'watchers', :action => 'create', :via => :post
               match 'watchers/append', :controller=> 'watchers', :action => 'append', :via => :post
               match 'watchers/destroy', :controller=> 'watchers', :action => 'destroy', :via => :post
               match 'watchers/watch', :controller=> 'watchers', :action => 'watch', :via => :post
               match 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch', :via => :post
               match 'watchers/autocomplete_for_user', :controller=> 'watchers', :action => 'autocomplete_for_user', :via => :get
               resources :projects do
                 member do
                   get 'settings(/:tab)', :action => 'settings', :as => 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
                   collection do
                     get 'autocomplete'
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
                 resources :issues, :only => [:index, :new, :create] do
                   resources :time_entries, :controller => 'timelog' do
                     collection do
                       get 'report'
                     end
                   end
                 end
                 # issue form update
                 match 'issues/new', :controller => 'issues', :action => 'new', :via => [:put, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 get 'versions.:format', :to => 'versions#index'
                 get 'roadmap', :to => 'versions#index', :format => false
                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 resources :issue_categories, :shallow => true
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 resources :repositories, :shallow => true, :except => [:index, :show] do
                   member do
                     match 'committers', :via => [:get, :post]
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show'
                 delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu, :via => [:get, :post]
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               get 'projects/:id/activity', :to => 'activities#index'
               get 'projects/:id/activity.:format', :to => 'activities#index'
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               match 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/, :via => :get
               match 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/, :via => :get
               match 'attachments/download/:id', :controller => 'attachments', :action => 'download', :id => /\d+/, :via => :get
               match 'attachments/thumbnail/:id(/:size)', :controller => 'attachments', :action => 'thumbnail', :id => /\d+/, :via => :get, :size => /\d+/
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
               match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
               match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
               match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
               resources :trackers, :except => :show do
                 collection do
                   match 'fields', :via => [:get, :post]
                 end
               end
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               match 'enumerations/:type', :to => 'enumerations#index', :via => :get
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection', :as => 'try_connection'
                 end
+                collection do
+                  get 'autocomplete_for_new_user'
+                end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post], :as => 'plugin_settings'
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

public/javascripts/application.js +3 -3

             /* Redmine - project management software
                Copyright (C) 2006-2012  Jean-Philippe Lang */
             function checkAll(id, checked) {
               if (checked) {
                 $('#'+id).find('input[type=checkbox]').attr('checked', true);
               } else {
                 $('#'+id).find('input[type=checkbox]').removeAttr('checked');
               }
             }
             function toggleCheckboxesBySelector(selector) {
               var all_checked = true;
               $(selector).each(function(index) {
                 if (!$(this).is(':checked')) { all_checked = false; }
               });
               $(selector).attr('checked', !all_checked)
             }
             function showAndScrollTo(id, focus) {
               $('#'+id).show();
               if (focus!=null) {
                 $('#'+focus).focus();
               }
               $('html, body').animate({scrollTop: $('#'+id).offset().top}, 100);
             }
             function toggleRowGroup(el) {
               var tr = $(el).parents('tr').first();
               var n = tr.next();
               tr.toggleClass('open');
               while (n.length && !n.hasClass('group')) {
                 n.toggle();
                 n = n.next('tr');
               }
             }
             function collapseAllRowGroups(el) {
               var tbody = $(el).parents('tbody').first();
               tbody.children('tr').each(function(index) {
                 if ($(this).hasClass('group')) {
                   $(this).removeClass('open');
                 } else {
                   $(this).hide();
                 }
               });
             }
             function expandAllRowGroups(el) {
               var tbody = $(el).parents('tbody').first();
               tbody.children('tr').each(function(index) {
                 if ($(this).hasClass('group')) {
                   $(this).addClass('open');
                 } else {
                   $(this).show();
                 }
               });
             }
             function toggleAllRowGroups(el) {
               var tr = $(el).parents('tr').first();
               if (tr.hasClass('open')) {
                 collapseAllRowGroups(el);
               } else {
                 expandAllRowGroups(el);
               }
             }
             function toggleFieldset(el) {
               var fieldset = $(el).parents('fieldset').first();
               fieldset.toggleClass('collapsed');
               fieldset.children('div').toggle();
             }
             function hideFieldset(el) {
               var fieldset = $(el).parents('fieldset').first();
               fieldset.toggleClass('collapsed');
               fieldset.children('div').hide();
             }
             function initFilters(){
               $('#add_filter_select').change(function(){
                 addFilter($(this).val(), '', []);
               });
               $('#filters-table td.field input[type=checkbox]').each(function(){
                 toggleFilter($(this).val());
               });
               $('#filters-table td.field input[type=checkbox]').live('click',function(){
                 toggleFilter($(this).val());
               });
               $('#filters-table .toggle-multiselect').live('click',function(){
                 toggleMultiSelect($(this).siblings('select'));
               });
               $('#filters-table input[type=text]').live('keypress', function(e){
                 if (e.keyCode == 13) submit_query_form("query_form");
               });
             }
             function addFilter(field, operator, values) {
               var fieldId = field.replace('.', '_');
               var tr = $('#tr_'+fieldId);
               if (tr.length > 0) {
                 tr.show();
               } else {
                 buildFilterRow(field, operator, values);
               }
               $('#cb_'+fieldId).attr('checked', true);
               toggleFilter(field);
               $('#add_filter_select').val('').children('option').each(function(){
                 if ($(this).attr('value') == field) {
                   $(this).attr('disabled', true);
                 }
               });
             }
             function buildFilterRow(field, operator, values) {
               var fieldId = field.replace('.', '_');
               var filterTable = $("#filters-table");
               var filterOptions = availableFilters[field];
               var operators = operatorByType[filterOptions['type']];
               var filterValues = filterOptions['values'];
               var i, select;
               var tr = $('<tr class="filter">').attr('id', 'tr_'+fieldId).html(
                 '<td class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></td>' +
                 '<td class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></td>' +
                 '<td class="values"></td>'
               );
               filterTable.append(tr);
               select = tr.find('td.operator select');
               for (i=0;i<operators.length;i++){
                 var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
                 if (operators[i] == operator) {option.attr('selected', true)};
                 select.append(option);
               }
               select.change(function(){toggleOperator(field)});
               switch (filterOptions['type']){
               case "list":
               case "list_optional":
               case "list_status":
               case "list_subprojects":
                 tr.find('td.values').append(
                   '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
                   ' <span class="toggle-multiselect">&nbsp;</span></span>'
                 );
                 select = tr.find('td.values select');
                 if (values.length > 1) {select.attr('multiple', true)};
                 for (i=0;i<filterValues.length;i++){
                   var filterValue = filterValues[i];
                   var option = $('<option>');
                   if ($.isArray(filterValue)) {
                     option.val(filterValue[1]).text(filterValue[0]);
                     if ($.inArray(filterValue[1], values) > -1) {option.attr('selected', true);}
                   } else {
                     option.val(filterValue).text(filterValue);
                     if ($.inArray(filterValue, values) > -1) {option.attr('selected', true);}
                   }
                   select.append(option);
                 }
                 break;
               case "date":
               case "date_past":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" /></span>' +
                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" /></span>' +
                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" /> '+labelDayPlural+'</span>'
                 );
                 $('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions);
                 $('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions);
                 $('#values_'+fieldId).val(values[0]);
                 break;
               case "string":
               case "text":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="30" class="value" /></span>'
                 );
                 $('#values_'+fieldId).val(values[0]);
                 break;
               case "relation":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="6" class="value" /></span>' +
                   '<span style="display:none;"><select class="value" name="v['+field+'][]" id="values_'+fieldId+'_1"></select></span>'
                 );
                 $('#values_'+fieldId).val(values[0]);
                 select = tr.find('td.values select');
                 for (i=0;i<allProjects.length;i++){
                   var filterValue = allProjects[i];
                   var option = $('<option>');
                   option.val(filterValue[1]).text(filterValue[0]);
                   if (values[0] == filterValue[1]) {option.attr('selected', true)};
                   select.append(option);
                 }
               case "integer":
               case "float":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="6" class="value" /></span>' +
                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="6" class="value" /></span>'
                 );
                 $('#values_'+fieldId+'_1').val(values[0]);
                 $('#values_'+fieldId+'_2').val(values[1]);
                 break;
               }
             }
             function toggleFilter(field) {
               var fieldId = field.replace('.', '_');
               if ($('#cb_' + fieldId).is(':checked')) {
                 $("#operators_" + fieldId).show().removeAttr('disabled');
                 toggleOperator(field);
               } else {
                 $("#operators_" + fieldId).hide().attr('disabled', true);
                 enableValues(field, []);
               }
             }
             function enableValues(field, indexes) {
               var fieldId = field.replace('.', '_');
               $('#tr_'+fieldId+' td.values .value').each(function(index) {
                 if ($.inArray(index, indexes) >= 0) {
                   $(this).removeAttr('disabled');
                   $(this).parents('span').first().show();
                 } else {
                   $(this).val('');
                   $(this).attr('disabled', true);
                   $(this).parents('span').first().hide();
                 }
                 if ($(this).hasClass('group')) {
                   $(this).addClass('open');
                 } else {
                   $(this).show();
                 }
               });
             }
             function toggleOperator(field) {
               var fieldId = field.replace('.', '_');
               var operator = $("#operators_" + fieldId);
               switch (operator.val()) {
                 case "!*":
                 case "*":
                 case "t":
                 case "ld":
                 case "w":
                 case "lw":
                 case "l2w":
                 case "m":
                 case "lm":
                 case "y":
                 case "o":
                 case "c":
                   enableValues(field, []);
                   break;
                 case "><":
                   enableValues(field, [0,1]);
                   break;
                 case "<t+":
                 case ">t+":
                 case "><t+":
                 case "t+":
                 case ">t-":
                 case "<t-":
                 case "><t-":
                 case "t-":
                   enableValues(field, [2]);
                   break;
                 case "=p":
                 case "=!p":
                 case "!p":
                   enableValues(field, [1]);
                   break;
                 default:
                   enableValues(field, [0]);
                   break;
               }
             }
             function toggleMultiSelect(el) {
               if (el.attr('multiple')) {
                 el.removeAttr('multiple');
               } else {
                 el.attr('multiple', true);
               }
             }
             function submit_query_form(id) {
               selectAllOptions("selected_columns");
               $('#'+id).submit();
             }
             function showTab(name) {
               $('div#content .tab-content').hide();
               $('div.tabs a').removeClass('selected');
               $('#tab-content-' + name).show();
               $('#tab-' + name).addClass('selected');
               return false;
             }
             function moveTabRight(el) {
               var lis = $(el).parents('div.tabs').first().find('ul').children();
               var tabsWidth = 0;
               var i = 0;
               lis.each(function(){
                 if ($(this).is(':visible')) {
                   tabsWidth += $(this).width() + 6;
                 }
               });
               if (tabsWidth < $(el).parents('div.tabs').first().width() - 60) { return; }
               while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
               lis.eq(i).hide();
             }
             function moveTabLeft(el) {
               var lis = $(el).parents('div.tabs').first().find('ul').children();
               var i = 0;
               while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
               if (i>0) {
                 lis.eq(i-1).show();
               }
             }
             function displayTabsButtons() {
               var lis;
               var tabsWidth = 0;
               var el;
               $('div.tabs').each(function() {
                 el = $(this);
                 lis = el.find('ul').children();
                 lis.each(function(){
                   if ($(this).is(':visible')) {
                     tabsWidth += $(this).width() + 6;
                   }
                 });
                 if ((tabsWidth < el.width() - 60) && (lis.first().is(':visible'))) {
                   el.find('div.tabs-buttons').hide();
                 } else {
                   el.find('div.tabs-buttons').show();
                 }
               });
             }
             function setPredecessorFieldsVisibility() {
               var relationType = $('#relation_relation_type');
               if (relationType.val() == "precedes" || relationType.val() == "follows") {
                 $('#predecessor_fields').show();
               } else {
                 $('#predecessor_fields').hide();
               }
             }
             function showModal(id, width) {
               var el = $('#'+id).first();
               if (el.length == 0 || el.is(':visible')) {return;}
               var title = el.find('h3.title').text();
               el.dialog({
                 width: width,
                 modal: true,
                 resizable: false,
                 dialogClass: 'modal',
                 title: title
               });
               el.find("input[type=text], input[type=submit]").first().focus();
             }
             function hideModal(el) {
               var modal;
               if (el) {
                 modal = $(el).parents('.ui-dialog-content');
               } else {
                 modal = $('#ajax-modal');
               }
               modal.dialog("close");
             }
             function submitPreview(url, form, target) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#'+form).serialize(),
                 success: function(data){
                   $('#'+target).html(data);
                 }
               });
             }
             function collapseScmEntry(id) {
               $('.'+id).each(function() {
                 if ($(this).hasClass('open')) {
                   collapseScmEntry($(this).attr('id'));
                 }
                 $(this).hide();
               });
               $('#'+id).removeClass('open');
             }
             function expandScmEntry(id) {
               $('.'+id).each(function() {
                 $(this).show();
                 if ($(this).hasClass('loaded') && !$(this).hasClass('collapsed')) {
                   expandScmEntry($(this).attr('id'));
                 }
               });
               $('#'+id).addClass('open');
             }
             function scmEntryClick(id, url) {
                 el = $('#'+id);
                 if (el.hasClass('open')) {
                     collapseScmEntry(id);
                     el.addClass('collapsed');
                     return false;
                 } else if (el.hasClass('loaded')) {
                     expandScmEntry(id);
                     el.removeClass('collapsed');
                     return false;
                 }
                 if (el.hasClass('loading')) {
                     return false;
                 }
                 el.addClass('loading');
                 $.ajax({
                   url: url,
                   success: function(data){
                     el.after(data);
                     el.addClass('open').addClass('loaded').removeClass('loading');
                   }
                 });
                 return true;
             }
             function randomKey(size) {
               var chars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
               var key = '';
               for (i = 0; i < size; i++) {
                 key += chars[Math.floor(Math.random() * chars.length)];
               }
               return key;
             }
             // Can't use Rails' remote select because we need the form data
             function updateIssueFrom(url) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#issue-form').serialize()
               });
             }
             function updateBulkEditFrom(url) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#bulk_edit_form').serialize()
               });
             }
-            function observeAutocompleteField(fieldId, url) {
+            function observeAutocompleteField(fieldId, url, options) {
               $(document).ready(function() {
-                $('#'+fieldId).autocomplete({
+                $('#'+fieldId).autocomplete($.extend({
                   source: url,
                   minLength: 2
-                });
+                }, options));
               });
             }
             function observeSearchfield(fieldId, targetId, url) {
               $('#'+fieldId).each(function() {
                 var $this = $(this);
                 $this.attr('data-value-was', $this.val());
                 var check = function() {
                   var val = $this.val();
                   if ($this.attr('data-value-was') != val){
                     $this.attr('data-value-was', val);
                     $.ajax({
                       url: url,
                       type: 'get',
                       data: {q: $this.val()},
                       success: function(data){ $('#'+targetId).html(data); },
                       beforeSend: function(){ $this.addClass('ajax-loading'); },
                       complete: function(){ $this.removeClass('ajax-loading'); }
                     });
                   }
                 };
                 var reset = function() {
                   if (timer) {
                     clearInterval(timer);
                     timer = setInterval(check, 300);
                   }
                 };
                 var timer = setInterval(check, 300);
                 $this.bind('keyup click mousemove', reset);
               });
             }
             function observeProjectModules() {
               var f = function() {
                 /* Hides trackers and issues custom fields on the new project form when issue_tracking module is disabled */
                 if ($('#project_enabled_module_names_issue_tracking').attr('checked')) {
                   $('#project_trackers').show();
                 }else{
                   $('#project_trackers').hide();
                 }
               };
               $(window).load(f);
               $('#project_enabled_module_names_issue_tracking').change(f);
             }
             function initMyPageSortable(list, url) {
               $('#list-'+list).sortable({
                 connectWith: '.block-receiver',
                 tolerance: 'pointer',
                 update: function(){
                   $.ajax({
                     url: url,
                     type: 'post',
                     data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
                   });
                 }
               });
               $("#list-top, #list-left, #list-right").disableSelection();
             }
             var warnLeavingUnsavedMessage;
             function warnLeavingUnsaved(message) {
               warnLeavingUnsavedMessage = message;
               $('form').submit(function(){
                 $('textarea').removeData('changed');
               });
               $('textarea').change(function(){
                 $(this).data('changed', 'changed');
               });
               window.onbeforeunload = function(){
                 var warn = false;
                 $('textarea').blur().each(function(){
                   if ($(this).data('changed')) {
                     warn = true;
                   }
                 });
                 if (warn) {return warnLeavingUnsavedMessage;}
               };
             };
             function setupAjaxIndicator() {
               $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
                 if ($('.ajax-loading').length == 0 && settings.contentType != 'application/octet-stream') {
                   $('#ajax-indicator').show();
                 }
               });
               $('#ajax-indicator').bind('ajaxStop', function() {
                 $('#ajax-indicator').hide();
               });
             }
             function hideOnLoad() {
               $('.hol').hide();
             }
             function addFormObserversForDoubleSubmit() {
               $('form[method=post]').each(function() {
                 if (!$(this).hasClass('multiple-submit')) {
                   $(this).submit(function(form_submission) {
                     if ($(form_submission.target).attr('data-submitted')) {
                       form_submission.preventDefault();
                     } else {
                       $(form_submission.target).attr('data-submitted', true);
                     }
                   });
                 }
               });
             }
             function blockEventPropagation(event) {
               event.stopPropagation();
               event.preventDefault();
             }
             $(document).ready(setupAjaxIndicator);
             $(document).ready(hideOnLoad);
             $(document).ready(addFormObserversForDoubleSubmit);

test/functional/auth_sources_controller_test.rb +16 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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_select 'form#auth_source_form' do
                   assert_select 'input[name=type][value=AuthSourceLdap]'
                   assert_select 'input[name=?]', 'auth_source[host]'
                 end
               end
               def test_new_with_invalid_type_should_respond_with_404
                 get :new, :type => 'foo'
                 assert_response 404
               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.order('id DESC').first
                 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&#x27;t be blank/i
               end
               def test_edit
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_select 'form#auth_source_form' do
                   assert_select 'input[name=?]', 'auth_source[host]'
                 end
               end
               def test_edit_should_not_contain_password
                 AuthSource.find(1).update_column :account_password, 'secret'
                 get :edit, :id => 1
                 assert_response :success
                 assert_select 'input[value=secret]', 0
                 assert_select 'input[name=dummy_password][value=?]', /x+/
               end
               def test_edit_invalid_should_respond_with_404
                 get :edit, :id => 99
                 assert_response 404
               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&#x27;t be blank/i
               end
               def test_destroy
                 assert_difference 'AuthSourceLdap.count', -1 do
                   delete :destroy, :id => 1
                   assert_redirected_to '/auth_sources'
                 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
                   assert_redirected_to '/auth_sources'
                 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(: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]
               end
+              def test_autocomplete_for_new_user
+                AuthSource.expects(:search).with('foo').returns([
+                  {:login => 'foo1', :firstname => 'John', :lastname => 'Smith', :mail => 'foo1@example.net', :auth_source_id => 1},
+                  {:login => 'Smith', :firstname => 'John', :lastname => 'Doe', :mail => 'foo2@example.net', :auth_source_id => 1}
+                ])
+                get :autocomplete_for_new_user, :term => 'foo'
+                assert_response :success
+                assert_equal 'application/json', response.content_type
+                json = ActiveSupport::JSON.decode(response.body)
+                assert_kind_of Array, json
+                assert_equal 2, json.size
+                assert_equal 'foo1', json.first['value']
+                assert_equal 'foo1 (John Smith)', json.first['label']
+              end
             end

test/integration/routing/auth_sources_test.rb +4 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 RoutingAuthSourcesTest < ActionController::IntegrationTest
               def test_auth_sources
                 assert_routing(
                     { :method => 'get', :path => "/auth_sources" },
                     { :controller => 'auth_sources', :action => 'index' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/auth_sources/new" },
                     { :controller => 'auth_sources', :action => 'new' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/auth_sources" },
                     { :controller => 'auth_sources', :action => 'create' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/auth_sources/1234/edit" },
                     { :controller => 'auth_sources', :action => 'edit',
                       :id => '1234' }
                   )
                 assert_routing(
                     { :method => 'put', :path => "/auth_sources/1234" },
                     { :controller => 'auth_sources', :action => 'update',
                       :id => '1234' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/auth_sources/1234" },
                     { :controller => 'auth_sources', :action => 'destroy',
                       :id => '1234' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/auth_sources/1234/test_connection" },
                     { :controller => 'auth_sources', :action => 'test_connection',
                       :id => '1234' }
                   )
+                assert_routing(
+                    { :method => 'get', :path => "/auth_sources/autocomplete_for_new_user" },
+                    { :controller => 'auth_sources', :action => 'autocomplete_for_new_user' }
+                  )
               end
             end

test/unit/auth_source_ldap_test.rb +24 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 AuthSourceLdapTest < ActiveSupport::TestCase
               include Redmine::I18n
               fixtures :auth_sources
               def setup
               end
               def test_create
                 a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :base_dn => 'dc=example,dc=net', :attr_login => 'sAMAccountName')
                 assert a.save
               end
               def test_should_strip_ldap_attributes
                 a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :base_dn => 'dc=example,dc=net', :attr_login => 'sAMAccountName',
                                        :attr_firstname => 'givenName ')
                 assert a.save
                 assert_equal 'givenName', a.reload.attr_firstname
               end
               def test_replace_port_zero_to_389
                 a = AuthSourceLdap.new(
                        :name => 'My LDAP', :host => 'ldap.example.net', :port => 0,
                        :base_dn => 'dc=example,dc=net', :attr_login => 'sAMAccountName',
                        :attr_firstname => 'givenName ')
                 assert a.save
                 assert_equal 389, a.port
               end
               def test_filter_should_be_validated
                 set_language_if_valid 'en'
                 a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :attr_login => 'sn')
                 a.filter = "(mail=*@redmine.org"
                 assert !a.valid?
                 assert_include "LDAP filter is invalid", a.errors.full_messages
                 a.filter = "(mail=*@redmine.org)"
                 assert a.valid?
               end
               if ldap_configured?
                 context '#authenticate' do
                   setup do
                     @auth = AuthSourceLdap.find(1)
                     @auth.update_attribute :onthefly_register, true
                   end
                   context 'with a valid LDAP user' do
                     should 'return the user attributes' do
                       attributes =  @auth.authenticate('example1','123456')
                       assert attributes.is_a?(Hash), "An hash was not returned"
                       assert_equal 'Example', attributes[:firstname]
                       assert_equal 'One', attributes[:lastname]
                       assert_equal 'example1@redmine.org', attributes[:mail]
                       assert_equal @auth.id, attributes[:auth_source_id]
                       attributes.keys.each do |attribute|
                         assert User.new.respond_to?("#{attribute}="), "Unexpected :#{attribute} attribute returned"
                       end
                     end
                   end
                   context 'with an invalid LDAP user' do
                     should 'return nil' do
                       assert_equal nil, @auth.authenticate('nouser','123456')
                     end
                   end
                   context 'without a login' do
                     should 'return nil' do
                       assert_equal nil, @auth.authenticate('','123456')
                     end
                   end
                   context 'without a password' do
                     should 'return nil' do
                       assert_equal nil, @auth.authenticate('edavis','')
                     end
                   end
                   context 'without filter' do
                     should 'return any user' do
                       assert @auth.authenticate('example1','123456')
                       assert @auth.authenticate('edavis', '123456')
                     end
                   end
                   context 'with filter' do
                     setup do
                       @auth.filter = "(mail=*@redmine.org)"
                     end
                     should 'return user who matches the filter only' do
                       assert @auth.authenticate('example1','123456')
                       assert_nil @auth.authenticate('edavis', '123456')
                     end
                   end
                 end
                 def test_authenticate_should_timeout
                   auth_source = AuthSourceLdap.find(1)
                   auth_source.timeout = 1
                   def auth_source.initialize_ldap_con(*args); sleep(5); end
                   assert_raise AuthSourceTimeoutException do
                     auth_source.authenticate 'example1', '123456'
                   end
                 end
+                def test_search_should_return_matching_entries
+                  results = AuthSource.search("exa")
+                  assert_equal 1, results.size
+                  result = results.first
+                  assert_kind_of Hash, result
+                  assert_equal "example1", result[:login]
+                  assert_equal "Example", result[:firstname]
+                  assert_equal "One", result[:lastname]
+                  assert_equal "example1@redmine.org", result[:mail]
+                  assert_equal 1, result[:auth_source_id]
+                end
+                def test_search_with_no_match_should_return_an_empty_array
+                  results = AuthSource.search("wro")
+                  assert_equal [], results
+                end
+                def test_search_with_exception_should_return_an_empty_array
+                  Net::LDAP.stubs(:new).raises(Net::LDAP::LdapError, 'Cannot connect')
+                  results = AuthSource.search("exa")
+                  assert_equal [], results
+                end
               else
                 puts '(Test LDAP server not configured)'
               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