refactor(ssh): move http request for web endpoint to target implementation

Author: henrybarreto

ssh/http/handlers.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -110,13 +109,10 @@ func (h *Handlers) HandleHTTPProxy(c echo.Context) error {
 		"device":     endpoint.DeviceUID,
 	})
 
-	// Prepare V1 CONNECT handshake request (only used if version=V1 inside target implementation)
-	handshakeReq, _ := http.NewRequest(http.MethodConnect, fmt.Sprintf("/http/proxy/%s:%d", endpoint.Host, endpoint.Port), nil)
 	conn, err := h.Dialer.DialTo(c.Request().Context(), endpoint.Namespace, endpoint.DeviceUID, dialer.HTTPProxyTarget{
-		RequestID:        requestID,
-		Host:             endpoint.Host,
-		Port:             endpoint.Port,
-		HandshakeRequest: handshakeReq,
+		RequestID: requestID,
+		Host:      endpoint.Host,
+		Port:      endpoint.Port,
 	})
 	if err != nil {
 		logger.WithError(err).Error("failed to dial to device")

ssh/pkg/dialer/target.go

@@ -77,20 +77,20 @@ func (t SSHCloseTarget) prepare(conn net.Conn, version ConnectionVersion) (net.C
 // final HTTP request (with rewritten Host + URL) directly to the
 // returned connection.
 type HTTPProxyTarget struct {
-	RequestID        string
-	Host             string
-	Port             int
-	HandshakeRequest *http.Request // original inbound request used for V1 CONNECT-style handshake
+	RequestID string
+	Host      string
+	Port      int
 }
 
 func (t HTTPProxyTarget) prepare(conn net.Conn, version ConnectionVersion) (net.Conn, error) { // nolint:ireturn
 	switch version {
 	case ConnectionVersion1:
 		// Write initial handshake request and expect 200 OK.
-		if err := t.HandshakeRequest.Write(conn); err != nil {
+		handshakeReq, _ := http.NewRequest(http.MethodConnect, fmt.Sprintf("/http/proxy/%s:%d", t.Host, t.Port), nil)
+		if err := handshakeReq.Write(conn); err != nil {
 			return nil, err
 		}
-		resp, err := http.ReadResponse(bufio.NewReader(conn), t.HandshakeRequest)
+		resp, err := http.ReadResponse(bufio.NewReader(conn), handshakeReq)
 		if err != nil {
 			return nil, err
 		}