diff options
author | Stan Hu <stanhu@gmail.com> | 2018-01-06 11:41:13 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-01-09 08:23:24 +0300 |
commit | eaf9088ba8abe8c847a09860b55a86c7ae0d5987 (patch) | |
tree | 6aa8b076c5f598f8c0efa9ea7ef8d4e08870839a /lib/api/helpers.rb | |
parent | 7b2f9af4486b26512a2fefb3f385a2b8fa65a068 (diff) |
Save user ID and username in Grape API log (api_json.log)
This will enable admins to identify who actually made the API request.
Relates to #36960
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r-- | lib/api/helpers.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index bf388163ec8..d6ce368efd5 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -5,6 +5,7 @@ module API SUDO_HEADER = "HTTP_SUDO".freeze SUDO_PARAM = :sudo + API_USER_ENV = 'gitlab.api.user'.freeze def declared_params(options = {}) options = { include_parent_namespaces: false }.merge(options) @@ -48,10 +49,16 @@ module API validate_access_token!(scopes: scopes_registered_for_endpoint) unless sudo? + save_current_user_in_env(@current_user) if @current_user + @current_user end # rubocop:enable Gitlab/ModuleWithInstanceVariables + def save_current_user_in_env(user) + env[API_USER_ENV] = { user_id: user.id, username: user.username } + end + def sudo? initial_current_user != current_user end |