Merge branch '667-resolve-panics-happening-on-handling-ssh-connection-by-gitlab-sshd' into 'main'

Ensure context is not nil before processing

Closes #667

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/820



Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Jaime Martinez <jmartinez@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

internal/sshd/sshd.go

@@ -195,6 +195,7 @@ func (s *Server) handleConn(ctx context.Context, nconn net.Conn) {
 	conn := newConnection(s.Config, nconn)
 
 	var ctxWithLogMetadata context.Context
+
 	conn.handle(ctx, s.serverConfig.get(ctx), func(ctx context.Context, sconn *ssh.ServerConn, channel ssh.Channel, requests <-chan *ssh.Request) error {
 		session := &session{
 			cfg:                 s.Config,
@@ -236,6 +237,10 @@ func (s *Server) proxyPolicy() (proxyproto.PolicyFunc, error) {
 func extractMetaDataFromContext(ctx context.Context) command.LogMetadata {
 	metadata := command.LogMetadata{}
 
+	if ctx == nil {
+		return metadata
+	}
+
 	if ctx.Value("metadata") != nil {
 		metadata = ctx.Value("metadata").(command.LogMetadata)
 	}

internal/sshd/sshd_test.go

@@ -353,17 +353,23 @@ func TestExtractMetaDataFromContext(t *testing.T) {
 	rootNameSpace := "flightjs"
 	project := fmt.Sprintf("%s/Flight", rootNameSpace)
 	username := "alex-doe"
-	ctxWithLogMetadata := context.WithValue(context.Background(), "metadata", command.NewLogMetadata(project, username))
+	ctx := context.WithValue(context.Background(), "metadata", command.NewLogMetadata(project, username))
 
-	metadata := extractMetaDataFromContext(ctxWithLogMetadata)
+	metadata := extractMetaDataFromContext(ctx)
 
 	require.Equal(t, command.LogMetadata{Project: project, Username: username, RootNamespace: rootNameSpace}, metadata)
 }
 
 func TestExtractMetaDataFromContextWithoutMetaData(t *testing.T) {
-	ctxWithLogMetadata := context.Background()
+	metadata := extractMetaDataFromContext(context.Background())
 
-	metadata := extractMetaDataFromContext(ctxWithLogMetadata)
+	require.Equal(t, command.LogMetadata{}, metadata)
+}
+
+func TestExtractMetaDataFromNilContext(t *testing.T) {
+	var ctx context.Context
+
+	metadata := extractMetaDataFromContext(ctx)
 
 	require.Equal(t, command.LogMetadata{}, metadata)
 }