diff options
| author | Alejandro Rodriguez <alejandro@gitlab.com> | 2016-11-08 18:37:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-09 12:28:29 +0100 |
| commit | 32042ef56adfa24ce5952c6f3b7dc97dea5fd2d4 (patch) | |
| tree | 92b450e0e40160dd1e73be536e8be87129b882f2 /app/controllers/jwt_controller.rb | |
| parent | b0088b527eacd16773a85ad8f88e49de7c646cf1 (diff) | |
| download | gitlab-ce-32042ef56adfa24ce5952c6f3b7dc97dea5fd2d4.tar.gz | |
Merge branch 'unauthenticated-container-registry-access' into 'security'
Restore unauthenticated access to public container registries
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24284
See merge request !2025
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/jwt_controller.rb')
| -rw-r--r-- | app/controllers/jwt_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb index 7e4da73bc11..c736200a104 100644 --- a/app/controllers/jwt_controller.rb +++ b/app/controllers/jwt_controller.rb @@ -12,7 +12,7 @@ class JwtController < ApplicationController return head :not_found unless service result = service.new(@authentication_result.project, @authentication_result.actor, auth_params). - execute(authentication_abilities: @authentication_result.authentication_abilities || []) + execute(authentication_abilities: @authentication_result.authentication_abilities) render json: result, status: result[:http_status] end @@ -20,7 +20,7 @@ class JwtController < ApplicationController private def authenticate_project_or_user - @authentication_result = Gitlab::Auth::Result.new + @authentication_result = Gitlab::Auth::Result.new(nil, nil, :none, Gitlab::Auth.read_authentication_abilities) authenticate_with_http_basic do |login, password| @authentication_result = Gitlab::Auth.find_for_git_client(login, password, project: nil, ip: request.ip) |