Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8c08fb9b
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,发现更多精彩内容 >>
提交
8c08fb9b
编写于
7月 30, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4662 from jzi/allow_archive_for_deploy_key
allow all git-upload-* commands for deploy keys
上级
4f07a6a9
e03d01d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
3 deletion
+43
-3
lib/api/internal.rb
lib/api/internal.rb
+7
-3
spec/requests/api/internal_spec.rb
spec/requests/api/internal_spec.rb
+36
-0
未找到文件。
lib/api/internal.rb
浏览文件 @
8c08fb9b
module
API
module
API
# Internal access API
# Internal access API
class
Internal
<
Grape
::
API
class
Internal
<
Grape
::
API
DOWNLOAD_COMMANDS
=
%w{ git-upload-pack git-upload-archive }
PUSH_COMMANDS
=
%w{ git-receive-pack }
namespace
'internal'
do
namespace
'internal'
do
#
#
# Check if ssh key has access to project code
# Check if ssh key has access to project code
...
@@ -26,16 +30,16 @@ module API
...
@@ -26,16 +30,16 @@ module API
if
key
.
is_a?
DeployKey
if
key
.
is_a?
DeployKey
key
.
projects
.
include?
(
project
)
&&
git_cmd
==
'git-upload-pack'
key
.
projects
.
include?
(
project
)
&&
DOWNLOAD_COMMANDS
.
include?
(
git_cmd
)
else
else
user
=
key
.
user
user
=
key
.
user
return
false
if
user
.
blocked?
return
false
if
user
.
blocked?
action
=
case
git_cmd
action
=
case
git_cmd
when
'git-upload-pack'
,
'git-upload-archive'
when
*
DOWNLOAD_COMMANDS
then
:download_code
then
:download_code
when
'git-receive-pack'
when
*
PUSH_COMMANDS
then
then
if
project
.
protected_branch?
(
params
[
:ref
])
if
project
.
protected_branch?
(
params
[
:ref
])
:push_code_to_protected_branches
:push_code_to_protected_branches
...
...
spec/requests/api/internal_spec.rb
浏览文件 @
8c08fb9b
...
@@ -100,6 +100,32 @@ describe API::API do
...
@@ -100,6 +100,32 @@ describe API::API do
end
end
end
end
end
end
context
"deploy key"
do
let
(
:key
)
{
create
(
:deploy_key
)
}
context
"added to project"
do
before
do
key
.
projects
<<
project
end
it
do
archive
(
key
,
project
)
response
.
status
.
should
==
200
response
.
body
.
should
==
'true'
end
end
context
"not added to project"
do
it
do
archive
(
key
,
project
)
response
.
status
.
should
==
200
response
.
body
.
should
==
'false'
end
end
end
end
end
def
pull
(
key
,
project
)
def
pull
(
key
,
project
)
...
@@ -121,4 +147,14 @@ describe API::API do
...
@@ -121,4 +147,14 @@ describe API::API do
action:
'git-receive-pack'
action:
'git-receive-pack'
)
)
end
end
def
archive
(
key
,
project
)
get
(
api
(
"/internal/allowed"
),
ref:
'master'
,
key_id:
key
.
id
,
project:
project
.
path_with_namespace
,
action:
'git-upload-archive'
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录