go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forward non-HTTP traffic based on host

Browse Source
This commit is contained in:
ginuerzh
2023-01-30 21:09:21 +08:00
parent 3afa3b6860
commit 1c6bc9283e
11 changed files with 127 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
handler/forward/local/handler.go
View File

@ -3,6 +3,7 @@ package local
import (
"bufio"
"context"
"crypto/tls"
"errors"
"fmt"
"io"
@ -94,7 +95,7 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...hand
if h.md.sniffing {
if network == "tcp" {
rw, host, protocol, _ = forward.Sniffing(ctx, conn)
h.options.Logger.Debugf("sniffing: host=%s, protocol=%s", host, protocol)
log.Debugf("sniffing: host=%s, protocol=%s", host, protocol)
}
}
@ -177,12 +178,14 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, log l
)
}
if target == nil {
log.Warnf("node for %s not found", req.Host)
return resp.Write(rw)
}
log = log.WithFields(map[string]any{
"dst": target.Addr,
})
log.Debugf("find node for host %s -> %s(%s)", req.Host, target.Name, target.Addr)
// log.Debugf("%s >> %s", conn.RemoteAddr(), target.Addr)
@ -199,11 +202,20 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, log l
if marker := target.Marker(); marker != nil {
marker.Mark()
}
log.Warnf("connect to node %s(%s) failed", target.Name, target.Addr)
return resp.Write(rw)
}
if marker := target.Marker(); marker != nil {
marker.Reset()
}
if tlsSettings := target.Options().TLS; tlsSettings != nil {
cc = tls.Client(cc, &tls.Config{
ServerName: tlsSettings.ServerName,
InsecureSkipVerify: !tlsSettings.Secure,
})
}
connPool.Store(target, cc)
log.Debugf("new connection to node %s(%s)", target.Name, target.Addr)

24
handler/forward/remote/handler.go
View File

@ -3,6 +3,7 @@ package remote
import (
"bufio"
"context"
"crypto/tls"
"errors"
"fmt"
"io"
@ -15,7 +16,8 @@ import (
"github.com/go-gost/core/chain"
"github.com/go-gost/core/handler"
"github.com/go-gost/core/logger"
md "github.com/go-gost/core/metadata"
mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util"
xnet "github.com/go-gost/x/internal/net"
"github.com/go-gost/x/internal/util/forward"
"github.com/go-gost/x/registry"
@ -44,7 +46,7 @@ func NewHandler(opts ...handler.Option) handler.Handler {
}
}
func (h *forwardHandler) Init(md md.Metadata) (err error) {
func (h *forwardHandler) Init(md mdata.Metadata) (err error) {
if err = h.parseMetadata(md); err != nil {
return
}
@ -93,14 +95,19 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...hand
if h.md.sniffing {
if network == "tcp" {
rw, host, protocol, _ = forward.Sniffing(ctx, conn)
log.Debugf("sniffing: host=%s, protocol=%s", host, protocol)
}
}
if protocol == forward.ProtoHTTP {
h.handleHTTP(ctx, rw, log)
return nil
}
if md, ok := conn.(mdata.Metadatable); ok {
if v := mdutil.GetString(md.Metadata(), "host"); v != "" {
host = v
}
}
var target *chain.Node
if h.hop != nil {
target = h.hop.Select(ctx,
@ -170,12 +177,14 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, log l
)
}
if target == nil {
log.Warnf("node for %s not found", req.Host)
return resp.Write(rw)
}
log = log.WithFields(map[string]any{
"dst": target.Addr,
})
log.Debugf("find node for host %s -> %s(%s)", req.Host, target.Name, target.Addr)
// log.Debugf("%s >> %s", conn.RemoteAddr(), target.Addr)
@ -192,11 +201,20 @@ func (h *forwardHandler) handleHTTP(ctx context.Context, rw io.ReadWriter, log l
if marker := target.Marker(); marker != nil {
marker.Mark()
}
log.Warnf("connect to node %s(%s) failed", target.Name, target.Addr)
return resp.Write(rw)
}
if marker := target.Marker(); marker != nil {
marker.Reset()
}
if tlsSettings := target.Options().TLS; tlsSettings != nil {
cc = tls.Client(cc, &tls.Config{
ServerName: tlsSettings.ServerName,
InsecureSkipVerify: !tlsSettings.Secure,
})
}
connPool.Store(target, cc)
log.Debugf("new connection to node %s(%s)", target.Name, target.Addr)

21
handler/relay/connect.go
View File

@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"net"
"strconv"
"time"
"github.com/go-gost/core/logger"
@ -110,7 +111,7 @@ func (h *relayHandler) handleConnectTunnel(ctx context.Context, conn net.Conn, n
Status: relay.StatusOK,
}
host, _, _ := net.SplitHostPort(address)
host, sp, _ := net.SplitHostPort(address)
if h.options.Bypass != nil && h.options.Bypass.Contains(address) {
log.Debug("bypass: ", address)
@ -157,12 +158,26 @@ func (h *relayHandler) handleConnectTunnel(ctx context.Context, conn net.Conn, n
conn = rc
}
af := &relay.AddrFeature{}
var features []relay.Feature
af := &relay.AddrFeature{} // visitor address
af.ParseFrom(conn.RemoteAddr().String())
features = append(features, af)
if host != "" {
port, _ := strconv.Atoi(sp)
// target host
af = &relay.AddrFeature{
AType: relay.AddrDomain,
Host: host,
Port: uint16(port),
}
features = append(features, af)
}
resp = relay.Response{
Version: relay.Version1,
Status: relay.StatusOK,
Features: []relay.Feature{af},
Features: features,
}
resp.WriteTo(cc)

2
handler/relay/entrypoint.go
View File

@ -120,7 +120,7 @@ func (h *epHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.H
tunnelID = parseTunnelID(h.ingress.Get(host))
}
if tunnelID.IsPrivate() {
err := fmt.Errorf("tunnel %s is private", tunnelID)
err := fmt.Errorf("access denied: tunnel %s is private", tunnelID)
log.Error(err)
return err
}