From 68364fe2f03a543c4ad89553f50b6fa30d143331 Mon Sep 17 00:00:00 2001
From: Markus Koller <markus-koller@gmx.ch>
Date: Tue, 30 Aug 2016 13:21:33 +0200
Subject: Log LDAP lookup errors and don't swallow unrelated exceptions

Signed-off-by: Roger Meier <r.meier@siemens.com>
---
 lib/gitlab/ldap/access.rb  | 2 --
 lib/gitlab/ldap/adapter.rb | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/gitlab/ldap')

diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 2f326d00a2f..7e06bd2b0fb 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -51,8 +51,6 @@ module Gitlab
           user.ldap_block
           false
         end
-      rescue
-        false
       end
 
       def adapter
diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index 82cb8cef754..8b38cfaefb6 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -62,6 +62,9 @@ module Gitlab
             results
           end
         end
+      rescue Net::LDAP::Error => error
+        Rails.logger.warn("LDAP search raised exception #{error.class}: #{error.message}")
+        []
       rescue Timeout::Error
         Rails.logger.warn("LDAP search timed out after #{config.timeout} seconds")
         []
-- 
cgit v1.2.3