Merge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username

Allow the ldap logins with email or username

Merge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username
Allow the ldap logins with email or username
Dmitriy Zaporozhets
2 parents 2c191ab0 d04f3286
Showing 3 changed files with 11 additions and 1 deletions Show diff stats
config/gitlab.yml.example
config/initializers/1_settings.rb
config/initializers/devise.rb
@@ -97,6 +97,7 @@ production: &amp;base
     method: 'ssl' # "ssl" or "plain"
     bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
     password: '_the_password_of_the_bind_user'
+    allow_username_or_email_login: true
  
   ## OmniAuth settings
   omniauth:
@@ -37,6 +37,8 @@ end
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
 Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
+Settings.ldap['allow_username_or_email_login'] = false if Settings.ldap['allow_username_or_email_login'].nil?
+
  
 Settings['omniauth'] ||= Settingslogic.new({})
 Settings.omniauth['enabled']      = false if Settings.omniauth['enabled'].nil?
@@ -206,6 +206,12 @@ Devise.setup do |config|
   # end
  
   if Gitlab.config.ldap.enabled
+    if Gitlab.config.ldap.allow_username_or_email_login
+      email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
+    else
+      email_stripping_proc = ->(name) {name}
+    end
+
     config.omniauth :ldap,
       host:     Gitlab.config.ldap['host'],
       base:     Gitlab.config.ldap['base'],
@@ -213,7 +219,8 @@ Devise.setup do |config|
       port:     Gitlab.config.ldap['port'],
       method:   Gitlab.config.ldap['method'],
       bind_dn:  Gitlab.config.ldap['bind_dn'],
-      password: Gitlab.config.ldap['password']
+      password: Gitlab.config.ldap['password'],
+      name_proc: email_stripping_proc
   end
  
   Gitlab.config.omniauth.providers.each do |provider|
...	...	@@ -97,6 +97,7 @@ production: &base
97	97	method: 'ssl' # "ssl" or "plain"
98	98	bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
99	99	password: '_the_password_of_the_bind_user'
	100	+ allow_username_or_email_login: true
100	101
101	102	## OmniAuth settings
102	103	omniauth:
...	...
...	...	@@ -37,6 +37,8 @@ end
37	37	# Default settings
38	38	Settings['ldap'] \|\|= Settingslogic.new({})
39	39	Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
	40	+Settings.ldap['allow_username_or_email_login'] = false if Settings.ldap['allow_username_or_email_login'].nil?
	41	+
40	42
41	43	Settings['omniauth'] \|\|= Settingslogic.new({})
42	44	Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?
...	...
...	...	@@ -206,6 +206,12 @@ Devise.setup do \|config\|
206	206	# end
207	207
208	208	if Gitlab.config.ldap.enabled
	209	+ if Gitlab.config.ldap.allow_username_or_email_login
	210	+ email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
	211	+ else
	212	+ email_stripping_proc = ->(name) {name}
	213	+ end
	214	+
209	215	config.omniauth :ldap,
210	216	host: Gitlab.config.ldap['host'],
211	217	base: Gitlab.config.ldap['base'],
...	...	@@ -213,7 +219,8 @@ Devise.setup do \|config\|
213	219	port: Gitlab.config.ldap['port'],
214	220	method: Gitlab.config.ldap['method'],
215	221	bind_dn: Gitlab.config.ldap['bind_dn'],
216		- password: Gitlab.config.ldap['password']
	222	+ password: Gitlab.config.ldap['password'],
	223	+ name_proc: email_stripping_proc
217	224	end
218	225
219	226	Gitlab.config.omniauth.providers.each do \|provider\|
...	...