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
9ef9e008
Commit
9ef9e008
authored
May 13, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move JWT to Gitlab::JWT
parent
fc2d985b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
51 deletions
+53
-51
app/controllers/jwt_controller.rb
app/controllers/jwt_controller.rb
+1
-1
app/services/jwt/container_registry_authentication_service.rb
...services/jwt/container_registry_authentication_service.rb
+52
-50
No files found.
app/controllers/jwt_controller.rb
View file @
9ef9e008
...
@@ -3,7 +3,7 @@ class JwtController < ApplicationController
...
@@ -3,7 +3,7 @@ class JwtController < ApplicationController
skip_before_action
:verify_authenticity_token
skip_before_action
:verify_authenticity_token
SERVICES
=
{
SERVICES
=
{
'container_registry'
=>
JWT
::
ContainerRegistryAuthenticationService
,
'container_registry'
=>
::
Gitlab
::
JWT
::
ContainerRegistryAuthenticationService
,
}
}
def
auth
def
auth
...
...
app/services/jwt/container_registry_authentication_service.rb
View file @
9ef9e008
module
JWT
module
Gitlab
class
ContainerRegistryAuthenticationService
<
BaseService
module
JWT
def
execute
class
ContainerRegistryAuthenticationService
<
BaseService
if
params
[
:offline_token
]
def
execute
return
error
(
'forbidden'
,
403
)
unless
current_user
if
params
[
:offline_token
]
end
return
error
(
'forbidden'
,
403
)
unless
current_user
end
return
error
(
'forbidden'
,
401
)
if
scopes
.
blank?
return
error
(
'forbidden'
,
401
)
if
scopes
.
blank?
{
token:
authorized_token
(
scopes
).
encoded
}
{
token:
authorized_token
(
scopes
).
encoded
}
end
end
private
private
def
authorized_token
(
access
)
def
authorized_token
(
access
)
token
=
::
JWT
::
RSAToken
.
new
(
registry
.
key
)
token
=
::
JWT
::
RSAToken
.
new
(
registry
.
key
)
token
.
issuer
=
registry
.
issuer
token
.
issuer
=
registry
.
issuer
token
.
audience
=
params
[
:service
]
token
.
audience
=
params
[
:service
]
token
.
subject
=
current_user
.
try
(
:username
)
token
.
subject
=
current_user
.
try
(
:username
)
token
[
:access
]
=
access
token
[
:access
]
=
access
token
token
end
end
def
scopes
def
scopes
return
unless
params
[
:scope
]
return
unless
params
[
:scope
]
@scopes
||=
begin
@scopes
||=
begin
scope
=
process_scope
(
params
[
:scope
])
scope
=
process_scope
(
params
[
:scope
])
[
scope
].
compact
[
scope
].
compact
end
end
end
end
def
process_scope
(
scope
)
def
process_scope
(
scope
)
type
,
name
,
actions
=
scope
.
split
(
':'
,
3
)
type
,
name
,
actions
=
scope
.
split
(
':'
,
3
)
actions
=
actions
.
split
(
','
)
actions
=
actions
.
split
(
','
)
case
type
case
type
when
'repository'
when
'repository'
process_repository_access
(
type
,
name
,
actions
)
process_repository_access
(
type
,
name
,
actions
)
end
end
end
end
def
process_repository_access
(
type
,
name
,
actions
)
def
process_repository_access
(
type
,
name
,
actions
)
requested_project
=
Project
.
find_with_namespace
(
name
)
requested_project
=
Project
.
find_with_namespace
(
name
)
return
unless
requested_project
return
unless
requested_project
actions
=
actions
.
select
do
|
action
|
actions
=
actions
.
select
do
|
action
|
can_access?
(
requested_project
,
action
)
can_access?
(
requested_project
,
action
)
end
end
{
type:
type
,
name:
name
,
actions:
actions
}
if
actions
.
present?
{
type:
type
,
name:
name
,
actions:
actions
}
if
actions
.
present?
end
end
def
can_access?
(
requested_project
,
requested_action
)
def
can_access?
(
requested_project
,
requested_action
)
case
requested_action
case
requested_action
when
'pull'
when
'pull'
requested_project
.
public?
||
requested_project
==
project
||
can?
(
current_user
,
:read_container_registry
,
requested_project
)
requested_project
.
public?
||
requested_project
==
project
||
can?
(
current_user
,
:read_container_registry
,
requested_project
)
when
'push'
when
'push'
requested_project
==
project
||
can?
(
current_user
,
:create_container_registry
,
requested_project
)
requested_project
==
project
||
can?
(
current_user
,
:create_container_registry
,
requested_project
)
else
else
false
false
end
end
end
end
def
registry
def
registry
Gitlab
.
config
.
registry
Gitlab
.
config
.
registry
end
end
end
end
end
end
end
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