From c620ede3f59da4b793cc1a632e487bf28225126c Mon Sep 17 00:00:00 2001 From: fedor patlin Date: Wed, 23 Dec 2015 15:13:33 +0500 Subject: [PATCH] Fix exception apperas when LDAP attribute contains non-ascii characters --- app/models/auth_source_ldap.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index d5a8550..5e47747 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -148,8 +148,8 @@ class AuthSourceLdap < AuthSource def get_user_attributes_from_ldap_entry(entry) { :dn => entry.dn, - :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname), - :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname), + :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname).force_encoding("UTF-8"), + :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname).force_encoding("UTF-8"), :mail => AuthSourceLdap.get_attr(entry, self.attr_mail), :auth_source_id => self.id } -- 2.5.0