diff options
| author | Will Starms <vilhelmen@gmail.com> | 2016-08-25 11:48:08 -0500 |
|---|---|---|
| committer | Will Starms <vilhelmen@gmail.com> | 2016-10-07 13:46:59 -0500 |
| commit | 4f1de5faacb6824bad2624b75537e9f4ddbb1207 (patch) | |
| tree | b60a2b249f3039dc37854725a0c96a2ecbe0f8ab /app/models/namespace.rb | |
| parent | c901936a829885263a602431e5762b0352073a2a (diff) | |
| download | gitlab-ce-4f1de5faacb6824bad2624b75537e9f4ddbb1207.tar.gz | |
Correct namespace validation to forbid bad names #21077
Adds .git and .atom to the master namespace regex
Updates existing group tests and adds two new ones
Updates path cleaning to also forbid .atom
Diffstat (limited to 'app/models/namespace.rb')
| -rw-r--r-- | app/models/namespace.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index b7f2b2bbe61..b67049f0f55 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -61,15 +61,13 @@ class Namespace < ActiveRecord::Base def clean_path(path) path = path.dup # Get the email username by removing everything after an `@` sign. - path.gsub!(/@.*\z/, "") - # Usernames can't end in .git, so remove it. - path.gsub!(/\.git\z/, "") - # Remove dashes at the start of the username. - path.gsub!(/\A-+/, "") - # Remove periods at the end of the username. - path.gsub!(/\.+\z/, "") + path.gsub!(/@.*\z/, "") # Remove everything that's not in the list of allowed characters. - path.gsub!(/[^a-zA-Z0-9_\-\.]/, "") + path.gsub!(/[^a-zA-Z0-9_\-\.]/, "") + # Remove trailing violations ('.atom', '.git', or '.') + path.gsub!(/(\.atom|\.git|\.)*\z/, "") + # Remove leading violations ('-') + path.gsub!(/\A\-+/, "") # Users with the great usernames of "." or ".." would end up with a blank username. # Work around that by setting their username to "blank", followed by a counter. |