pooled session objects

pull/1269/head
Darien Raymond 6 years ago
parent ed1d713ef4
commit a89ff38fe6
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169

@ -7,6 +7,7 @@ import (
"crypto/rand" "crypto/rand"
"hash/fnv" "hash/fnv"
"io" "io"
"sync"
"golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/chacha20poly1305"
@ -40,12 +41,16 @@ type ClientSession struct {
responseHeader byte responseHeader byte
} }
var clientSessionPool = sync.Pool{
New: func() interface{} { return &ClientSession{} },
}
// NewClientSession creates a new ClientSession. // NewClientSession creates a new ClientSession.
func NewClientSession(idHash protocol.IDHash) *ClientSession { func NewClientSession(idHash protocol.IDHash) *ClientSession {
randomBytes := make([]byte, 33) // 16 + 16 + 1 randomBytes := make([]byte, 33) // 16 + 16 + 1
common.Must2(rand.Read(randomBytes)) common.Must2(rand.Read(randomBytes))
session := &ClientSession{} session := clientSessionPool.Get().(*ClientSession)
copy(session.requestBodyKey[:], randomBytes[:16]) copy(session.requestBodyKey[:], randomBytes[:16])
copy(session.requestBodyIV[:], randomBytes[16:32]) copy(session.requestBodyIV[:], randomBytes[16:32])
session.responseHeader = randomBytes[32] session.responseHeader = randomBytes[32]
@ -56,6 +61,12 @@ func NewClientSession(idHash protocol.IDHash) *ClientSession {
return session return session
} }
func ReleaseClientSession(session *ClientSession) {
session.idHash = nil
session.responseReader = nil
clientSessionPool.Put(session)
}
func (c *ClientSession) EncodeRequestHeader(header *protocol.RequestHeader, writer io.Writer) error { func (c *ClientSession) EncodeRequestHeader(header *protocol.RequestHeader, writer io.Writer) error {
timestamp := protocol.NewTimestampGenerator(protocol.NowTime(), 30)() timestamp := protocol.NewTimestampGenerator(protocol.NowTime(), 30)()
account := header.User.Account.(*vmess.InternalAccount) account := header.User.Account.(*vmess.InternalAccount)

@ -44,6 +44,8 @@ func TestRequestSerialization(t *testing.T) {
buffer := buf.New() buffer := buf.New()
client := NewClientSession(protocol.DefaultIDHash) client := NewClientSession(protocol.DefaultIDHash)
defer ReleaseClientSession(client)
common.Must(client.EncodeRequestHeader(expectedRequest, buffer)) common.Must(client.EncodeRequestHeader(expectedRequest, buffer))
buffer2 := buf.New() buffer2 := buf.New()
@ -57,6 +59,7 @@ func TestRequestSerialization(t *testing.T) {
defer common.Close(userValidator) defer common.Close(userValidator)
server := NewServerSession(userValidator, sessionHistory) server := NewServerSession(userValidator, sessionHistory)
defer ReleaseServerSession(server)
actualRequest, err := server.DecodeRequestHeader(buffer) actualRequest, err := server.DecodeRequestHeader(buffer)
assert(err, IsNil) assert(err, IsNil)
@ -97,6 +100,8 @@ func TestInvalidRequest(t *testing.T) {
buffer := buf.New() buffer := buf.New()
client := NewClientSession(protocol.DefaultIDHash) client := NewClientSession(protocol.DefaultIDHash)
defer ReleaseClientSession(client)
common.Must(client.EncodeRequestHeader(expectedRequest, buffer)) common.Must(client.EncodeRequestHeader(expectedRequest, buffer))
buffer2 := buf.New() buffer2 := buf.New()
@ -110,6 +115,7 @@ func TestInvalidRequest(t *testing.T) {
defer common.Close(userValidator) defer common.Close(userValidator)
server := NewServerSession(userValidator, sessionHistory) server := NewServerSession(userValidator, sessionHistory)
defer ReleaseServerSession(server)
_, err := server.DecodeRequestHeader(buffer) _, err := server.DecodeRequestHeader(buffer)
assert(err, IsNotNil) assert(err, IsNotNil)
} }
@ -150,6 +156,7 @@ func TestMuxRequest(t *testing.T) {
defer common.Close(userValidator) defer common.Close(userValidator)
server := NewServerSession(userValidator, sessionHistory) server := NewServerSession(userValidator, sessionHistory)
defer ReleaseServerSession(server)
actualRequest, err := server.DecodeRequestHeader(buffer) actualRequest, err := server.DecodeRequestHeader(buffer)
assert(err, IsNil) assert(err, IsNil)

@ -101,13 +101,24 @@ type ServerSession struct {
responseHeader byte responseHeader byte
} }
var serverSessionPool = sync.Pool{
New: func() interface{} { return &ServerSession{} },
}
// NewServerSession creates a new ServerSession, using the given UserValidator. // NewServerSession creates a new ServerSession, using the given UserValidator.
// The ServerSession instance doesn't take ownership of the validator. // The ServerSession instance doesn't take ownership of the validator.
func NewServerSession(validator *vmess.TimedUserValidator, sessionHistory *SessionHistory) *ServerSession { func NewServerSession(validator *vmess.TimedUserValidator, sessionHistory *SessionHistory) *ServerSession {
return &ServerSession{ session := serverSessionPool.Get().(*ServerSession)
userValidator: validator, session.userValidator = validator
sessionHistory: sessionHistory, session.sessionHistory = sessionHistory
return session
} }
func ReleaseServerSession(session *ServerSession) {
session.responseWriter = nil
session.userValidator = nil
session.sessionHistory = nil
serverSessionPool.Put(session)
} }
func parseSecurityType(b byte) protocol.SecurityType { func parseSecurityType(b byte) protocol.SecurityType {

@ -221,6 +221,8 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
reader := &buf.BufferedReader{Reader: buf.NewReader(connection)} reader := &buf.BufferedReader{Reader: buf.NewReader(connection)}
svrSession := encoding.NewServerSession(h.clients, h.sessionHistory) svrSession := encoding.NewServerSession(h.clients, h.sessionHistory)
defer encoding.ReleaseServerSession(svrSession)
request, err := svrSession.DecodeRequestHeader(reader) request, err := svrSession.DecodeRequestHeader(reader)
if err != nil { if err != nil {

@ -106,6 +106,8 @@ func (v *Handler) Process(ctx context.Context, link *core.Link, dialer proxy.Dia
output := link.Writer output := link.Writer
session := encoding.NewClientSession(protocol.DefaultIDHash) session := encoding.NewClientSession(protocol.DefaultIDHash)
defer encoding.ReleaseClientSession(session)
sessionPolicy := v.v.PolicyManager().ForLevel(request.User.Level) sessionPolicy := v.v.PolicyManager().ForLevel(request.User.Level)
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)

Loading…
Cancel
Save