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

add admission option for listener

Browse Source
This commit is contained in:
ginuerzh
2022-03-13 00:08:16 +08:00
parent 4007e80811
commit bfc1f8472c
22 changed files with 348 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/listener/grpc/listener.go
View File

@ -3,6 +3,7 @@ package grpc
import (
"net"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
pb "github.com/go-gost/gost/pkg/common/util/grpc/proto"
"github.com/go-gost/gost/pkg/listener"
@ -48,6 +49,7 @@ func (l *grpcListener) Init(md md.Metadata) (err error) {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
var opts []grpc.ServerOption
if !l.md.insecure {

2
pkg/listener/http2/h2/listener.go
View File

@ -7,6 +7,7 @@ import (
"net/http"
"net/http/httputil"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -70,6 +71,7 @@ func (l *h2Listener) Init(md md.Metadata) (err error) {
}
l.addr = ln.Addr()
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
if l.h2c {
l.server.Handler = h2c.NewHandler(

2
pkg/listener/http2/listener.go
View File

@ -5,6 +5,7 @@ import (
"net"
"net/http"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
http2_util "github.com/go-gost/gost/pkg/internal/util/http2"
"github.com/go-gost/gost/pkg/listener"
@ -59,6 +60,7 @@ func (l *http2Listener) Init(md md.Metadata) (err error) {
}
l.addr = ln.Addr()
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
ln = tls.NewListener(
ln,

2
pkg/listener/icmp/listener.go
View File

@ -4,6 +4,7 @@ import (
"context"
"net"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
icmp_pkg "github.com/go-gost/gost/pkg/internal/util/icmp"
"github.com/go-gost/gost/pkg/listener"
@ -55,6 +56,7 @@ func (l *icmpListener) Init(md md.Metadata) (err error) {
}
conn = icmp_pkg.ServerConn(conn)
conn = metrics.WrapPacketConn(l.options.Service, conn)
conn = admission.WrapPacketConn(l.options.Admission, conn)
config := &quic.Config{
KeepAlive: l.md.keepAlive,

2
pkg/listener/kcp/listener.go
View File

@ -4,6 +4,7 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
kcp_util "github.com/go-gost/gost/pkg/common/util/kcp"
"github.com/go-gost/gost/pkg/listener"
@ -64,6 +65,7 @@ func (l *kcpListener) Init(md md.Metadata) (err error) {
}
conn = metrics.WrapUDPConn(l.options.Service, conn)
conn = admission.WrapUDPConn(l.options.Admission, conn)
ln, err := kcp.ServeConn(
kcp_util.BlockCrypt(config.Key, config.Crypt, kcp_util.DefaultSalt),

2
pkg/listener/obfs/http/listener.go
View File

@ -3,6 +3,7 @@ package http
import (
"net"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -42,6 +43,7 @@ func (l *obfsListener) Init(md md.Metadata) (err error) {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
l.Listener = ln
return

2
pkg/listener/obfs/tls/listener.go
View File

@ -3,6 +3,7 @@ package tls
import (
"net"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -42,6 +43,7 @@ func (l *obfsListener) Init(md md.Metadata) (err error) {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
l.Listener = ln
return

8
pkg/listener/option.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls"
"net/url"
"github.com/go-gost/gost/pkg/admission"
"github.com/go-gost/gost/pkg/auth"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/logger"
@ -14,6 +15,7 @@ type Options struct {
Auther auth.Authenticator
Auth *url.Userinfo
TLSConfig *tls.Config
Admission admission.Admission
Chain chain.Chainer
Logger logger.Logger
Service string
@ -45,6 +47,12 @@ func TLSConfigOption(tlsConfig *tls.Config) Option {
}
}
func AdmissionOption(admission admission.Admission) Option {
return func(opts *Options) {
opts.Admission = admission
}
}
func ChainOption(chain chain.Chainer) Option {
return func(opts *Options) {
opts.Chain = chain

2
pkg/listener/ssh/listener.go
View File

@ -5,6 +5,7 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
"github.com/go-gost/gost/pkg/listener"
@ -50,6 +51,7 @@ func (l *sshListener) Init(md md.Metadata) (err error) {
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
l.Listener = ln
config := &ssh.ServerConfig{

2
pkg/listener/sshd/listener.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
"time"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
sshd_util "github.com/go-gost/gost/pkg/internal/util/sshd"
@ -59,6 +60,7 @@ func (l *sshdListener) Init(md md.Metadata) (err error) {
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
l.Listener = ln
config := &ssh.ServerConfig{

4
pkg/listener/tcp/listener.go
View File

@ -41,7 +41,9 @@ func (l *tcpListener) Init(md md.Metadata) (err error) {
if err != nil {
return
}
l.Listener = metrics.WrapListener(l.options.Service, ln)
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = ln
return
}

2
pkg/listener/tls/listener.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls"
"net"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -43,6 +44,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
l.Listener = tls.NewListener(ln, l.options.TLSConfig)

2
pkg/listener/tls/mux/listener.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls"
"net"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -47,6 +48,7 @@ func (l *mtlsListener) Init(md md.Metadata) (err error) {
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
l.Listener = tls.NewListener(ln, l.options.TLSConfig)
l.cqueue = make(chan net.Conn, l.md.backlog)

6
pkg/listener/udp/listener.go
View File

@ -43,13 +43,15 @@ func (l *udpListener) Init(md md.Metadata) (err error) {
return
}
conn, err := net.ListenUDP("udp", laddr)
var conn net.PacketConn
conn, err = net.ListenUDP("udp", laddr)
if err != nil {
return
}
conn = metrics.WrapPacketConn(l.options.Service, conn)
l.Listener = udp.NewListener(
metrics.WrapPacketConn(l.options.Service, conn),
conn,
laddr,
l.md.backlog,
l.md.readQueueSize, l.md.readBufferSize,

2
pkg/listener/ws/listener.go
View File

@ -6,6 +6,7 @@ import (
"net/http"
"net/http/httputil"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
ws_util "github.com/go-gost/gost/pkg/internal/util/ws"
"github.com/go-gost/gost/pkg/listener"
@ -84,6 +85,7 @@ func (l *wsListener) Init(md md.Metadata) (err error) {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
if l.tlsEnabled {
ln = tls.NewListener(ln, l.options.TLSConfig)

2
pkg/listener/ws/mux/listener.go
View File

@ -6,6 +6,7 @@ import (
"net/http"
"net/http/httputil"
"github.com/go-gost/gost/pkg/common/admission"
"github.com/go-gost/gost/pkg/common/metrics"
ws_util "github.com/go-gost/gost/pkg/internal/util/ws"
"github.com/go-gost/gost/pkg/listener"
@ -89,6 +90,7 @@ func (l *mwsListener) Init(md md.Metadata) (err error) {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
ln = admission.WrapListener(l.options.Admission, ln)
if l.tlsEnabled {
ln = tls.NewListener(ln, l.options.TLSConfig)