Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
25e44edc
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,发现更多精彩内容 >>
提交
25e44edc
编写于
7月 25, 2017
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow admin to read_users_list even if it's restricted
上级
d95e6da0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
37 addition
and
8 deletion
+37
-8
app/policies/global_policy.rb
app/policies/global_policy.rb
+1
-1
changelogs/unreleased/35478-allow-admin-to-read-user-list.yml
...gelogs/unreleased/35478-allow-admin-to-read-user-list.yml
+4
-0
spec/policies/global_policy_spec.rb
spec/policies/global_policy_spec.rb
+20
-0
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+12
-7
未找到文件。
app/policies/global_policy.rb
浏览文件 @
25e44edc
...
...
@@ -44,7 +44,7 @@ class GlobalPolicy < BasePolicy
prevent
:log_in
end
rule
{
~
restricted_public_level
}.
policy
do
rule
{
admin
|
~
restricted_public_level
}.
policy
do
enable
:read_users_list
end
end
changelogs/unreleased/35478-allow-admin-to-read-user-list.yml
0 → 100644
浏览文件 @
25e44edc
---
title
:
Allow admin to read_users_list even if it's restricted
merge_request
:
13066
author
:
spec/policies/global_policy_spec.rb
浏览文件 @
25e44edc
...
...
@@ -30,5 +30,25 @@ describe GlobalPolicy, models: true do
it
{
is_expected
.
to
be_allowed
(
:read_users_list
)
}
end
end
context
"for an admin"
do
let
(
:current_user
)
{
create
(
:admin
)
}
context
"when the public level is restricted"
do
before
do
stub_application_setting
(
restricted_visibility_levels:
[
Gitlab
::
VisibilityLevel
::
PUBLIC
])
end
it
{
is_expected
.
to
be_allowed
(
:read_users_list
)
}
end
context
"when the public level is not restricted"
do
before
do
stub_application_setting
(
restricted_visibility_levels:
[])
end
it
{
is_expected
.
to
be_allowed
(
:read_users_list
)
}
end
end
end
end
spec/requests/api/users_spec.rb
浏览文件 @
25e44edc
...
...
@@ -55,17 +55,22 @@ describe API::Users do
context
"when public level is restricted"
do
before
do
stub_application_setting
(
restricted_visibility_levels:
[
Gitlab
::
VisibilityLevel
::
PUBLIC
])
allow_any_instance_of
(
API
::
Helpers
).
to
receive
(
:authenticate!
).
and_return
(
true
)
end
it
"renders 403"
do
get
api
(
"/users"
)
expect
(
response
).
to
have_http_status
(
403
)
context
'when authenticate as a regular user'
do
it
"renders 403"
do
get
api
(
"/users"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
403
)
end
end
it
"renders 404"
do
get
api
(
"/users/
#{
user
.
id
}
"
)
expect
(
response
).
to
have_http_status
(
404
)
context
'when authenticate as an admin'
do
it
"renders 200"
do
get
api
(
"/users"
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录