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
1cf164f1
Commit
1cf164f1
authored
Jul 19, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix private method visibility in container registry
parent
c0ebfea6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
app/services/auth/container_registry_authentication_service.rb
...ervices/auth/container_registry_authentication_service.rb
+6
-6
No files found.
app/services/auth/container_registry_authentication_service.rb
View file @
1cf164f1
...
@@ -24,10 +24,14 @@ module Auth
...
@@ -24,10 +24,14 @@ module Auth
token
[
:access
]
=
names
.
map
do
|
name
|
token
[
:access
]
=
names
.
map
do
|
name
|
{
type:
'repository'
,
name:
name
,
actions:
%w(*)
}
{
type:
'repository'
,
name:
name
,
actions:
%w(*)
}
end
end
token
.
encoded
token
.
encoded
end
end
def
self
.
token_expire_at
Time
.
now
+
current_application_settings
.
container_registry_token_expire_delay
.
minutes
end
private
private
def
authorized_token
(
*
accesses
)
def
authorized_token
(
*
accesses
)
...
@@ -35,7 +39,7 @@ module Auth
...
@@ -35,7 +39,7 @@ module Auth
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
.
expire_time
=
ContainerRegistryAuthenticationService
.
token_expire_at
token
.
expire_time
=
self
.
class
.
token_expire_at
token
[
:access
]
=
accesses
.
compact
token
[
:access
]
=
accesses
.
compact
token
token
end
end
...
@@ -81,9 +85,5 @@ module Auth
...
@@ -81,9 +85,5 @@ module Auth
def
registry
def
registry
Gitlab
.
config
.
registry
Gitlab
.
config
.
registry
end
end
def
self
.
token_expire_at
Time
.
now
+
current_application_settings
.
container_registry_token_expire_delay
.
minutes
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