ldap: added timeout option

With this option you can configure the amount of seconds for a connection timeout with your LDAP server. Signed-off-by: Miquel Sabaté Solà <[email protected]>
SUSE · May 15, 2018 · 35ba42f · 35ba42f
1 parent 62aa222
commit 35ba42f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/config/config.yml b/config/config.yml
@@ -48,9 +48,13 @@ delete:
 ldap:
   enabled: false
 
+  # Hostname and port of your LDAP server.
   hostname: "ldap_hostname"
   port: 389
 
+  # The connection timeout to be used for all LDAP requests measured in seconds.
+  timeout: 5
+
   # Available options: "plain", "simple_tls" and "start_tls".
   # TODO: deprecated in favor of `encryption.method`.
   method: "plain"

diff --git a/lib/portus/ldap.rb b/lib/portus/ldap.rb
@@ -89,12 +89,12 @@ def authentication?
     end
 
     def adapter_options
-      # TODO: add connect_timeout
       cfg = APP_CONFIG["ldap"]
       {
-        host:       cfg["hostname"],
-        port:       cfg["port"],
-        encryption: encryption(cfg)
+        host:               cfg["hostname"],
+        port:               cfg["port"],
+        connection_timeout: cfg["timeout"],
+        encryption:         encryption(cfg)
       }.tap do |options|
         options.merge!(auth_options) if authentication?
       end