Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
63cdf1ae
Commit
63cdf1ae
authored
May 14, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Auth::ContainerRegistryAuthenticationService
parent
774a5107
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
71 additions
and
73 deletions
+71
-73
app/controllers/jwt_controller.rb
app/controllers/jwt_controller.rb
+1
-1
app/services/auth/container_registry_authentication_service.rb
...ervices/auth/container_registry_authentication_service.rb
+69
-0
app/services/jwt/container_registry_authentication_service.rb
...services/jwt/container_registry_authentication_service.rb
+0
-71
spec/services/jwt/container_registry_authentication_service_spec.rb
...ces/jwt/container_registry_authentication_service_spec.rb
+1
-1
No files found.
app/controllers/jwt_controller.rb
View file @
63cdf1ae
...
@@ -4,7 +4,7 @@ class JwtController < ApplicationController
...
@@ -4,7 +4,7 @@ class JwtController < ApplicationController
before_action
:authenticate_project_or_user
before_action
:authenticate_project_or_user
SERVICES
=
{
SERVICES
=
{
'container_registry'
=>
::
Gitlab
::
JWT
::
ContainerRegistryAuthenticationService
,
'container_registry'
=>
Auth
::
ContainerRegistryAuthenticationService
,
}
}
def
auth
def
auth
...
...
app/services/auth/container_registry_authentication_service.rb
0 → 100644
View file @
63cdf1ae
module
Auth
class
ContainerRegistryAuthenticationService
<
BaseService
def
execute
if
params
[
:offline_token
]
return
error
(
'forbidden'
,
403
)
unless
current_user
end
return
error
(
'forbidden'
,
401
)
if
scopes
.
blank?
{
token:
authorized_token
(
scopes
).
encoded
}
end
private
def
authorized_token
(
access
)
token
=
::
JWT
::
RSAToken
.
new
(
registry
.
key
)
token
.
issuer
=
registry
.
issuer
token
.
audience
=
params
[
:service
]
token
.
subject
=
current_user
.
try
(
:username
)
token
[
:access
]
=
access
token
end
def
scopes
return
unless
params
[
:scope
]
@scopes
||=
begin
scope
=
process_scope
(
params
[
:scope
])
[
scope
].
compact
end
end
def
process_scope
(
scope
)
type
,
name
,
actions
=
scope
.
split
(
':'
,
3
)
actions
=
actions
.
split
(
','
)
case
type
when
'repository'
process_repository_access
(
type
,
name
,
actions
)
end
end
def
process_repository_access
(
type
,
name
,
actions
)
requested_project
=
Project
.
find_with_namespace
(
name
)
return
unless
requested_project
actions
=
actions
.
select
do
|
action
|
can_access?
(
requested_project
,
action
)
end
{
type:
type
,
name:
name
,
actions:
actions
}
if
actions
.
present?
end
def
can_access?
(
requested_project
,
requested_action
)
case
requested_action
when
'pull'
requested_project
.
public?
||
requested_project
==
project
||
can?
(
current_user
,
:read_container_registry
,
requested_project
)
when
'push'
requested_project
==
project
||
can?
(
current_user
,
:create_container_registry
,
requested_project
)
else
false
end
end
def
registry
Gitlab
.
config
.
registry
end
end
end
app/services/jwt/container_registry_authentication_service.rb
deleted
100644 → 0
View file @
774a5107
module
Gitlab
module
JWT
class
ContainerRegistryAuthenticationService
<
BaseService
def
execute
if
params
[
:offline_token
]
return
error
(
'forbidden'
,
403
)
unless
current_user
end
return
error
(
'forbidden'
,
401
)
if
scopes
.
blank?
{
token:
authorized_token
(
scopes
).
encoded
}
end
private
def
authorized_token
(
access
)
token
=
::
JWT
::
RSAToken
.
new
(
registry
.
key
)
token
.
issuer
=
registry
.
issuer
token
.
audience
=
params
[
:service
]
token
.
subject
=
current_user
.
try
(
:username
)
token
[
:access
]
=
access
token
end
def
scopes
return
unless
params
[
:scope
]
@scopes
||=
begin
scope
=
process_scope
(
params
[
:scope
])
[
scope
].
compact
end
end
def
process_scope
(
scope
)
type
,
name
,
actions
=
scope
.
split
(
':'
,
3
)
actions
=
actions
.
split
(
','
)
case
type
when
'repository'
process_repository_access
(
type
,
name
,
actions
)
end
end
def
process_repository_access
(
type
,
name
,
actions
)
requested_project
=
Project
.
find_with_namespace
(
name
)
return
unless
requested_project
actions
=
actions
.
select
do
|
action
|
can_access?
(
requested_project
,
action
)
end
{
type:
type
,
name:
name
,
actions:
actions
}
if
actions
.
present?
end
def
can_access?
(
requested_project
,
requested_action
)
case
requested_action
when
'pull'
requested_project
.
public?
||
requested_project
==
project
||
can?
(
current_user
,
:read_container_registry
,
requested_project
)
when
'push'
requested_project
==
project
||
can?
(
current_user
,
:create_container_registry
,
requested_project
)
else
false
end
end
def
registry
Gitlab
.
config
.
registry
end
end
end
end
spec/services/jwt/container_registry_authentication_service_spec.rb
View file @
63cdf1ae
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
JWT
::
ContainerRegistryAuthenticationService
,
services:
true
do
describe
JWT
::
ContainerRegistryAuthenticationService
,
services:
true
do
let
(
:current_project
)
{
nil
}
let
(
:current_project
)
{
nil
}
let
(
:current_user
)
{
nil
}
let
(
:current_user
)
{
nil
}
let
(
:current_params
)
{
{}
}
let
(
:current_params
)
{
{}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment