Display multiple LDAP servers on login page

app/controllers/omniauth_callbacks_controller.rb

@@ -30,6 +30,13 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     end
   end
 
+  alias_method :ldap0, :ldap
+  alias_method :ldap1, :ldap
+  alias_method :ldap2, :ldap
+  alias_method :ldap3, :ldap
+  alias_method :ldap4, :ldap
+  alias_method :ldap5, :ldap
+
   def omniauth_error
     @provider = params[:provider]
     @error = params[:error]

app/controllers/sessions_controller.rb

@@ -18,6 +18,10 @@ class SessionsController < Devise::SessionsController
       store_location_for(:redirect, redirect_path)
     end
 
+    if Gitlab.config.ldap.enabled
+      @ldap_servers = Gitlab.config.ldap.servers
+    end
+
     super
   end
 

app/helpers/application_helper.rb

@@ -244,10 +244,6 @@ module ApplicationHelper
     end
   end
 
-  def ldap_enabled?
-    Gitlab.config.ldap.enabled
-  end
-
   def link_to(name = nil, options = nil, html_options = nil, &block)
     begin
       uri = URI(options)

app/helpers/oauth_helper.rb

 module OauthHelper
   def ldap_enabled?
-    Devise.omniauth_providers.include?(:ldap)
+    Gitlab.config.ldap.enabled
   end
 
   def default_providers

app/views/devise/sessions/_new_ldap.html.haml

-= form_tag(user_omniauth_callback_path(:ldap), id: 'new_ldap_user' ) do
+= form_tag(user_omniauth_callback_path(provider), id: 'new_ldap_user' ) do
   = text_field_tag :username, nil, {class: "form-control top", placeholder: "LDAP Login", autofocus: "autofocus"}
   = password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"}
   %br/

app/views/devise/sessions/new.html.haml

@@ -4,20 +4,22 @@
   .panel-body
     - if ldap_enabled? && gitlab_config.signin_enabled
       %ul.nav.nav-tabs
-        %li.active
-          = link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
+        - @ldap_servers.each_with_index do |server, i|
+          %li{class: (:active if server['primary'])}
+            = link_to server['name'], "#tab-ldap#{i}", 'data-toggle' => 'tab'
         %li
           = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
       .tab-content
-        %div#tab-ldap.tab-pane.active
-          = render partial: 'devise/sessions/new_ldap'
+        - @ldap_servers.each_with_index do |server, i|
+          %div.tab-pane{id: "tab-ldap#{i}", class: (:active if server['primary'])}
+            = render 'devise/sessions/new_ldap', provider: "ldap#{i}"
         %div#tab-signin.tab-pane
-          = render partial: 'devise/sessions/new_base'
+          = render 'devise/sessions/new_base'
 
     - elsif ldap_enabled?
-      = render partial: 'devise/sessions/new_ldap'
+      = render 'devise/sessions/new_ldap', ldap_servers: @ldap_servers
     - elsif gitlab_config.signin_enabled
-      = render partial: 'devise/sessions/new_base'
+      = render 'devise/sessions/new_base'
     - else
       %div
         No authentication methods configured.