Merge branch 'username-namespace-clash' into 'master'

Prevent autogenerated OAuth username to clash with existing namespace.

If the OAuth username already exists as a group rather than a user, automatic account creation would still fail.

See merge request !1511

2 files changed, 7 insertions, 2 deletions

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index ba0b2b71cf9..2c7ed376265 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -44,6 +44,10 @@ class Namespace < ActiveRecord::Base
 
   scope :root, -> { where('type IS NULL') }
 
+  def self.by_path(path)
+    where('lower(path) = :value', value: path.downcase).first
+  end
+
   def self.search(query)
     where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index d7f688ec138..a97678999bc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -252,7 +252,7 @@ class User < ActiveRecord::Base
 
       counter = 0
       base = username
-      while by_login(username).present?
+      while User.by_login(username).present? || Namespace.by_path(username).present?
         counter += 1 
         username = "#{base}#{counter}"
       end
@@ -290,7 +290,8 @@ class User < ActiveRecord::Base
 
   def namespace_uniq
     namespace_name = self.username
-    if Namespace.find_by(path: namespace_name)
+    existing_namespace = Namespace.by_path(namespace_name)
+    if existing_namespace && existing_namespace != self.namespace
       self.errors.add :username, "already exists"
     end
   end