GitLab wurde erfolgreich aktualisiert. Durch regelmäßige Updates bleibt das THM GitLab sicher. Danke für Ihre Geduld.

Commit 6685661b authored by Douwe Maan's avatar Douwe Maan

Clean username acquired from OAuth/LDAP.

Fixes #1967.
parent 2dfd2198
......@@ -75,6 +75,7 @@ v 7.8.0 (unreleased)
- Added support for firing system hooks on group create/destroy and adding/removing users to group (Boyan Tabakov)
- Added persistent collapse button for left side nav bar (Jason Blanchard)
- Prevent losing unsaved comments by automatically restoring them when comment page is loaded again.
- Clean the username acquired from OAuth/LDAP so it doesn't fail username validation and block signing up.
v 7.7.2
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
......
......@@ -243,6 +243,22 @@ def by_username_or_id(name_or_id)
def build_user(attrs = {})
User.new(attrs)
end
def clean_username(username)
username.gsub!(/@.*\z/, "")
username.gsub!(/\.git\z/, "")
username.gsub!(/\A-/, "")
username.gsub!(/[^a-zA-Z0-9_\-\.]/, "")
counter = 0
base = username
while by_login(username).present?
counter += 1
username = "#{base}#{counter}"
end
username
end
end
#
......
......@@ -85,11 +85,11 @@ def build_new_user
def user_attributes
{
name: auth_hash.name,
username: auth_hash.username,
email: auth_hash.email,
password: auth_hash.password,
password_confirmation: auth_hash.password
name: auth_hash.name,
username: ::User.clean_username(auth_hash.username),
email: auth_hash.email,
password: auth_hash.password,
password_confirmation: auth_hash.password
}
end
......
......@@ -8,7 +8,7 @@
let(:auth_hash) { double(uid: uid, provider: provider, info: double(info_hash)) }
let(:info_hash) do
{
nickname: 'john',
nickname: '-john+gitlab-ETC%.git@gmail.com',
name: 'John',
email: 'john@mail.com'
}
......
......@@ -301,6 +301,16 @@
end
end
describe ".clean_username" do
let!(:user1) { create(:user, username: "johngitlab-etc") }
let!(:user2) { create(:user, username: "JohnGitLab-etc1") }
it "cleans a username and makes sure it's available" do
expect(User.clean_username("-john+gitlab-ETC%.git@gmail.com")).to eq("johngitlab-ETC2")
end
end
describe 'all_ssh_keys' do
it { should have_many(:keys).dependent(:destroy) }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment