Merge branch 'sh-log-ssh-key-details' into 'master'

Log SSH key details

See merge request gitlab-org/gitlab-shell!398

internal/command/receivepack/gitalycall_test.go

@@ -54,4 +54,6 @@ func TestReceivePack(t *testing.T) {
 	require.Contains(t, entries[1].Message, "executing git command")
 	require.Contains(t, entries[1].Message, "command=git-receive-pack")
 	require.Contains(t, entries[1].Message, "remote_ip=127.0.0.1")
+	require.Contains(t, entries[1].Message, "gl_key_type=key")
+	require.Contains(t, entries[1].Message, "gl_key_id=123")
 }

internal/command/uploadarchive/gitalycall_test.go

@@ -49,4 +49,6 @@ func TestUploadPack(t *testing.T) {
 	require.Equal(t, logrus.InfoLevel, entries[1].Level)
 	require.Contains(t, entries[1].Message, "executing git command")
 	require.Contains(t, entries[1].Message, "command=git-upload-archive")
+	require.Contains(t, entries[1].Message, "gl_key_type=key")
+	require.Contains(t, entries[1].Message, "gl_key_id=123")
 }

internal/command/uploadpack/gitalycall_test.go

@@ -45,6 +45,8 @@ func TestUploadPack(t *testing.T) {
 	assert.Equal(t, 2, len(entries))
 	require.Contains(t, entries[1].Message, "executing git command")
 	require.Contains(t, entries[1].Message, "command=git-upload-pack")
+	require.Contains(t, entries[1].Message, "gl_key_type=key")
+	require.Contains(t, entries[1].Message, "gl_key_id=123")
 
 	for k, v := range map[string]string{
 		"gitaly-feature-cache_invalidator":        "true",

internal/gitlabnet/accessverifier/client.go

@@ -55,6 +55,8 @@ type Response struct {
 	Message          string        `json:"message"`
 	Repo             string        `json:"gl_repository"`
 	UserId           string        `json:"gl_id"`
+	KeyType          string        `json:"gl_key_type"`
+	KeyId            int           `json:"gl_key_id"`
 	Username         string        `json:"gl_username"`
 	GitConfigOptions []string      `json:"git_config_options"`
 	Gitaly           Gitaly        `json:"gitaly"`

internal/handler/exec.go

@@ -66,6 +66,8 @@ func (gc *GitalyCommand) LogExecution(repository *pb.Repository, response *acces
 		"username":        response.Username,
 		"git_protocol":    protocol,
 		"remote_ip":       sshenv.LocalAddr(),
+		"gl_key_type":     response.KeyType,
+		"gl_key_id":       response.KeyId,
 	}
 
 	log.WithFields(fields).Info("executing git command")

internal/testhelper/requesthandlers/requesthandlers.go

@@ -34,8 +34,10 @@ func BuildAllowedWithGitalyHandlers(t *testing.T, gitalyAddress string) []testse
 			Path: "/api/v4/internal/allowed",
 			Handler: func(w http.ResponseWriter, r *http.Request) {
 				body := map[string]interface{}{
-					"status": true,
-					"gl_id":  "1",
+					"status":      true,
+					"gl_id":       "1",
+					"gl_key_type": "key",
+					"gl_key_id":   123,
 					"gitaly": map[string]interface{}{
 						"repository": map[string]interface{}{
 							"storage_name":                     "storage_name",