Project

General

Profile

« Previous | Next » 

Revision 22e8d091

Added by Dominic Cleal over 9 years ago

fixes #9084 - catch net-ldap 0.11's specific invalid filter exception

(cherry picked from commit c86528305233a1acf51f4bae8678cd7b182d2a16)

Conflicts:
app/models/auth_sources/auth_source_ldap.rb

View differences:

app/models/auth_sources/auth_source_ldap.rb
def validate_ldap_filter
Net::LDAP::Filter.construct(ldap_filter)
rescue Net::LDAP::LdapError => text
rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError => e
errors.add(:ldap_filter, _("invalid LDAP filter syntax"))
end

Also available in: Unified diff