deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #732 from mmozuras/ldap_name_utf8

Browse source 
Force utf-8 encoding for ldap omniauth_info.name
This commit is contained in:
Valeriy Sizov 2012-04-24 13:59:27 -07:00
commit f72a5d11bd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/models/user.rb
View file

@ -13,7 +13,7 @@ class User < ActiveRecord::Base
has_many :my_own_projects, :class_name => "Project", :foreign_key => :owner_id has_many :my_own_projects, :class_name => "Project", :foreign_key => :owner_id
has_many :keys, :dependent => :destroy has_many :keys, :dependent => :destroy
has_many :recent_events, has_many :recent_events,
:class_name => "Event", :class_name => "Event",
:foreign_key => :author_id, :foreign_key => :author_id,
:order => "id DESC" :order => "id DESC"
@ -43,7 +43,7 @@ class User < ActiveRecord::Base
validates :projects_limit, validates :projects_limit,
:presence => true, :presence => true,
:numericality => {:greater_than_or_equal_to => 0} :numericality => {:greater_than_or_equal_to => 0}
validates :bio, :length => { :within => 0..255 } validates :bio, :length => { :within => 0..255 }
before_create :ensure_authentication_token before_create :ensure_authentication_token
@ -93,14 +93,14 @@ class User < ActiveRecord::Base
(0...8).map{ ('a'..'z').to_a[rand(26)] }.join (0...8).map{ ('a'..'z').to_a[rand(26)] }.join
end end
def first_name def first_name
name.split(" ").first unless name.blank? name.split(" ").first unless name.blank?
end end
def self.find_for_ldap_auth(omniauth_info) def self.find_for_ldap_auth(omniauth_info)
name = omniauth_info.name name = omniauth_info.name.force_encoding("utf-8")
email = omniauth_info.email.downcase email = omniauth_info.email.downcase
if @user = User.find_by_email(email) if @user = User.find_by_email(email)
@user @user
else else
@ -123,8 +123,8 @@ class User < ActiveRecord::Base
# Remove user from all projects and # Remove user from all projects and
# set blocked attribute to true # set blocked attribute to true
def block def block
users_projects.all.each do |membership| users_projects.all.each do |membership|
return false unless membership.destroy return false unless membership.destroy
end end