jro_apps/redmine Commit - r14704:667071917e82

Fixed that LDAP does not check the user and password when are defined in the method of authentication (#21674)....

Jean-Philippe Lang -

r14704:667071917e82

parent child

Context file:

r14704:667071917e82

Expand all files

app/models/auth_source_ldap.rb +6 -1

                 raise AuthSourceException.new(e.message)
               end
-              # test the connection to the LDAP
+              # 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 { }
+                  if self.account.present? && self.account_password.present?
+                    ldap_auth = authenticate_dn(self.account, self.account_password)
+                    raise AuthSourceException.new(l(:error_ldap_bind_credentials)) if !ldap_auth
+                  end
                 end
               rescue *NETWORK_EXCEPTIONS => e
                 raise AuthSourceException.new(e.message)

config/locales/ar.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/az.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/bg.yml +1 0

               description_date_from: Въведете начална дата
               description_date_to: Въведете крайна дата
               text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/bs.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/ca.yml +1 0

               error_unable_delete_issue_status: "No s'ha pogut suprimir l'estat de l'assumpte"
               error_unable_to_connect: "No s'ha pogut connectar (%{value})"
               warning_attachments_not_saved: "No s'han pogut desar %{count} fitxers."
+              error_ldap_bind_credentials: "Compte/Contrasenya LDAP incorrecte"
               mail_subject_lost_password: "Contrasenya de %{value}"
               mail_body_lost_password: "Per a canviar la contrasenya, feu clic en l'enllaç següent:"

config/locales/cs.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/da.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/de.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Standardwerte für neue Benutzer
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/el.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

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

               setting_attachment_extensions_allowed: Allowed extensions
               setting_attachment_extensions_denied: Disallowed extensions
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/en.yml +1 0

               error_invalid_csv_file_or_settings: "The file is not a CSV file or does not match the settings below"
               error_can_not_read_import_file: "An error occurred while reading the file to import"
               error_attachment_extension_not_allowed: "Attachment extension %{extension} is not allowed"
+              error_ldap_bind_credentials: "Invalid LDAP Account/Password"
               mail_subject_lost_password: "Your %{value} password"
               mail_body_lost_password: 'To change your password, click on the following link:'

config/locales/es-PA.yml +2 -1

               error_scm_annotate_big_text_file: "La entrada no puede anotarse, al superar el tamaño máximo para archivos de texto."
               error_scm_command_failed: "Se produjo un error al acceder al repositorio: %{value}"
               error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
+              error_ldap_bind_credentials: "Cuenta/Contraseña LDAP incorrecta"
               field_account: Cuenta
               field_activity: Actividad
               field_admin: Administrador
               label_subtask_plural: Subtareas
               label_project_copy_notifications: Enviar notificaciones por correo electrónico durante la copia del proyecto
               error_can_not_delete_custom_field: Fue imposible eliminar el campo personalizado
-              error_unable_to_connect: Fue imposible conectar con (%{value})
+              error_unable_to_connect: Fue imposible conectarse (%{value})
               error_can_not_remove_role: Este rol está en uso y no puede ser eliminado.
               error_can_not_delete_tracker: Este tipo contiene incidencias y no puede ser eliminado.
               field_principal: Principal

config/locales/es.yml +2 -1

               error_scm_annotate_big_text_file: "La entrada no puede anotarse, al superar el tamaño máximo para ficheros de texto."
               error_scm_command_failed: "Se produjo un error al acceder al repositorio: %{value}"
               error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
+              error_ldap_bind_credentials: Cuenta/Contraseña LDAP incorrecta
               field_account: Cuenta
               field_activity: Actividad
               field_admin: Administrador
               label_subtask_plural: Subtareas
               label_project_copy_notifications: Enviar notificaciones por correo electrónico durante la copia del proyecto
               error_can_not_delete_custom_field: Fue imposible eliminar el campo personalizado
-              error_unable_to_connect: Fue imposible conectar con (%{value})
+              error_unable_to_connect: Fue imposible conectarse (%{value})
               error_can_not_remove_role: Este rol está en uso y no puede ser eliminado.
               error_can_not_delete_tracker: Este tipo contiene peticiones y no puede ser eliminado.
               field_principal: Principal

config/locales/et.yml +1 0

               label_any_open_issues: "Kõik avatud teemad"
               label_no_open_issues: "Mitte ühtki avatud teemat"
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/eu.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/fa.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/fi.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/fr.yml +1 0

               error_invalid_csv_file_or_settings: "Le fichier n'est pas un fichier CSV ou n'est pas conforme aux paramètres sélectionnés"
               error_can_not_read_import_file: "Une erreur est survenue lors de la lecture du fichier à importer"
               error_attachment_extension_not_allowed: "L'extension %{extension} n'est pas autorisée"
+              error_ldap_bind_credentials: "Identifiant ou mot de passe LDAP incorrect"
               mail_subject_lost_password: "Votre mot de passe %{value}"
               mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'

config/locales/gl.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/he.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/hr.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/hu.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/id.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/it.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/ja.yml +1 0

               label_any_open_issues: 未完了のチケット
               label_no_open_issues: なし または完了したチケット
               label_default_values_for_new_users: 新しいユーザーのデフォルト設定
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/ko.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/lt.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/lv.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/mk.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/mn.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/nl.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/no.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/pl.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

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

               error_issue_not_found_in_project: 'A tarefa não foi encontrada ou não pertence a este projeto'
               error_no_tracker_in_project: 'Não há um tipo de tarefa associado a este projeto. Favor verificar as configurações do projeto.'
               error_no_default_issue_status: 'A situação padrão para tarefa não está definida. Favor verificar sua configuração (Vá em "Administração -> Situação da tarefa").'
+              error_ldap_bind_credentials: "Conta/Palavra-chave do LDAP não é válida"
               mail_subject_lost_password: "Sua senha do %{value}."
               mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'

config/locales/pt.yml +1 0

               error_scm_command_failed: "Ocorreu um erro ao tentar aceder ao repositório: %{value}"
               error_scm_annotate: "A entrada não existe ou não pode ser anotada."
               error_issue_not_found_in_project: 'A tarefa não foi encontrada ou não pertence a este projeto.'
+              error_ldap_bind_credentials: "Conta/Palavra-chave do LDAP não é válida"
               mail_subject_lost_password: "Palavra-chave de %{value}"
               mail_body_lost_password: 'Para mudar a sua palavra-chave, clique na ligação abaixo:'

config/locales/ro.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/ru.yml +1 0

               label_any_open_issues: любые открытые задачи
               label_no_open_issues: нет открытых задач
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/sk.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/sl.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/sq.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

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

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/sr.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/sv.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/th.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/tr.yml +1 0

               label_any_open_issues: herhangi bir açık iş
               label_no_open_issues: hiçbir açık iş
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/uk.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/vi.yml +1 0

               label_any_open_issues: any open issues
               label_no_open_issues: no open issues
               label_default_values_for_new_users: Default values for new users
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

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

               description_date_from: 輸入起始日期
               description_date_to: 輸入結束日期
               text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

config/locales/zh.yml +1 0

               label_any_open_issues: 任意进行中的问题
               label_no_open_issues: 任意已关闭的问题
               label_default_values_for_new_users: 新用户默认值
+              error_ldap_bind_credentials: Invalid LDAP Account/Password

test/unit/auth_source_ldap_test.rb +117 0

@@ -24,6 +24,26 class AuthSourceLdapTest < ActiveSupport::TestCase
24	def setup	24	def setup
25	end	25	end
26		26
		27	def test_initialize
		28	auth_source = AuthSourceLdap.new
		29	assert_nil auth_source.id
		30	assert_equal "AuthSourceLdap", auth_source.type
		31	assert_equal "", auth_source.name
		32	assert_nil auth_source.host
		33	assert_nil auth_source.port
		34	assert_nil auth_source.account
		35	assert_equal "", auth_source.account_password
		36	assert_nil auth_source.base_dn
		37	assert_nil auth_source.attr_login
		38	assert_nil auth_source.attr_firstname
		39	assert_nil auth_source.attr_lastname
		40	assert_nil auth_source.attr_mail
		41	assert_equal false, auth_source.onthefly_register
		42	assert_equal false, auth_source.tls
		43	assert_nil auth_source.filter
		44	assert_nil auth_source.timeout
		45	end
		46
27	def test_create	47	def test_create
28	a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :base_dn => 'dc=example,dc=net', :attr_login => 'sAMAccountName')	48	a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :base_dn => 'dc=example,dc=net', :attr_login => 'sAMAccountName')
29	assert a.save	49	assert a.save
@@ -135,6 +155,103 class AuthSourceLdapTest < ActiveSupport::TestCase
135	results = AuthSource.search("exa")	155	results = AuthSource.search("exa")
136	assert_equal [], results	156	assert_equal [], results
137	end	157	end
		158
		159	def test_ldap_with_correct_host
		160	auth_source = AuthSourceLdap.find(1)
		161
		162	assert_equal "127.0.0.1", auth_source.host
		163	assert_equal 389, auth_source.port
		164	assert_nothing_raised Net::LDAP::Error do
		165	auth_source.test_connection
		166	end
		167	end
		168
		169	def test_ldap_with_incorrect_host
		170	auth_source = AuthSourceLdap.find(1)
		171	auth_source.host = "badhost"
		172	auth_source.save!
		173
		174	assert_equal "badhost", auth_source.host
		175	assert_equal 389, auth_source.port
		176	assert_raise Net::LDAP::Error do
		177	auth_source.test_connection
		178	end
		179	end
		180
		181	def test_ldap_with_correct_port
		182	auth_source = AuthSourceLdap.find(1)
		183
		184	assert_equal "127.0.0.1", auth_source.host
		185	assert_equal 389, auth_source.port
		186	assert_nothing_raised Net::LDAP::Error do
		187	auth_source.test_connection
		188	end
		189	end
		190
		191	def test_ldap_with_incorrect_port
		192	auth_source = AuthSourceLdap.find(1)
		193	auth_source.port = 1234
		194	auth_source.save!
		195
		196	assert_equal "127.0.0.1", auth_source.host
		197	assert_equal 1234, auth_source.port
		198	assert_raise Net::LDAP::Error do
		199	auth_source.test_connection
		200	end
		201	end
		202
		203	def test_ldap_bind_with_account_and_password
		204	auth_source = AuthSourceLdap.find(1)
		205	auth_source.account = "cn=Manager,dc=redmine,dc=org"
		206	auth_source.account_password = "secret"
		207	auth_source.save!
		208
		209	assert_equal "127.0.0.1", auth_source.host
		210	assert_equal 389, auth_source.port
		211	assert_equal "cn=Manager,dc=redmine,dc=org", auth_source.account
		212	assert_equal "secret", auth_source.account_password
		213	assert_nil auth_source.test_connection
		214	end
		215
		216	def test_ldap_bind_without_account_and_password
		217	auth_source = AuthSourceLdap.find(1)
		218
		219	assert_equal "127.0.0.1", auth_source.host
		220	assert_equal 389, auth_source.port
		221	assert_nil auth_source.account
		222	assert_equal "", auth_source.account_password
		223	assert_nil auth_source.test_connection
		224	end
		225
		226	def test_ldap_bind_with_incorrect_account
		227	auth_source = AuthSourceLdap.find(1)
		228	auth_source.account = "cn=baduser,dc=redmine,dc=org"
		229	auth_source.account_password = "secret"
		230	auth_source.save!
		231
		232	assert_equal "127.0.0.1", auth_source.host
		233	assert_equal 389, auth_source.port
		234	assert_equal "cn=baduser,dc=redmine,dc=org", auth_source.account
		235	assert_equal "secret", auth_source.account_password
		236	assert_raise AuthSourceException do
		237	auth_source.test_connection
		238	end
		239	end
		240
		241	def test_ldap_bind_with_incorrect_password
		242	auth_source = AuthSourceLdap.find(1)
		243	auth_source.account = "cn=Manager,dc=redmine,dc=org"
		244	auth_source.account_password = "badpassword"
		245	auth_source.save!
		246
		247	assert_equal "127.0.0.1", auth_source.host
		248	assert_equal 389, auth_source.port
		249	assert_equal "cn=Manager,dc=redmine,dc=org", auth_source.account
		250	assert_equal "badpassword", auth_source.account_password
		251	assert_raise AuthSourceException do
		252	auth_source.test_connection
		253	end
		254	end
138	else	255	else
139	puts '(Test LDAP server not configured)'	256	puts '(Test LDAP server not configured)'
140	end	257	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