diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-06-29 10:43:41 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-30 16:06:03 +0300 |
| commit | 3c88a7869b87693ba8c3fb9814d39437dd569a31 (patch) | |
| tree | 4335dcc017f75c382757047a37d7936704cfe9d5 /app/policies/global_policy.rb | |
| parent | c39e4ccfb7cb76b9bdb613399aba2c2467b77751 (diff) | |
Implement review comments for !12445 from @godfat and @rymai.
- Use `GlobalPolicy` to authorize the users that a non-authenticated user can
fetch from `/api/v4/users`. We allow access if the `Gitlab::VisibilityLevel::PUBLIC`
visibility level is not restricted.
- Further, as before, `/api/v4/users` is only accessible to unauthenticated users if
the `username` parameter is passed.
- Turn off `authenticate!` for the `/api/v4/users` endpoint by matching on the actual
route + method, rather than the description.
- Change the type of `current_user` check in `UsersFinder` to be more
compatible with EE.
Diffstat (limited to 'app/policies/global_policy.rb')
| -rw-r--r-- | app/policies/global_policy.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb index 2683aaad981..e9be43a5037 100644 --- a/app/policies/global_policy.rb +++ b/app/policies/global_policy.rb @@ -1,9 +1,10 @@ class GlobalPolicy < BasePolicy def rules + can! :read_users_list unless restricted_public_level? + return unless @user can! :create_group if @user.can_create_group - can! :read_users_list unless @user.blocked? || @user.internal? can! :log_in unless @user.access_locked? |