wss: added a new scheme wss for convenience

This commit is contained in:
nadoo committed 2021-07-09 19:17:16 +08:00
1 parent a62674838e
commit 15f9e74e39
11 files changed
+166 -75

No files matched your search

+3 -5
View File
@@ -2,6 +2,7 @@ package trojan
import (
"crypto/tls"
"fmt"
"net"
"github.com/nadoo/glider/log"
@@ -14,10 +15,8 @@ import (
func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
t, err := NewTrojan(s, d, nil)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojanc] create instance error: %s", err)
}
t.withTLS = false
return t, err
}
@@ -26,8 +25,7 @@ func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
func NewTrojanDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
t, err := NewTrojan(s, d, nil)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojan] create instance error: %s", err)
}
t.tlsConfig = &tls.Config{
+4 -6
View File
@@ -19,8 +19,7 @@ import (
func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
t, err := NewTrojan(s, nil, p)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojanc] create instance error: %s", err)
}
t.withTLS = false
@@ -31,8 +30,7 @@ func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
func NewTrojanServer(s string, p proxy.Proxy) (proxy.Server, error) {
t, err := NewTrojan(s, nil, p)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojan] create instance error: %s", err)
}
if t.certFile == "" || t.keyFile == "" {
@@ -41,8 +39,8 @@ func NewTrojanServer(s string, p proxy.Proxy) (proxy.Server, error) {
cert, err := tls.LoadX509KeyPair(t.certFile, t.keyFile)
if err != nil {
log.F("[trojan] unable to load cert: %s, key %s", t.certFile, t.keyFile)
return nil, err
return nil, fmt.Errorf("[trojan] unable to load cert: %s, key %s, error: %s",
t.certFile, t.keyFile, err)
}
t.tlsConfig = &tls.Config{
+1 -5
View File
@@ -55,7 +55,7 @@ func NewTrojan(s string, d proxy.Dialer, p proxy.Proxy) (*Trojan, error) {
serverName: query.Get("serverName"),
certFile: query.Get("cert"),
keyFile: query.Get("key"),
// fallback: "127.0.0.1:80",
fallback: query.Get("fallback"),
}
if _, port, _ := net.SplitHostPort(t.addr); port == "" {
@@ -76,9 +76,5 @@ func NewTrojan(s string, d proxy.Dialer, p proxy.Proxy) (*Trojan, error) {
hash.Write([]byte(pass))
hex.Encode(t.pass[:], hash.Sum(nil))
if fb := u.Query().Get("fallback"); fb != "" {
t.fallback = fb
}
return t, nil
}
+32 -5
View File
@@ -1,7 +1,9 @@
package ws
import (
"crypto/tls"
"errors"
"fmt"
"io"
"net"
"net/textproto"
@@ -10,13 +12,30 @@ import (
"github.com/nadoo/glider/proxy"
)
func init() {
proxy.RegisterDialer("ws", NewWSDialer)
}
// NewWSDialer returns a ws proxy dialer.
func NewWSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
return NewWS(s, d, nil)
w, err := NewWS(s, d, nil, false)
if err != nil {
return nil, fmt.Errorf("[ws] create instance error: %s", err)
}
return w, err
}
// NewWSSDialer returns a wss proxy dialer.
func NewWSSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
w, err := NewWS(s, d, nil, true)
if err != nil {
return nil, fmt.Errorf("[wss] create instance error: %s", err)
}
w.tlsConfig = &tls.Config{
ServerName: w.serverName,
InsecureSkipVerify: w.skipVerify,
NextProtos: []string{"http/1.1"},
MinVersion: tls.VersionTLS12,
}
return w, err
}
// Addr returns forwarder's address.
@@ -34,6 +53,14 @@ func (s *WS) Dial(network, addr string) (net.Conn, error) {
return nil, err
}
if s.withTLS {
tlsConn := tls.Client(rc, s.tlsConfig)
if err := tlsConn.Handshake(); err != nil {
return nil, err
}
rc = tlsConn
}
return s.NewClientConn(rc)
}
+48 -7
View File
@@ -1,7 +1,9 @@
package ws
import (
"crypto/tls"
"errors"
"fmt"
"io"
"net"
"net/textproto"
@@ -12,16 +14,12 @@ import (
"github.com/nadoo/glider/proxy"
)
func init() {
proxy.RegisterServer("ws", NewWSServer)
}
// NewWSServer returns a ws transport server.
func NewWSServer(s string, p proxy.Proxy) (proxy.Server, error) {
schemes := strings.SplitN(s, ",", 2)
w, err := NewWS(schemes[0], nil, p)
w, err := NewWS(schemes[0], nil, p, false)
if err != nil {
return nil, err
return nil, fmt.Errorf("[ws] create instance error: %s", err)
}
if len(schemes) > 1 {
@@ -34,6 +32,39 @@ func NewWSServer(s string, p proxy.Proxy) (proxy.Server, error) {
return w, nil
}
// NewWSSServer returns a wss transport server.
func NewWSSServer(s string, p proxy.Proxy) (proxy.Server, error) {
schemes := strings.SplitN(s, ",", 2)
w, err := NewWS(schemes[0], nil, p, true)
if err != nil {
return nil, fmt.Errorf("[wss] create instance error: %s", err)
}
if len(schemes) > 1 {
w.server, err = proxy.ServerFromURL(schemes[1], p)
if err != nil {
return nil, err
}
}
if w.certFile == "" || w.keyFile == "" {
return nil, errors.New("[wss] cert and key file path must be spcified")
}
cert, err := tls.LoadX509KeyPair(w.certFile, w.keyFile)
if err != nil {
return nil, fmt.Errorf("[ws] unable to load cert: %s, key %s, error: %s",
w.certFile, w.keyFile, err)
}
w.tlsConfig = &tls.Config{
Certificates: []tls.Certificate{cert},
MinVersion: tls.VersionTLS12,
}
return w, nil
}
// ListenAndServe listens on server's addr and serves connections.
func (s *WS) ListenAndServe() {
l, err := net.Listen("tcp", s.addr)
@@ -43,7 +74,7 @@ func (s *WS) ListenAndServe() {
}
defer l.Close()
log.F("[ws] listening TCP on %s", s.addr)
log.F("[ws] listening TCP on %s, with TLS: %v", s.addr, s.withTLS)
for {
c, err := l.Accept()
@@ -58,6 +89,16 @@ func (s *WS) ListenAndServe() {
// Serve serves a connection.
func (s *WS) Serve(cc net.Conn) {
if s.withTLS {
tlsConn := tls.Server(cc, s.tlsConfig)
err := tlsConn.Handshake()
if err != nil {
log.F("[ws] error in tls handshake: %s", err)
return
}
cc = tlsConn
}
c, err := s.NewServerConn(cc)
if err != nil {
log.F("[ws] handshake error: %s", err)
+48 -23
View File
@@ -3,65 +3,90 @@ package ws
import (
"crypto/rand"
"crypto/sha1"
"crypto/tls"
"encoding/base64"
"fmt"
"net"
"net/url"
"strings"
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
)
var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
func init() {
proxy.RegisterDialer("ws", NewWSDialer)
proxy.RegisterServer("ws", NewWSServer)
proxy.RegisterDialer("wss", NewWSSDialer)
proxy.RegisterServer("wss", NewWSSServer)
}
// WS is the base ws proxy struct.
type WS struct {
dialer proxy.Dialer
proxy proxy.Proxy
addr string
host string
path string
origin string
server proxy.Server
dialer proxy.Dialer
proxy proxy.Proxy
addr string
host string
path string
origin string
withTLS bool
tlsConfig *tls.Config
serverName string
skipVerify bool
certFile string
keyFile string
server proxy.Server
}
// NewWS returns a websocket proxy.
func NewWS(s string, d proxy.Dialer, p proxy.Proxy) (*WS, error) {
func NewWS(s string, d proxy.Dialer, p proxy.Proxy, withTLS bool) (*WS, error) {
u, err := url.Parse(s)
if err != nil {
log.F("[ws] parse url err: %s", err)
return nil, err
return nil, fmt.Errorf("parse url err: %s", err)
}
addr := u.Host
if addr != "" {
if _, port, _ := net.SplitHostPort(addr); port == "" {
if addr == "" && d != nil {
addr = d.Addr()
}
if _, p, _ := net.SplitHostPort(addr); p == "" {
if withTLS {
addr = net.JoinHostPort(addr, "443")
} else {
addr = net.JoinHostPort(addr, "80")
}
} else if d != nil {
addr = d.Addr()
}
query := u.Query()
w := &WS{
dialer: d,
proxy: p,
addr: addr,
path: u.Path,
host: query.Get("host"),
origin: query.Get("origin"),
dialer: d,
proxy: p,
addr: addr,
path: u.Path,
host: query.Get("host"),
origin: query.Get("origin"),
withTLS: withTLS,
skipVerify: query.Get("skipVerify") == "true",
serverName: query.Get("serverName"),
certFile: query.Get("cert"),
keyFile: query.Get("key"),
}
if w.host == "" {
w.host = addr
w.host = w.addr
}
if w.path == "" {
w.path = "/"
}
if w.serverName == "" {
w.serverName = w.addr[:strings.LastIndex(w.addr, ":")]
}
return w, nil
}