reverse proxy

client/client.go

@@ -32,7 +32,7 @@ type WebSocksClient struct {
 	Stats     *core.Stats
 }
 
-func (client *WebSocksClient) Listen() (err error) {
+func (client *WebSocksClient) Run() (err error) {
 	listener, err := net.ListenTCP("tcp", client.ListenAddr)
 	if err != nil {
 		return err

client/web.go

@@ -89,7 +89,7 @@ func (app *WebSocksClientApp) StartClient(ctx *macaron.Context) {
 	app.running = true
 
 	go func() {
-		err = websocksClient.Listen()
+		err = websocksClient.Run()
 		if err != nil {
 			log.Error(err.Error())
 		}

server/config.go

@@ -1,5 +1,13 @@
 package server
 
+import (
+	"time"
+
+	"github.com/gorilla/websocket"
+	"github.com/juju/loggo"
+	"github.com/lzjluzijie/websocks/core"
+)
+
 type Config struct {
 	ListenAddr   string
 	Pattern      string
@@ -8,3 +16,19 @@ type Config struct {
 	KeyPath      string
 	ReverseProxy string
 }
+
+func (config *Config) GetServer() (server *WebSocksServer) {
+	server = &WebSocksServer{
+		Config: config,
+		Upgrader: &websocket.Upgrader{
+			ReadBufferSize:   4 * 1024,
+			WriteBufferSize:  4 * 1024,
+			HandshakeTimeout: 10 * time.Second,
+		},
+		CreatedAt: time.Now(),
+		Stats:     core.NewStats(),
+	}
+
+	logger.SetLogLevel(loggo.DEBUG)
+	return
+}

server/server.go

@@ -7,6 +7,9 @@ import (
 	"sync"
 	"time"
 
+	"net/http/httputil"
+	"net/url"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"github.com/juju/loggo"
@@ -28,22 +31,6 @@ type WebSocksServer struct {
 	Stats     *core.Stats
 }
 
-func (config *Config) GetServer() (server *WebSocksServer) {
-	server = &WebSocksServer{
-		Config: config,
-		Upgrader: &websocket.Upgrader{
-			ReadBufferSize:   4 * 1024,
-			WriteBufferSize:  4 * 1024,
-			HandshakeTimeout: 10 * time.Second,
-		},
-		CreatedAt: time.Now(),
-		Stats:     core.NewStats(),
-	}
-
-	logger.SetLogLevel(loggo.DEBUG)
-	return
-}
-
 func (server *WebSocksServer) HandleWebSocket(c *gin.Context) {
 	w := c.Writer
 	r := c.Request
@@ -97,10 +84,21 @@ func (server *WebSocksServer) DialRemote(host string) (conn net.Conn, err error)
 	return
 }
 
-func (server *WebSocksServer) Listen() (err error) {
+func (server *WebSocksServer) Run() (err error) {
 	r := gin.Default()
 	r.GET(server.Pattern, server.HandleWebSocket)
 
+	if server.ReverseProxy != "" {
+		remote, err := url.Parse(server.ReverseProxy)
+		if err != nil {
+			panic(err)
+		}
+		proxy := httputil.NewSingleHostReverseProxy(remote)
+		r.NoRoute(func(c *gin.Context) {
+			proxy.ServeHTTP(c.Writer, c.Request)
+		})
+	}
+
 	s := http.Server{
 		Addr:    server.ListenAddr,
 		Handler: r,

websocks.go

@@ -85,7 +85,7 @@ func main() {
 						return
 					}
 
-					err = wc.Listen()
+					err = wc.Run()
 					return
 				},
 			},
@@ -119,7 +119,7 @@ func main() {
 						Usage: "tls key path",
 					},
 					cli.StringFlag{
-						Name:  "proxy",
+						Name:  "reverse-proxy",
 						Value: "",
 						Usage: "reverse proxy url, leave blank to disable",
 					},
@@ -131,7 +131,7 @@ func main() {
 					tls := c.Bool("tls")
 					certPath := c.String("cert")
 					keyPath := c.String("key")
-					//proxy := c.String("proxy")
+					reverseProxy := c.String("reverse-proxy")
 
 					if debug {
 						logger.SetLogLevel(loggo.DEBUG)
@@ -140,16 +140,17 @@ func main() {
 					logger.Infof("Log level %s", logger.LogLevel().String())
 
 					config := server.Config{
-						Pattern:    pattern,
-						ListenAddr: listenAddr,
-						TLS:        tls,
-						CertPath:   certPath,
-						KeyPath:    keyPath,
+						Pattern:      pattern,
+						ListenAddr:   listenAddr,
+						TLS:          tls,
+						CertPath:     certPath,
+						KeyPath:      keyPath,
+						ReverseProxy: reverseProxy,
 					}
 
 					websocksServer := config.GetServer()
 					logger.Infof("Listening at %s", listenAddr)
-					err = websocksServer.Listen()
+					err = websocksServer.Run()
 					if err != nil {
 						return
 					}