Skip to content

Fix LDAP encryption settings translation for net-ldap 0.16 #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: default
Choose a base branch
from
Open

Fix LDAP encryption settings translation for net-ldap 0.16 #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/devise_ldap_authenticatable/ldap/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ def initialize(params = {})
# Allow `ssl: true` shorthand in YAML, but enable more control with `encryption`
ldap_config["ssl"] = :simple_tls if ldap_config["ssl"] === true
ldap_options[:encryption] = ldap_config["ssl"].to_sym if ldap_config["ssl"]
ldap_options[:encryption] = ldap_config["encryption"] if ldap_config["encryption"]

if ldap_config["encryption"]
ldap_options[:encryption] = ldap_config["encryption"].deep_symbolize_keys
ldap_options[:encryption][:method] = ldap_options[:encryption][:method].to_sym if ldap_options[:encryption][:method]
if ldap_options[:encryption][:tls_options]
ldap_options[:encryption][:tls_options][:verify_mode] = OpenSSL::SSL::VERIFY_NONE if ldap_options[:encryption][:tls_options][:verify_mode] = "OpenSSL::SSL::VERIFY_NONE"
end
end

@ldap = Net::LDAP.new(ldap_options)
@ldap.host = ldap_config["host"]
Expand Down