Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4dbfa14e
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,发现更多精彩内容 >>
提交
4dbfa14e
编写于
6月 23, 2017
作者:
T
Timothy Andrew
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement review comments from @dbalexandre for !12300.
上级
1b8223dd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
22 deletion
+18
-22
lib/api/api_guard.rb
lib/api/api_guard.rb
+5
-7
lib/api/helpers.rb
lib/api/helpers.rb
+2
-2
spec/services/access_token_validation_service_spec.rb
spec/services/access_token_validation_service_spec.rb
+11
-13
未找到文件。
lib/api/api_guard.rb
浏览文件 @
4dbfa14e
...
...
@@ -30,15 +30,13 @@ module API
# endpoint class. If this method is called multiple times on the same class,
# the scopes are all aggregated.
def
allow_access_with_scope
(
scopes
,
options
=
{})
@scopes
||=
[]
params
=
Array
.
wrap
(
scopes
).
map
{
|
scope
|
{
name:
scope
,
if:
options
[
:if
]
}
}
@scopes
.
concat
(
params
)
Array
(
scopes
).
each
do
|
scope
|
allowed_scopes
<<
{
name:
scope
,
if:
options
[
:if
]
}
end
end
def
scopes
@scopes
def
allowed_
scopes
@scopes
||=
[]
end
end
...
...
lib/api/helpers.rb
浏览文件 @
4dbfa14e
...
...
@@ -416,8 +416,8 @@ module API
begin
endpoint_classes
=
[
options
[
:for
].
presence
,
::
API
::
API
].
compact
endpoint_classes
.
reduce
([])
do
|
memo
,
endpoint
|
if
endpoint
.
respond_to?
(
:scopes
)
memo
.
concat
(
endpoint
.
scopes
)
if
endpoint
.
respond_to?
(
:
allowed_
scopes
)
memo
.
concat
(
endpoint
.
allowed_
scopes
)
else
memo
end
...
...
spec/services/access_token_validation_service_spec.rb
浏览文件 @
4dbfa14e
...
...
@@ -41,24 +41,22 @@ describe AccessTokenValidationService, services: true do
end
context
"conditions"
do
context
"if"
do
it
"ignores any scopes whose `if` condition returns false"
do
token
=
double
(
"token"
,
scopes:
[
:api
,
:read_user
])
it
"ignores any scopes whose `if` condition returns false"
do
token
=
double
(
"token"
,
scopes:
[
:api
,
:read_user
])
expect
(
described_class
.
new
(
token
,
request:
request
).
include_any_scope?
([{
name: :api
,
if:
->
(
_
)
{
false
}
}])).
to
be
(
false
)
end
expect
(
described_class
.
new
(
token
,
request:
request
).
include_any_scope?
([{
name: :api
,
if:
->
(
_
)
{
false
}
}])).
to
be
(
false
)
end
it
"does not ignore scopes whose `if` condition is not set"
do
token
=
double
(
"token"
,
scopes:
[
:api
,
:read_user
])
it
"does not ignore scopes whose `if` condition is not set"
do
token
=
double
(
"token"
,
scopes:
[
:api
,
:read_user
])
expect
(
described_class
.
new
(
token
,
request:
request
).
include_any_scope?
([{
name: :api
,
if:
->
(
_
)
{
false
}
},
{
name: :read_user
}])).
to
be
(
true
)
end
expect
(
described_class
.
new
(
token
,
request:
request
).
include_any_scope?
([{
name: :api
,
if:
->
(
_
)
{
false
}
},
{
name: :read_user
}])).
to
be
(
true
)
end
it
"does not ignore scopes whose `if` condition returns true"
do
token
=
double
(
"token"
,
scopes:
[
:api
,
:read_user
])
it
"does not ignore scopes whose `if` condition returns true"
do
token
=
double
(
"token"
,
scopes:
[
:api
,
:read_user
])
expect
(
described_class
.
new
(
token
,
request:
request
).
include_any_scope?
([{
name: :api
,
if:
->
(
_
)
{
true
}
},
{
name: :read_user
,
if:
->
(
_
)
{
false
}
}])).
to
be
(
true
)
end
expect
(
described_class
.
new
(
token
,
request:
request
).
include_any_scope?
([{
name: :api
,
if:
->
(
_
)
{
true
}
},
{
name: :read_user
,
if:
->
(
_
)
{
false
}
}])).
to
be
(
true
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录