diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-09-07 11:55:54 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-09-15 12:21:00 -0500 |
| commit | 71aff7f6a3ab63f1395bfab6ea49f0175fe08167 (patch) | |
| tree | fb5a26ecf10deeabdeb10f4950a43ee345086558 /lib | |
| parent | c144db2935f0f71c7f282a3015d126526bc16b57 (diff) | |
| download | gitlab-ce-71aff7f6a3ab63f1395bfab6ea49f0175fe08167.tar.gz | |
Use special characters for `lfs+deploy-key` to prevent a someone from creating a user with this username, and method name refactoring.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/lfs_token.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 14e29124aac..f4e6ebb7bc7 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -115,7 +115,7 @@ module Gitlab def lfs_token_check(login, password) actor = - if login =~ /\Alfs-deploy-key-\d+\Z/ + if login =~ /\Alfs\+deploy-key-\d+\Z/ /\d+\Z/.match(login) do |id| DeployKey.find(id[0]) end diff --git a/lib/gitlab/lfs_token.rb b/lib/gitlab/lfs_token.rb index d7db8017475..edf4dffc4c0 100644 --- a/lib/gitlab/lfs_token.rb +++ b/lib/gitlab/lfs_token.rb @@ -30,7 +30,7 @@ module Gitlab end def actor_name - actor.is_a?(User) ? actor.username : "lfs-deploy-key-#{actor.id}" + actor.is_a?(User) ? actor.username : "lfs+deploy-key-#{actor.id}" end private |