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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
b180d79c
Commit
b180d79c
authored
8 years ago
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename DockerAuthenticationService to ContainerRegistryAuthenticationService
parent
daca2144
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
18 deletions
+20
-18
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
+13
-9
lib/jwt/token.rb
lib/jwt/token.rb
+6
-8
No files found.
app/controllers/jwt_controller.rb
View file @
b180d79c
...
@@ -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
=
{
'
docker'
=>
Jwt
::
Docker
AuthenticationService
,
'
container_registry'
=>
Jwt
::
ContainerRegistry
AuthenticationService
,
}
}
def
auth
def
auth
...
...
This diff is collapsed.
Click to expand it.
app/services/jwt/
docker
_authentication_service.rb
→
app/services/jwt/
container_registry
_authentication_service.rb
View file @
b180d79c
module
Jwt
module
Jwt
class
Docker
AuthenticationService
<
BaseService
class
ContainerRegistry
AuthenticationService
<
BaseService
def
execute
def
execute
if
params
[
:offline_token
]
if
params
[
:offline_token
]
return
error
(
'forbidden'
,
403
)
unless
current_user
return
error
(
'forbidden'
,
403
)
unless
current_user
end
end
{
token:
authorized_token
.
encoded
}
return
error
(
'forbidden'
,
401
)
if
scopes
.
empty?
{
token:
authorized_token
(
scopes
).
encoded
}
end
end
private
private
def
authorized_token
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
]
...
@@ -19,12 +21,14 @@ module Jwt
...
@@ -19,12 +21,14 @@ module Jwt
token
token
end
end
def
acces
s
def
scope
s
return
unless
params
[
:scope
]
return
unless
params
[
:scope
]
@scopes
||=
begin
scope
=
process_scope
(
params
[
:scope
])
scope
=
process_scope
(
params
[
:scope
])
[
scope
].
compact
[
scope
].
compact
end
end
end
def
process_scope
(
scope
)
def
process_scope
(
scope
)
type
,
name
,
actions
=
scope
.
split
(
':'
,
3
)
type
,
name
,
actions
=
scope
.
split
(
':'
,
3
)
...
@@ -44,15 +48,15 @@ module Jwt
...
@@ -44,15 +48,15 @@ module Jwt
can_access?
(
requested_project
,
action
)
can_access?
(
requested_project
,
action
)
end
end
{
type:
type
,
name:
name
,
actions:
actions
}
if
actions
{
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
,
:
download_code
,
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
,
:
push_code
,
requested_project
)
requested_project
==
project
||
can?
(
current_user
,
:
create_container_registry
,
requested_project
)
else
else
false
false
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/jwt/token.rb
View file @
b180d79c
...
@@ -4,19 +4,21 @@ module Jwt
...
@@ -4,19 +4,21 @@ module Jwt
attr_accessor
:issued_at
,
:not_before
,
:expire_time
attr_accessor
:issued_at
,
:not_before
,
:expire_time
def
initialize
def
initialize
@payload
=
{}
@id
=
SecureRandom
.
uuid
@id
=
SecureRandom
.
uuid
@issued_at
=
Time
.
now
@issued_at
=
Time
.
now
# we give a few seconds for time shift
@not_before
=
issued_at
-
5
.
seconds
@not_before
=
issued_at
-
5
.
seconds
# default 60 seconds should be more than enough for this authentication token
@expire_time
=
issued_at
+
1
.
minute
@expire_time
=
issued_at
+
1
.
minute
@custom_payload
=
{}
end
end
def
[]
(
key
)
def
[]
(
key
)
@payload
[
key
]
@
custom_
payload
[
key
]
end
end
def
[]=
(
key
,
value
)
def
[]=
(
key
,
value
)
@payload
[
key
]
=
value
@
custom_
payload
[
key
]
=
value
end
end
def
encoded
def
encoded
...
@@ -24,11 +26,7 @@ module Jwt
...
@@ -24,11 +26,7 @@ module Jwt
end
end
def
payload
def
payload
@payload
.
merge
(
default_payload
)
@custom_payload
.
merge
(
default_payload
)
end
def
to_json
payload
.
to_json
end
end
private
private
...
...
This diff is collapsed.
Click to expand it.
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