SagerNet/sing-quic
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-quic.git synced 2025-04-05 21:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

support same uuid multi users

Browse source
This commit is contained in:
znlsl 2025-04-02 12:51:11 +08:00
parent 297f0b2a2b
commit aad88e3732
1 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tuic/service.go
View file

@ -50,7 +50,7 @@ type Service[U comparable] struct {
tlsConfig aTLS.ServerConfig tlsConfig aTLS.ServerConfig
heartbeat time.Duration heartbeat time.Duration
quicConfig *quic.Config quicConfig *quic.Config
userMap map[[16]byte]U userMap map[[16]byte][]U // ÿ¸ö UUID ¶ÔÓ¦¶à¸öÓû§
passwordMap map[U]string passwordMap map[U]string
congestionControl string congestionControl string
authTimeout time.Duration authTimeout time.Duration
@ -87,7 +87,7 @@ func NewService[U comparable](options ServiceOptions) (*Service[U], error) {
tlsConfig: options.TLSConfig, tlsConfig: options.TLSConfig,
heartbeat: options.Heartbeat, heartbeat: options.Heartbeat,
quicConfig: quicConfig, quicConfig: quicConfig,
userMap: make(map[[16]byte]U), userMap: make(map[[16]byte][]U),
congestionControl: options.CongestionControl, congestionControl: options.CongestionControl,
authTimeout: options.AuthTimeout, authTimeout: options.AuthTimeout,
udpTimeout: options.UDPTimeout, udpTimeout: options.UDPTimeout,
@ -96,14 +96,14 @@ func NewService[U comparable](options ServiceOptions) (*Service[U], error) {
} }
func (s *Service[U]) UpdateUsers(userList []U, uuidList [][16]byte, passwordList []string) { func (s *Service[U]) UpdateUsers(userList []U, uuidList [][16]byte, passwordList []string) {
userMap := make(map[[16]byte]U) userMap := make(map[[16]byte][]U)
passwordMap := make(map[U]string) passwordMap := make(map[U]string)
for index := range userList { for index := range userList {
userMap[uuidList[index]] = userList[index] userMap[uuidList[index]] = append(userMap[uuidList[index]], userList[index])
passwordMap[userList[index]] = passwordList[index] passwordMap[userList[index]] = passwordList[index]
} }
s.userMap = userMap s.userMap = userMap
s.passwordMap = passwordMap s.passwordMap = passwordMap
} }
func (s *Service[U]) Start(conn net.PacketConn) error { func (s *Service[U]) Start(conn net.PacketConn) error {
@ -245,19 +245,31 @@ func (s *serverSession[U]) handleUniStream(stream quic.ReceiveStream) error {
} }
var userUUID [16]byte var userUUID [16]byte
copy(userUUID[:], buffer.Range(2, 2+16)) copy(userUUID[:], buffer.Range(2, 2+16))
user, loaded := s.userMap[userUUID] users, loaded := s.userMap[userUUID]
if !loaded { if !loaded {
return E.New("authentication: unknown user ", uuid.UUID(userUUID)) return E.New("authentication: unknown user ", uuid.UUID(userUUID))
} }
handshakeState := s.quicConn.ConnectionState()
tuicToken, err := handshakeState.ExportKeyingMaterial(string(userUUID[:]), []byte(s.passwordMap[user]), 32) var authenticatedUser U
if err != nil { found := false
return E.Cause(err, "authentication: export keying material") for _, user := range users {
handshakeState := s.quicConn.ConnectionState()
tuicToken, err := handshakeState.ExportKeyingMaterial(string(userUUID[:]), []byte(s.passwordMap[user]), 32)
if err != nil {
continue
}
if bytes.Equal(tuicToken, buffer.Range(2+16, 2+16+32)) {
authenticatedUser = user
found = true
break
}
} }
if !bytes.Equal(tuicToken, buffer.Range(2+16, 2+16+32)) {
if !found {
return E.New("authentication: token mismatch") return E.New("authentication: token mismatch")
} }
s.authUser = user
s.authUser = authenticatedUser
close(s.authDone) close(s.authDone)
return nil return nil
case CommandPacket: case CommandPacket: