feat: add http server

Author: nimatrueway

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.0-alpha8
+
+- Add a new service type: embedded_http_proxy
+
 ## v1.0-alpha7
 
 - Simply print error on failed preflight script instead of executing `printf`

config.toml

@@ -67,8 +67,13 @@ bind = "tcp://127.0.0.1:10690"
 ## generate that using "txeh" and "mkcert"
 #certificate = "cert/unbound-ssh.local-key.pem"
 
+#[[service]]
+## embedded_http_proxy service is a simple http proxy service
+#type = "embedded_http_proxy"
+#bind = "tcp://127.0.0.1:10692"
+
 #[[service]]
 ## port_forward service is a simple port forwarding service
 #type = "port_forward"
-#bind = "tcp://127.0.0.1:10692"
+#bind = "tcp://127.0.0.1:10693"
 #destination = "tcp://httpbin.org:80"

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	github.com/creack/pty v1.1.21
+ 	github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5
 	github.com/gliderlabs/ssh v0.3.7
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/yamux v0.1.1

go.sum

@@ -17,6 +17,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5 h1:m62nsMU279qRD9PQSWD1l66kmkXzuYcnVJqL4XLeV2M=
+github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
 github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -45,6 +49,7 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab h1:ZjX6I48eZSFetPb41dHudEyVr5v953N15TsNZXlkcWY=
 github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab/go.mod h1:/PfPXh0EntGc3QAAyUaviy4S9tzy4Zp0e2ilq4voC6E=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=

internal/config/config.go

@@ -94,14 +94,15 @@ func (s *CodecType) UnmarshalText(text []byte) error {
 type ServiceType string
 
 const (
-	EmbeddedWebdav ServiceType = "embedded_webdav"
-	EmbeddedSsh    ServiceType = "embedded_ssh"
-	PortForward    ServiceType = "port_forward"
-	Echo           ServiceType = "echo"
+	EmbeddedWebdav    ServiceType = "embedded_webdav"
+	EmbeddedSsh       ServiceType = "embedded_ssh"
+	EmbeddedHttpProxy ServiceType = "embedded_http_proxy"
+	PortForward       ServiceType = "port_forward"
+	Echo              ServiceType = "echo"
 )
 
 func (s *ServiceType) UnmarshalText(text []byte) error {
-	validValues := []ServiceType{EmbeddedWebdav, EmbeddedSsh, PortForward, Echo}
+	validValues := []ServiceType{EmbeddedWebdav, EmbeddedSsh, EmbeddedHttpProxy, PortForward, Echo}
 	serviceType := ServiceType(text)
 	if !lo.Contains(validValues, serviceType) {
 		return fmt.Errorf("invalid service type: %s", text)

internal/service/server_type_httpproxy.go

@@ -0,0 +1,48 @@
+package service
+
+import (
+	"github.com/elazarl/goproxy"
+	"github.com/ztrue/tracerr"
+	"net"
+	"net/http"
+)
+
+type httpServer struct {
+	server *http.Server
+	l      net.Listener
+}
+
+func CreateHttpServer() (Server, error) {
+	proxy := httpServer{
+		server: &http.Server{
+			Handler: goproxy.NewProxyHttpServer(),
+		},
+	}
+	return &proxy, nil
+}
+
+func (f *httpServer) Serve(l net.Listener) error {
+	f.l = l
+	if err := f.server.Serve(l); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (f *httpServer) Close() (err error) {
+	errs := make([]error, 0)
+
+	if err = f.l.Close(); err != nil {
+		errs = append(errs, err)
+	}
+
+	if err = f.server.Close(); err != nil {
+		errs = append(errs, err)
+	}
+
+	if len(errs) > 0 {
+		return tracerr.Errorf("failed to close http proxy server: %v", errs)
+	} else {
+		return nil
+	}
+}

internal/service/server_type_webdav.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"github.com/sirupsen/logrus"
+	"github.com/ztrue/tracerr"
 	"golang.org/x/net/webdav"
 	"net"
 	"net/http"
@@ -51,5 +52,9 @@ func (f *WebdavServer) Close() (err error) {
 		errs = append(errs, err)
 	}
 
-	return nil
+	if len(errs) > 0 {
+		return tracerr.Errorf("failed to close http proxy server: %v", errs)
+	} else {
+		return nil
+	}
 }

internal/service/service_manager_spy.go

@@ -82,6 +82,8 @@ func (sm *SpyServiceManager) justLaunch(idx int) (net.Addr, Server, error) {
 	var server Server
 	if service.Type == config.EmbeddedWebdav {
 		server, err = CreateWebdavServer()
+	} else if service.Type == config.EmbeddedHttpProxy {
+		server, err = CreateHttpServer()
 	} else if service.Type == config.EmbeddedSsh {
 		server, err = CreateSshServer(service.Certificate)
 	} else if service.Type == config.Echo {