feat: allow admin bind in ldap

doubtfire-lms · Sep 4, 2023 · 640489d · 640489d
1 parent 45ccc3c
commit 640489d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -269,4 +269,6 @@
   # ==> Devise secret key
   # Secret key to be used by devise in prod.
   config.secret_key = Doubtfire::Application.secrets.secret_key_devise if Rails.env.production?
+
+  config.ldap_use_admin_to_bind = ENV.fetch('DF_LDAP_USE_ADMIN_TO_BIND', 'false').to_s.downcase != 'false'
 end
diff --git a/config/ldap.yml b/config/ldap.yml
@@ -3,18 +3,24 @@ development:
   port: <%= ENV['DF_LDAP_PORT'] %>
   attribute: <%= ENV['DF_LDAP_ATTRIBUTE'] %>
   base: <%= ENV['DF_LDAP_BASE'] %>
-  ssl: false
+  admin_user: <%= ENV['DF_LDAP_ADMIN_USER'] %>
+  admin_password: <%= ENV['DF_LDAP_ADMIN_PWD'] %>
+  ssl: <%= ENV['DF_LDAP_SSL'].to_s.downcase != "false" %>
 
 test:
   host: <%= ENV['DF_LDAP_HOST'] %>
   port: <%= ENV['DF_LDAP_PORT'] %>
   attribute: <%= ENV['DF_LDAP_ATTRIBUTE'] %>
   base: <%= ENV['DF_LDAP_BASE'] %>
-  ssl: false
+  admin_user: <%= ENV['DF_LDAP_ADMIN_USER'] %>
+  admin_password: <%= ENV['DF_LDAP_ADMIN_PWD'] %>
+  ssl: <%= ENV['DF_LDAP_SSL'].to_s.downcase != "false" %>
 
 production:
   host: <%= ENV['DF_LDAP_HOST'] %>
   port: <%= ENV['DF_LDAP_PORT'] %>
   attribute: <%= ENV['DF_LDAP_ATTRIBUTE'] %>
   base: <%= ENV['DF_LDAP_BASE'] %>
-  ssl: false
+  admin_user: <%= ENV['DF_LDAP_ADMIN_USER'] %>
+  admin_password: <%= ENV['DF_LDAP_ADMIN_PWD'] %>
+  ssl: <%= ENV['DF_LDAP_SSL'].to_s.downcase != "false" %>