pool: return specified size of buffer

This commit is contained in:
nadoo committed 2020-04-19 23:20:15 +08:00
1 parent 5326c0a901
commit a0542a028e
16 files changed
+158 -139

No files matched your search

+3 -3
View File
@@ -21,7 +21,7 @@ func AEADWriter(w io.Writer, aead cipher.AEAD, iv []byte) io.Writer {
return &aeadWriter{
Writer: w,
AEAD: aead,
buf: make([]byte, lenSize+maxChunkSize),
buf: make([]byte, lenSize+chunkSize),
nonce: make([]byte, aead.NonceSize()),
count: 0,
iv: iv,
@@ -36,7 +36,7 @@ func (w *aeadWriter) Write(b []byte) (int, error) {
func (w *aeadWriter) ReadFrom(r io.Reader) (n int64, err error) {
for {
buf := w.buf
payloadBuf := buf[lenSize : lenSize+defaultChunkSize-w.Overhead()]
payloadBuf := buf[lenSize : lenSize+chunkSize-w.Overhead()]
nr, er := r.Read(payloadBuf)
if nr > 0 {
@@ -84,7 +84,7 @@ func AEADReader(r io.Reader, aead cipher.AEAD, iv []byte) io.Reader {
return &aeadReader{
Reader: r,
AEAD: aead,
buf: make([]byte, lenSize+maxChunkSize),
buf: make([]byte, lenSize+chunkSize),
nonce: make([]byte, aead.NonceSize()),
count: 0,
iv: iv,
+37 -51
View File
@@ -1,104 +1,90 @@
package vmess
import (
"bytes"
"encoding/binary"
"io"
"github.com/nadoo/glider/common/pool"
)
const (
lenSize = 2
maxChunkSize = 1 << 14 // 16384
defaultChunkSize = 1 << 13 // 8192
lenSize = 2
chunkSize = 1 << 14 // 16384
)
type chunkedWriter struct {
io.Writer
buf []byte
}
// ChunkedWriter returns a chunked writer
func ChunkedWriter(w io.Writer) io.Writer {
return &chunkedWriter{
Writer: w,
buf: make([]byte, lenSize+maxChunkSize),
}
return &chunkedWriter{Writer: w}
}
func (w *chunkedWriter) Write(b []byte) (int, error) {
n, err := w.ReadFrom(bytes.NewBuffer(b))
return int(n), err
}
func (w *chunkedWriter) Write(b []byte) (n int, err error) {
buf := pool.GetBuffer(lenSize + chunkSize)
defer pool.PutBuffer(buf)
func (w *chunkedWriter) ReadFrom(r io.Reader) (n int64, err error) {
for {
buf := w.buf
payloadBuf := buf[lenSize : lenSize+defaultChunkSize]
nr, er := r.Read(payloadBuf)
if nr > 0 {
n += int64(nr)
buf = buf[:lenSize+nr]
payloadBuf = payloadBuf[:nr]
binary.BigEndian.PutUint16(buf[:lenSize], uint16(nr))
_, ew := w.Writer.Write(buf)
if ew != nil {
err = ew
break
}
left := len(b)
for left != 0 {
writeLen := left
if writeLen > chunkSize {
writeLen = chunkSize
}
if er != nil {
if er != io.EOF { // ignore EOF as per io.ReaderFrom contract
err = er
}
copy(buf[lenSize:], b[n:n+writeLen])
binary.BigEndian.PutUint16(buf[:lenSize], uint16(writeLen))
_, err = w.Writer.Write(buf[:lenSize+writeLen])
if err != nil {
break
}
n += writeLen
left -= writeLen
}
return n, err
return
}
type chunkedReader struct {
io.Reader
buf []byte
leftBytes int
left int
}
// ChunkedReader returns a chunked reader
func ChunkedReader(r io.Reader) io.Reader {
return &chunkedReader{
Reader: r,
buf: make([]byte, lenSize), // NOTE: buf only used to save header bytes now
}
return &chunkedReader{Reader: r}
}
func (r *chunkedReader) Read(b []byte) (int, error) {
if r.leftBytes == 0 {
if r.left == 0 {
// get length
_, err := io.ReadFull(r.Reader, r.buf[:lenSize])
buf := pool.GetBuffer(lenSize)
_, err := io.ReadFull(r.Reader, buf[:lenSize])
if err != nil {
return 0, err
}
r.leftBytes = int(binary.BigEndian.Uint16(r.buf[:lenSize]))
r.left = int(binary.BigEndian.Uint16(buf[:lenSize]))
pool.PutBuffer(buf)
// if length == 0, then this is the end
if r.leftBytes == 0 {
// if left == 0, then this is the end
if r.left == 0 {
return 0, nil
}
}
readLen := len(b)
if readLen > r.leftBytes {
readLen = r.leftBytes
if readLen > r.left {
readLen = r.left
}
m, err := r.Reader.Read(b[:readLen])
n, err := r.Reader.Read(b[:readLen])
if err != nil {
return 0, err
}
r.leftBytes -= m
return m, err
r.left -= n
return n, err
}
+41 -35
View File
@@ -1,7 +1,6 @@
package vmess
import (
"bytes"
"crypto/aes"
"crypto/cipher"
"crypto/hmac"
@@ -15,6 +14,7 @@ import (
"strings"
"time"
"github.com/nadoo/glider/common/pool"
"golang.org/x/crypto/chacha20poly1305"
)
@@ -108,7 +108,7 @@ func NewClient(uuidStr, security string, alterID int) (*Client, error) {
// NewConn returns a new vmess conn.
func (c *Client) NewConn(rc net.Conn, target string) (*Conn, error) {
r := rand.Intn(c.count)
conn := &Conn{user: c.users[r], opt: c.opt, security: c.security}
conn := &Conn{user: c.users[r], opt: c.opt, security: c.security, Conn: rc}
var err error
conn.atyp, conn.addr, conn.port, err = ParseAddr(target)
@@ -116,51 +116,50 @@ func (c *Client) NewConn(rc net.Conn, target string) (*Conn, error) {
return nil, err
}
randBytes := make([]byte, 33)
randBytes := pool.GetBuffer(32)
rand.Read(randBytes)
copy(conn.reqBodyIV[:], randBytes[:16])
copy(conn.reqBodyKey[:], randBytes[16:32])
conn.reqRespV = randBytes[32]
pool.PutBuffer(randBytes)
conn.reqRespV = byte(rand.Intn(1 << 8))
conn.respBodyIV = md5.Sum(conn.reqBodyIV[:])
conn.respBodyKey = md5.Sum(conn.reqBodyKey[:])
// AuthInfo
_, err = rc.Write(conn.EncodeAuthInfo())
// Auth
err = conn.Auth()
if err != nil {
return nil, err
}
// Request
req, err := conn.EncodeRequest()
err = conn.Request()
if err != nil {
return nil, err
}
_, err = rc.Write(req)
if err != nil {
return nil, err
}
conn.Conn = rc
return conn, nil
}
// EncodeAuthInfo returns HMAC("md5", UUID, UTC) result
func (c *Conn) EncodeAuthInfo() []byte {
ts := make([]byte, 8)
// Auth send auth info: HMAC("md5", UUID, UTC)
func (c *Conn) Auth() error {
ts := pool.GetBuffer(8)
defer pool.PutBuffer(ts)
binary.BigEndian.PutUint64(ts, uint64(time.Now().UTC().Unix()))
h := hmac.New(md5.New, c.user.UUID[:])
h.Write(ts)
return h.Sum(nil)
_, err := c.Conn.Write(h.Sum(nil))
return err
}
// EncodeRequest encodes requests to network bytes.
func (c *Conn) EncodeRequest() ([]byte, error) {
var buf bytes.Buffer
// Request sends request to server.
func (c *Conn) Request() error {
buf := pool.GetWriteBuffer()
defer pool.PutWriteBuffer(buf)
// Request
buf.WriteByte(1) // Ver
@@ -178,9 +177,9 @@ func (c *Conn) EncodeRequest() ([]byte, error) {
buf.WriteByte(CmdTCP) // cmd
// target
err := binary.Write(&buf, binary.BigEndian, uint16(c.port)) // port
err := binary.Write(buf, binary.BigEndian, uint16(c.port)) // port
if err != nil {
return nil, err
return err
}
buf.WriteByte(byte(c.atyp)) // atyp
@@ -188,28 +187,31 @@ func (c *Conn) EncodeRequest() ([]byte, error) {
// padding
if paddingLen > 0 {
padding := make([]byte, paddingLen)
padding := pool.GetBuffer(paddingLen)
rand.Read(padding)
buf.Write(padding)
pool.PutBuffer(padding)
}
// F
fnv1a := fnv.New32a()
_, err = fnv1a.Write(buf.Bytes())
if err != nil {
return nil, err
return err
}
buf.Write(fnv1a.Sum(nil))
block, err := aes.NewCipher(c.user.CmdKey[:])
if err != nil {
return nil, err
return err
}
stream := cipher.NewCFBEncrypter(block, TimestampHash(time.Now().UTC()))
stream.XORKeyStream(buf.Bytes(), buf.Bytes())
return buf.Bytes(), nil
_, err = c.Conn.Write(buf.Bytes())
return err
}
// DecodeRespHeader decodes response header.
@@ -221,20 +223,22 @@ func (c *Conn) DecodeRespHeader() error {
stream := cipher.NewCFBDecrypter(block, c.respBodyIV[:])
buf := make([]byte, 4)
_, err = io.ReadFull(c.Conn, buf)
b := pool.GetBuffer(4)
defer pool.PutBuffer(b)
_, err = io.ReadFull(c.Conn, b)
if err != nil {
return err
}
stream.XORKeyStream(buf, buf)
stream.XORKeyStream(b, b)
if buf[0] != c.reqRespV {
if b[0] != c.reqRespV {
return errors.New("unexpected response header")
}
// TODO: Dynamic port support
if buf[2] != 0 {
if b[2] != 0 {
// dataLen := int32(buf[3])
return errors.New("dynamic port is not supported now")
}
@@ -259,13 +263,14 @@ func (c *Conn) Write(b []byte) (n int, err error) {
c.dataWriter = AEADWriter(c.Conn, aead, c.reqBodyIV[:])
case SecurityChacha20Poly1305:
key := make([]byte, 32)
key := pool.GetBuffer(32)
t := md5.Sum(c.reqBodyKey[:])
copy(key, t[:])
t = md5.Sum(key[:16])
copy(key[16:], t[:])
aead, _ := chacha20poly1305.New(key)
c.dataWriter = AEADWriter(c.Conn, aead, c.reqBodyIV[:])
pool.PutBuffer(key)
}
}
@@ -294,13 +299,14 @@ func (c *Conn) Read(b []byte) (n int, err error) {
c.dataReader = AEADReader(c.Conn, aead, c.respBodyIV[:])
case SecurityChacha20Poly1305:
key := make([]byte, 32)
key := pool.GetBuffer(32)
t := md5.Sum(c.respBodyKey[:])
copy(key, t[:])
t = md5.Sum(key[:16])
copy(key[16:], t[:])
aead, _ := chacha20poly1305.New(key)
c.dataReader = AEADReader(c.Conn, aead, c.respBodyIV[:])
pool.PutBuffer(key)
}
}
+5 -2
View File
@@ -8,6 +8,8 @@ import (
"errors"
"strings"
"time"
"github.com/nadoo/glider/common/pool"
)
// User of vmess client
@@ -73,10 +75,11 @@ func GetKey(uuid [16]byte) []byte {
// TimestampHash returns the iv of AES-128-CFB encrypter
// IV:MD5(X + X + X + X),X = []byte(timestamp.now) (8 bytes, Big Endian)
func TimestampHash(t time.Time) []byte {
md5hash := md5.New()
ts := pool.GetBuffer(8)
defer pool.PutBuffer(ts)
ts := make([]byte, 8)
binary.BigEndian.PutUint64(ts, uint64(t.UTC().Unix()))
md5hash := md5.New()
md5hash.Write(ts)
md5hash.Write(ts)
md5hash.Write(ts)