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 /app | |
| 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 'app')
| -rw-r--r-- | app/controllers/projects/git_http_client_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb index b4ec5b3fae1..4be580e759e 100644 --- a/app/controllers/projects/git_http_client_controller.rb +++ b/app/controllers/projects/git_http_client_controller.rb @@ -22,7 +22,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController if allow_basic_auth? && basic_auth_provided? login, password = user_name_and_password(request) - handle_authentication(login, password) + handle_basic_authentication(login, password) if ci? || user return # Allow access @@ -110,7 +110,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController @ci.present? end - def handle_authentication(login, password) + def handle_basic_authentication(login, password) auth_result = Gitlab::Auth.find_for_git_client(login, password, project: project, ip: request.ip) case auth_result.type |