jro_apps/redmine Commit - r8924:60741b3e1c02

0

db/migrate/20120301153455_add_auth_sources_filter.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddAuthSourcesFilter < ActiveRecord::Migration
	2	def self.up
	3	add_column :auth_sources, :filter, :string
	4	end
	5
	6	def self.down
	7	remove_column :auth_sources, :filter
	8	end
	9	end

0

app/models/auth_source_ldap.rb +22 -2

             class AuthSourceLdap < AuthSource
               validates_presence_of :host, :port, :attr_login
               validates_length_of :name, :host, :maximum => 60, :allow_nil => true
-              validates_length_of :account, :account_password, :base_dn, :maximum => 255, :allow_nil => true
+              validates_length_of :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
               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?
                 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 => object_filter & login_filter,
+                                 :filter => search_filter,
                                  :attributes=> search_attributes) do |entry|
                   if onthefly_register?

0

app/views/ldap_auth_sources/_form.html.erb +3 0

             <p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
             <%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
+            <p><label for="auth_source_custom_filter"><%=l(:field_ldap_filter)%></label>
+            <%= text_field 'auth_source', 'filter', :size => 60 %></p>
             <p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
             <%= check_box 'auth_source', 'onthefly_register' %></p>
             </div>

0

config/locales/ar.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/bg.yml +1 0

               description_date_range_interval: Изберете диапазон чрез задаване на начална и крайна дати
               description_date_from: Въведете начална дата
               description_date_to: Въведете крайна дата
+              field_ldap_filter: LDAP filter

0

config/locales/bs.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/ca.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/cs.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/da.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/de.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/el.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/en-GB.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/en.yml +1 0

               field_cvs_module: Module
               field_repository_is_default: Main repository
               field_multiple: Multiple values
+              field_ldap_filter: LDAP filter
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

0

config/locales/es.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/et.yml +1 0

               label_export_options: "%{export_format} ekspordi valikud"
               label_completed_versions: "Lõpetatud versioonid"
               error_attachment_too_big: "Seda faili ei saa üles laadida, kuna ületab maksimumsuurust (%{max_size})"
+              field_ldap_filter: LDAP filter

0

config/locales/eu.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/fa.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/fi.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/fr.yml +1 0

               field_commit_logs_encoding: Encodage des messages de commit
               field_repository_is_default: Dépôt principal
               field_multiple: Valeurs multiples
+              field_ldap_filter: Filtre LDAP
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application

0

config/locales/gl.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/he.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/hr.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/hu.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/id.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/it.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/ja.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/ko.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/lt.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/lv.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/mk.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/mn.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/nl.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/no.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/pl.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/pt-BR.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/pt.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/ro.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/ru.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/sk.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/sl.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/sr-YU.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/sr.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/sv.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/th.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/tr.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/uk.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/vi.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

config/locales/zh-TW.yml +1 0

                 zero:  0 問題
                 one:   1 問題
                 other: "%{count} 問題清單"
+              field_ldap_filter: LDAP filter

0

config/locales/zh.yml +1 0

               notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
               text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
               permission_manage_related_issues: Manage related issues
+              field_ldap_filter: LDAP filter

0

test/unit/auth_source_ldap_test.rb +30 0

@@ -18,6 +18,7
18	require File.expand_path('../../test_helper', __FILE__)	18	require File.expand_path('../../test_helper', __FILE__)
19		19
20	class AuthSourceLdapTest < ActiveSupport::TestCase	20	class AuthSourceLdapTest < ActiveSupport::TestCase
		21	include Redmine::I18n
21	fixtures :auth_sources	22	fixtures :auth_sources
22		23
23	def setup	24	def setup
@@ -44,6 +45,18 class AuthSourceLdapTest < ActiveSupport::TestCase
44	assert_equal 389, a.port	45	assert_equal 389, a.port
45	end	46	end
46		47
		48	def test_filter_should_be_validated
		49	set_language_if_valid 'en'
		50
		51	a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :attr_login => 'sn')
		52	a.filter = "(mail=*@redmine.org"
		53	assert !a.valid?
		54	assert_equal "is invalid", a.errors[:filter].to_s
		55
		56	a.filter = "(mail=*@redmine.org)"
		57	assert a.valid?
		58	end
		59
47	if ldap_configured?	60	if ldap_configured?
48	context '#authenticate' do	61	context '#authenticate' do
49	setup do	62	setup do
@@ -83,6 +96,23 class AuthSourceLdapTest < ActiveSupport::TestCase
83	end	96	end
84	end	97	end
85		98
		99	context 'without filter' do
		100	should 'return any user' do
		101	assert @auth.authenticate('example1','123456')
		102	assert @auth.authenticate('edavis', '123456')
		103	end
		104	end
		105
		106	context 'with filter' do
		107	setup do
		108	@auth.filter = "(mail=*@redmine.org)"
		109	end
		110
		111	should 'return user who matches the filter only' do
		112	assert @auth.authenticate('example1','123456')
		113	assert_nil @auth.authenticate('edavis', '123456')
		114	end
		115	end
86	end	116	end
87	else	117	else
88	puts '(Test LDAP server not configured)'	118	puts '(Test LDAP server not configured)'

	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