Get SSH username from workspacekit

Author: aledbf

components/ws-proxy/pkg/sshproxy/server.go

@@ -7,7 +7,10 @@ package sshproxy
 import (
 	"context"
 	"crypto/subtle"
+	"fmt"
+	"io"
 	"net"
+	"net/http"
 	"regexp"
 	"strings"
 	"time"
@@ -318,6 +321,13 @@ func (s *Server) HandleConn(c net.Conn) {
 		}
 
 		session.WorkspacePrivateKey = key
+
+		// obtain the SSH username from workspacekit.
+		workspacekitPort := "22998"
+		userName, err = workspaceSSHUsername(ctx, wsInfo.IPAddress, workspacekitPort)
+		if err != nil {
+			log.WithField("instanceId", wsInfo.InstanceID).WithError(err).Warn("failed to retrieve the SSH username. Using the default.")
+		}
 	} else {
 		key, userName, err = s.GetWorkspaceSSHKey(ctx, wsInfo.IPAddress, supervisorPort)
 		if err != nil {
@@ -494,3 +504,23 @@ func (s *Server) Serve(l net.Listener) error {
 		go s.HandleConn(conn)
 	}
 }
+
+func workspaceSSHUsername(ctx context.Context, workspaceIP string, workspacekitPort string) (string, error) {
+	req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("http://%v:%v/ssh/username", workspaceIP, workspacekitPort), nil)
+	if err != nil {
+		return "", err
+	}
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	username, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	return string(username), nil
+}