kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make code more clear in what is done

Browse source
This commit is contained in:
Kamil Trzcinski 2016-05-09 20:47:06 +03:00
parent 9f679ac207
commit daca2144c8
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/jwt_controller.rb
View file

@ -8,8 +8,9 @@ class JwtController < ApplicationController
def auth
@authenticated = authenticate_with_http_basic do |login, password|
@ci_project = ci_project(login, password)
@user = authenticate_user(login, password) unless @ci_project
# if it's possible we first try to authenticate project with login and password
@project = authenticate_project(login, password)
@user = authenticate_user(login, password) unless @project
end
unless @authenticated
@ -19,7 +20,7 @@ class JwtController < ApplicationController
service = SERVICES[params[:service]]
head :not_found unless service
result = service.new(@ci_project, @user, auth_params).execute
result = service.new(@project, @user, auth_params).execute
return head result[:http_status] if result[:http_status]
render json: result
@ -31,7 +32,7 @@ class JwtController < ApplicationController
params.permit(:service, :scope, :offline_token, :account, :client_id)
end
def ci_project(login, password)
def authenticate_project(login, password)
matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
if matched_login.present?

18
app/services/jwt/docker_authentication_service.rb
View file

@ -5,12 +5,12 @@ module Jwt
return error('forbidden', 403) unless current_user
end
{ token: token.encoded }
{ token: authorized_token.encoded }
end
private
def token
def authorized_token
token = ::Jwt::RSAToken.new(registry.key)
token.issuer = registry.issuer
token.audience = params[:service]
@ -37,22 +37,22 @@ module Jwt
end
def process_repository_access(type, name, actions)
current_project = Project.find_with_namespace(name)
return unless current_project
requested_project = Project.find_with_namespace(name)
return unless requested_project
actions = actions.select do |action|
can_access?(current_project, action)
can_access?(requested_project, action)
end
{ type: type, name: name, actions: actions } if actions
end
def can_access?(current_project, action)
case action
def can_access?(requested_project, requested_action)
case requested_action
when 'pull'
current_project == project || can?(current_user, :download_code, current_project)
requested_project.public? || requested_project == project || can?(current_user, :download_code, requested_project)
when 'push'
current_project == project || can?(current_user, :push_code, current_project)
requested_project == project || can?(current_user, :push_code, requested_project)
else
false
end