Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

cleanup: rubocop: fix Layout/MultilineHashBraceLayout and Layout/SpaceInsideBlockBraces in app/models/auth_source_ldap.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19293 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2019-11-25 09:08:55 +00:00
parent 0c341eb21d
commit bfeffd964b
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/auth_source_ldap.rb
View File

@@ -70,8 +70,7 @@ class AuthSourceLdap < AuthSource
def test_connection
with_timeout do
ldap_con = initialize_ldap_con(self.account, self.account_password)
ldap_con.open { }
ldap_con.open {}
if self.account.present? && !self.account.include?("$login") && self.account_password.present?
ldap_auth = authenticate_dn(self.account, self.account_password)
raise AuthSourceException.new(l(:error_ldap_bind_credentials)) if !ldap_auth
@@ -177,20 +176,19 @@ class AuthSourceLdap < AuthSource
end
def initialize_ldap_con(ldap_user, ldap_password)
options = { :host => self.host,
:port => self.port
}
options = {:host => self.host, :port => self.port}
if tls
options[:encryption] = {
:method => :simple_tls,
# Always provide non-empty tls_options, to make sure, that all
# OpenSSL::SSL::SSLContext::DEFAULT_PARAMS as well as the default cert
# store are used.
:tls_options => { :verify_mode => verify_peer? ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE }
:tls_options => {:verify_mode => verify_peer? ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE}
}
end
options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
unless ldap_user.blank? && ldap_password.blank?
options.merge!(:auth => {:method => :simple, :username => ldap_user, :password => ldap_password})
end
Net::LDAP.new options
end