Add websocket tunneling support #131
Conversation
| "time" | ||
|
|
||
| onet "github.com/Jigsaw-Code/outline-ss-server/net" | ||
| "github.com/gorilla/websocket" |
There was a problem hiding this comment.
Let's use https://pkg.go.dev/golang.org/x/net/websocket instead if it provides the features we need.
| @@ -0,0 +1,27 @@ | |||
| -----BEGIN CERTIFICATE----- | |||
There was a problem hiding this comment.
What is this file? Just a test example? If so, give a clearer name. Also, move it to the websocket folder.
| @@ -0,0 +1,131 @@ | |||
| package main | |||
| @@ -212,19 +212,25 @@ func readConfig(filename string) (*Config, error) { | |||
|
|
|||
| @@ -143,6 +143,8 @@ type TCPService interface { | |||
| Stop() error | |||
| return nil, err | ||
| } | ||
|
|
||
| ssw := ss.NewShadowsocksWriter(proxyConn, c.cipher) |
There was a problem hiding this comment.
The Websocket code shouldn't know about Shadowsocks.
Instead, make the Shadowsocks client code take a server Dialer.
Then the server dialer could be a direct connection, or a Websocket connection.
There was a problem hiding this comment.
With that approach, we don't need to worry about the wiring here. outline-go-tun2socks will have the code that takes a config and translates that to object wiring.
There was a problem hiding this comment.
We will need to check how much bigger outline-go-tun2socks will be with this change, and how it will affect memory on iOS.
| @@ -0,0 +1,59 @@ | |||
| package main | |||
There was a problem hiding this comment.
We may have a server here for testing, but I'd rather have something simple that does tcp over websocket.
Three main things here:
websocket/websocket.go: Takes thewebsocket.Connfrom the gorilla/websocket package and wraps it in a struct that implements theonet.DuplexConninterface. With this, we can treat a websocket connection as a normal streaming protocol similar to TCP.websocket.go: ImplementsRunWebsocketServerwhich starts a websocket server on 443. The websocket server expects to see a port number in the URL path of connections, and it uses that to multiplex the connection to their respectiveTCPServices.client/websocket.go: Implementsclient.NewWebsocketClientwhich is similar toclient.NewClientexcept that instead of a plain TCP connection, it sends the Shadowsocks content over a websocket connection.--
This is only TCP for now, however a similar thing can be done for UDP in a separate PR.