diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-19 14:47:16 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-19 14:47:16 +1000 |
| commit | b07facd994571046b2f0647fe888216cd7c9f147 (patch) | |
| tree | d4f8c3e9ab69eae97e5a543a9a14da0b85764ed5 | |
| parent | 3ef2adf315507d79b3de2913d5401874b87e5202 (diff) | |
| download | gitlab-shell-203-gitlab-shell-log-doesn-t-differentiate-between-deploy-keys-and-user-keys.tar.gz | |
Log check_access result, including gl_type203-gitlab-shell-log-doesn-t-differentiate-between-deploy-keys-and-user-keys
| -rw-r--r-- | lib/gitlab_access_status.rb | 10 | ||||
| -rw-r--r-- | lib/gitlab_net.rb | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb index 22e11a2..fa04d3a 100644 --- a/lib/gitlab_access_status.rb +++ b/lib/gitlab_access_status.rb @@ -4,12 +4,12 @@ class GitAccessStatus HTTP_MULTIPLE_CHOICES = '300'.freeze attr_reader :message, :gl_repository, :gl_project_path, :gl_id, :gl_username, - :gitaly, :git_protocol, :git_config_options, :payload, + :gl_type, :gitaly, :git_protocol, :git_config_options, :payload, :gl_console_messages def initialize(status, status_code, message, gl_repository: nil, gl_project_path: nil, gl_id: nil, - gl_username: nil, gitaly: nil, git_protocol: nil, + gl_username: nil, gl_type: nil, gitaly: nil, git_protocol: nil, git_config_options: nil, payload: nil, gl_console_messages: []) @status = status @status_code = status_code @@ -18,6 +18,7 @@ class GitAccessStatus @gl_project_path = gl_project_path @gl_id = gl_id @gl_username = gl_username + @gl_type = gl_type @git_config_options = git_config_options @gitaly = gitaly @git_protocol = git_protocol @@ -34,6 +35,7 @@ class GitAccessStatus gl_project_path: values["gl_project_path"], gl_id: values["gl_id"], gl_username: values["gl_username"], + gl_type: values["gl_type"], git_config_options: values["git_config_options"], gitaly: values["gitaly"], git_protocol: values["git_protocol"], @@ -48,4 +50,8 @@ class GitAccessStatus def custom_action? @status_code == HTTP_MULTIPLE_CHOICES end + + def success? + @status == true + end end diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index f8397f7..7efc170 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -31,7 +31,12 @@ class GitlabNet # rubocop:disable Metrics/ClassLength url = "#{internal_api_endpoint}/allowed" resp = post(url, params) - access_status_from_response(resp) + access_status_from_response(resp) do |access_status| + $logger.info('check_access result', success: access_status.success?, + gl_id: access_status.gl_id, + gl_username: access_status.gl_username, + gl_type: access_status.gl_type) + end end def discover(who) |