Download as
Browse Code »

Commit 314e4736e485ef00092ff7248503b439fac5c490

Authored by Marin Jankovski
1 parent d1f3643c
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Strip apostrophe from email generated usernames.

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
lib/gitlab/ldap/user.rb
  Diff comments   View file @314e473
... ... @@ -50,7 +50,9 @@ module Gitlab
50 50 # we look for user by extracting part of their email
51 51 if !user && email && ldap_conf['allow_username_or_email_login']
52 52 uname = email.partition('@').first
53   - user = model.find_by(username: uname)
  53 + # Strip apostrophes since they are disallowed as part of username
  54 + username = uname.gsub("'", "")
  55 + user = model.find_by(username: username)
54 56 end
55 57  
56 58 user
... ...
lib/gitlab/oauth/user.rb
  Diff comments   View file @314e473
... ... @@ -39,7 +39,9 @@ module Gitlab
39 39 # So we use part of email as username for new user
40 40 # For LDAP, username is already set to the user's
41 41 # uid/userid/sAMAccountName.
42   - user.username = email.match(/^[^@]*/)[0]
  42 + email_username = email.match(/^[^@]*/)[0]
  43 + # Strip apostrophes since they are disallowed as part of username
  44 + user.username = email_username.gsub("'", "")
43 45 end
44 46  
45 47 user.save!
... ...