diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-01 13:13:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 13:13:28 +0100 |
| commit | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (patch) | |
| tree | fc21c09cd6e0e8a666655df8b7f6802745a7e473 /config/initializers/devise.rb | |
| parent | 7f6315841c98a1eee6cb57171a91a88f5c5343df (diff) | |
| parent | fae7e0cacec60094dc1ce78d9f63b19b1cacde2d (diff) | |
Merge pull request #1250 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index fd9a5a8b9..fa9fd8cc4 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -61,6 +61,12 @@ module Devise @@ldap_tls_no_verify = false mattr_accessor :ldap_search_filter @@ldap_search_filter = nil + mattr_accessor :ldap_uid_conversion_enabled + @@ldap_uid_conversion_enabled = false + mattr_accessor :ldap_uid_conversion_search + @@ldap_uid_conversion_search = nil + mattr_accessor :ldap_uid_conversion_replace + @@ldap_uid_conversion_replace = nil class Strategies::PamAuthenticatable def valid? @@ -365,5 +371,8 @@ Devise.setup do |config| config.ldap_uid = ENV.fetch('LDAP_UID', 'cn') config.ldap_tls_no_verify = ENV['LDAP_TLS_NO_VERIFY'] == 'true' config.ldap_search_filter = ENV.fetch('LDAP_SEARCH_FILTER', '%{uid}=%{email}') + config.ldap_uid_conversion_enabled = ENV['LDAP_UID_CONVERSION_ENABLED'] == 'true' + config.ldap_uid_conversion_search = ENV.fetch('LDAP_UID_CONVERSION_SEARCH', '.,- ') + config.ldap_uid_conversion_replace = ENV.fetch('LDAP_UID_CONVERSION_REPLACE', '_') end end |