Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

1 files changed, 28 insertions, 0 deletions

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 00000000000..70ed10e8275
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,28 @@
+if Gitlab::LDAP::Config.enabled?
+  module OmniAuth::Strategies
+    server = Gitlab.config.ldap.servers.values.first
+    klass = server['provider_class']
+    const_set(klass, Class.new(LDAP)) unless klass == 'LDAP'
+  end
+
+  OmniauthCallbacksController.class_eval do
+    server = Gitlab.config.ldap.servers.values.first
+    alias_method server['provider_name'], :ldap
+  end
+end
+
+OmniAuth.config.full_host = Settings.gitlab['base_url']
+OmniAuth.config.allowed_request_methods = [:post]
+#In case of auto sign-in, the GET method is used (users don't get to click on a button)
+OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?
+OmniAuth.config.before_request_phase do |env|
+  OmniAuth::RequestForgeryProtection.new(env).call
+end
+
+if Gitlab.config.omniauth.enabled
+  Gitlab.config.omniauth.providers.each do |provider|
+    if provider['name'] == 'kerberos'
+      require 'omniauth-kerberos'
+    end
+  end
+end