summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2017-06-29 07:43:41 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-06-30 13:06:03 +0000
commit3c88a7869b87693ba8c3fb9814d39437dd569a31 (patch)
tree4335dcc017f75c382757047a37d7936704cfe9d5 /app/finders
parentc39e4ccfb7cb76b9bdb613399aba2c2467b77751 (diff)
downloadgitlab-ce-3c88a7869b87693ba8c3fb9814d39437dd569a31.tar.gz
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/finders')
-rw-r--r--app/finders/users_finder.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index 0534317df8f..07deceb827b 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -27,11 +27,8 @@ class UsersFinder
users = by_search(users)
users = by_blocked(users)
users = by_active(users)
-
- if current_user
- users = by_external_identity(users)
- users = by_external(users)
- end
+ users = by_external_identity(users)
+ users = by_external(users)
users
end
@@ -63,13 +60,13 @@ class UsersFinder
end
def by_external_identity(users)
- return users unless current_user.admin? && params[:extern_uid] && params[:provider]
+ return users unless current_user&.admin? && params[:extern_uid] && params[:provider]
users.joins(:identities).merge(Identity.with_extern_uid(params[:provider], params[:extern_uid]))
end
def by_external(users)
- return users = users.where.not(external: true) unless current_user.admin?
+ return users = users.where.not(external: true) unless current_user&.admin?
return users unless params[:external]
users.external