Reapply SingboxForPanel integration on upstream stable
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/sagernet/sing-box/adapter"
|
||||
"github.com/sagernet/sing-box/adapter/inbound"
|
||||
@@ -35,6 +36,47 @@ type Inbound struct {
|
||||
logger logger.ContextLogger
|
||||
listener *listener.Listener
|
||||
service *anytls.Service
|
||||
options option.AnyTLSInboundOptions
|
||||
tracker adapter.SSMTracker
|
||||
ssmMutex sync.RWMutex
|
||||
}
|
||||
|
||||
var _ adapter.ManagedSSMServer = (*Inbound)(nil)
|
||||
|
||||
func (h *Inbound) SetTracker(tracker adapter.SSMTracker) {
|
||||
h.ssmMutex.Lock()
|
||||
defer h.ssmMutex.Unlock()
|
||||
h.tracker = tracker
|
||||
}
|
||||
|
||||
func (h *Inbound) UpdateUsers(users []string, passwords []string, flows []string) error {
|
||||
h.ssmMutex.Lock()
|
||||
defer h.ssmMutex.Unlock()
|
||||
|
||||
paddingScheme := padding.DefaultPaddingScheme
|
||||
if len(h.options.PaddingScheme) > 0 {
|
||||
paddingScheme = []byte(strings.Join(h.options.PaddingScheme, "\n"))
|
||||
}
|
||||
|
||||
anytlsUsers := make([]anytls.User, len(users))
|
||||
for i := range users {
|
||||
anytlsUsers[i] = anytls.User{
|
||||
Name: users[i],
|
||||
Password: passwords[i],
|
||||
}
|
||||
}
|
||||
|
||||
service, err := anytls.NewService(anytls.ServiceConfig{
|
||||
Users: anytlsUsers,
|
||||
PaddingScheme: paddingScheme,
|
||||
Handler: (*inboundHandler)(h),
|
||||
Logger: h.logger,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
h.service = service
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.AnyTLSInboundOptions) (adapter.Inbound, error) {
|
||||
@@ -42,6 +84,7 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
|
||||
Adapter: inbound.NewAdapter(C.TypeAnyTLS, tag),
|
||||
router: uot.NewRouter(router, logger),
|
||||
logger: logger,
|
||||
options: options,
|
||||
}
|
||||
|
||||
if options.TLS != nil && options.TLS.Enabled {
|
||||
@@ -106,7 +149,14 @@ func (h *Inbound) NewConnectionEx(ctx context.Context, conn net.Conn, metadata a
|
||||
}
|
||||
conn = tlsConn
|
||||
}
|
||||
err := h.service.NewConnection(adapter.WithContext(ctx, &metadata), conn, metadata.Source, onClose)
|
||||
h.ssmMutex.RLock()
|
||||
tracker := h.tracker
|
||||
service := h.service
|
||||
h.ssmMutex.RUnlock()
|
||||
if tracker != nil {
|
||||
conn = tracker.TrackConnection(conn, metadata)
|
||||
}
|
||||
err := service.NewConnection(adapter.WithContext(ctx, &metadata), conn, metadata.Source, onClose)
|
||||
if err != nil {
|
||||
N.CloseOnHandshakeFailure(conn, onClose, err)
|
||||
h.logger.ErrorContext(ctx, E.Cause(err, "process connection from ", metadata.Source))
|
||||
|
||||
Reference in New Issue
Block a user