SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-04 12:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Generic trojan user key

Browse source
This commit is contained in:
世界 2022-04-30 10:26:18 +08:00
parent 34cba35e3b
commit 36d9df8d5a
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
protocol/trojan/service.go
View file

@ -19,25 +19,29 @@ type Handler interface {
socks.UDPConnectionHandler socks.UDPConnectionHandler
} }
type Context struct { type Context[K comparable] struct {
context.Context context.Context
User string User K
Key [KeyLength]byte Key [KeyLength]byte
} }
type Service struct { type Service[K comparable] struct {
handler Handler handler Handler
keys map[[56]byte]string keys map[[56]byte]K
users map[string][56]byte users map[K][56]byte
} }
func NewService(handler Handler) *Service { func NewService[K comparable](handler Handler) Service[K] {
return &Service{handler: handler} return Service[K]{
handler: handler,
keys: make(map[[56]byte]K),
users: make(map[K][56]byte),
}
} }
var ErrUserExists = E.New("user already exists") var ErrUserExists = E.New("user already exists")
func (s *Service) AddUser(user string, password string) error { func (s *Service[K]) AddUser(user K, password string) error {
if _, loaded := s.users[user]; loaded { if _, loaded := s.users[user]; loaded {
return ErrUserExists return ErrUserExists
} }
@ -50,7 +54,7 @@ func (s *Service) AddUser(user string, password string) error {
return nil return nil
} }
func (s *Service) RemoveUser(user string) bool { func (s *Service[K]) RemoveUser(user K) bool {
if key, loaded := s.users[user]; loaded { if key, loaded := s.users[user]; loaded {
delete(s.users, user) delete(s.users, user)
delete(s.keys, key) delete(s.keys, key)
@ -60,7 +64,12 @@ func (s *Service) RemoveUser(user string) bool {
} }
} }
func (s *Service) NewConnection(ctx context.Context, conn net.Conn, metadata M.Metadata) error { func (s *Service[K]) ResetUsers() {
s.keys = make(map[[56]byte]K)
s.users = make(map[K][56]byte)
}
func (s *Service[K]) NewConnection(ctx context.Context, conn net.Conn, metadata M.Metadata) error {
var key [KeyLength]byte var key [KeyLength]byte
_, err := io.ReadFull(conn, common.Dup(key[:])) _, err := io.ReadFull(conn, common.Dup(key[:]))
if err != nil { if err != nil {
@ -79,7 +88,7 @@ returnErr:
process: process:
var userCtx Context var userCtx Context[K]
userCtx.Context = ctx userCtx.Context = ctx
if user, loaded := s.keys[key]; loaded { if user, loaded := s.keys[key]; loaded {
userCtx.User = user userCtx.User = user
@ -122,9 +131,9 @@ process:
metadata.Destination = destination metadata.Destination = destination
if command == CommandTCP { if command == CommandTCP {
return s.handler.NewConnection(userCtx, conn, metadata) return s.handler.NewConnection(&userCtx, conn, metadata)
} else { } else {
return s.handler.NewPacketConnection(userCtx, &packetConn{conn}, metadata) return s.handler.NewPacketConnection(&userCtx, &packetConn{conn}, metadata)
} }
} }