Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4005eb64
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4005eb64
编写于
3月 23, 2017
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix communication between GitLab and Container Registry
上级
896b13b9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
16 deletion
+24
-16
app/models/container_image.rb
app/models/container_image.rb
+15
-8
app/services/auth/container_registry_authentication_service.rb
...ervices/auth/container_registry_authentication_service.rb
+9
-8
未找到文件。
app/models/container_image.rb
浏览文件 @
4005eb64
...
...
@@ -43,13 +43,20 @@ class ContainerImage < ActiveRecord::Base
end
end
def
self
.
from_path
(
full_path
)
return
unless
full_path
.
include?
(
'/'
)
path
=
full_path
[
0
...
full_path
.
rindex
(
'/'
)]
name
=
full_path
[
full_path
.
rindex
(
'/'
)
+
1
..-
1
]
project
=
Project
.
find_by_full_path
(
path
)
self
.
new
(
name:
name
,
path:
path
,
project:
project
)
def
self
.
project_from_path
(
image_path
)
return
unless
image_path
.
include?
(
'/'
)
##
# Projects are always located inside a namespace, so we can remove
# the last node, and see if project with that path exists.
#
truncated_path
=
image_path
.
slice
(
0
...
image_path
.
rindex
(
'/'
))
##
# We still make it possible to search projects by a full image path
# in order to maintain backwards compatibility.
#
Project
.
find_by_full_path
(
truncated_path
)
||
Project
.
find_by_full_path
(
image_path
)
end
end
app/services/auth/container_registry_authentication_service.rb
浏览文件 @
4005eb64
...
...
@@ -38,13 +38,13 @@ module Auth
private
def
authorized_token
(
*
accesses
)
token
=
JSONWebToken
::
RSAToken
.
new
(
registry
.
key
)
token
.
issuer
=
registry
.
issuer
token
.
audience
=
params
[
:service
]
token
.
subject
=
current_user
.
try
(
:username
)
token
.
expire_time
=
self
.
class
.
token_expire_at
token
[
:access
]
=
accesses
.
compact
token
JSONWebToken
::
RSAToken
.
new
(
registry
.
key
).
tap
do
|
token
|
token
.
issuer
=
registry
.
issuer
token
.
audience
=
params
[
:service
]
token
.
subject
=
current_user
.
try
(
:username
)
token
.
expire_time
=
self
.
class
.
token_expire_at
token
[
:access
]
=
accesses
.
compact
end
end
def
scope
...
...
@@ -62,7 +62,8 @@ module Auth
end
def
process_repository_access
(
type
,
name
,
actions
)
requested_project
=
ContainerImage
.
from_path
(
name
).
project
requested_project
=
ContainerImage
.
project_from_path
(
name
)
return
unless
requested_project
actions
=
actions
.
select
do
|
action
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录