Close connection chan when socks client finishes sending data, and fix a performance issue in VMess decoding.

io/vmess/decryptionreader.go

@@ -1,72 +0,0 @@
-package vmess
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"fmt"
-	"io"
-
-	v2io "github.com/v2ray/v2ray-core/io"
-)
-
-const (
-	blockSize = 16 // Decryption block size, inherited from AES
-)
-
-// DecryptionReader is a byte stream reader to decrypt AES-128 CBC (for now)
-// encrypted content.
-type DecryptionReader struct {
-	reader *v2io.CryptionReader
-	buffer *bytes.Buffer
-}
-
-// NewDecryptionReader creates a new DescriptionReader by given byte Reader and
-// AES key.
-func NewDecryptionReader(reader io.Reader, key []byte, iv []byte) (*DecryptionReader, error) {
-	decryptionReader := new(DecryptionReader)
-	aesCipher, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-	aesStream := cipher.NewCFBDecrypter(aesCipher, iv)
-	decryptionReader.reader = v2io.NewCryptionReader(aesStream, reader)
-	decryptionReader.buffer = bytes.NewBuffer(make([]byte, 0, 2*blockSize))
-	return decryptionReader, nil
-}
-
-func (reader *DecryptionReader) readBlock() error {
-	buffer := make([]byte, blockSize)
-	nBytes, err := reader.reader.Read(buffer)
-	if err != nil && err != io.EOF {
-		return err
-	}
-	if nBytes < blockSize {
-		return fmt.Errorf("Expected to read %d bytes, but got %d bytes", blockSize, nBytes)
-	}
-	reader.buffer.Write(buffer)
-	return err
-}
-
-// Read returns decrypted bytes of given length
-func (reader *DecryptionReader) Read(p []byte) (int, error) {
-	nBytes, err := reader.buffer.Read(p)
-	if err != nil && err != io.EOF {
-		return nBytes, err
-	}
-	if nBytes < len(p) {
-		err = reader.readBlock()
-		if err != nil {
-			return nBytes, err
-		}
-		moreBytes, err := reader.buffer.Read(p[nBytes:])
-		if err != nil {
-			return nBytes, err
-		}
-		nBytes += moreBytes
-		if nBytes != len(p) {
-			return nBytes, fmt.Errorf("Unable to read %d bytes", len(p))
-		}
-	}
-	return nBytes, err
-}

io/vmess/decryptionreader_test.go

@@ -1,62 +0,0 @@
-package vmess
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	mrand "math/rand"
-	"testing"
-
-	"github.com/v2ray/v2ray-core/testing/unit"
-)
-
-func randomBytes(p []byte, t *testing.T) {
-	assert := unit.Assert(t)
-
-	nBytes, err := rand.Read(p)
-	assert.Error(err).IsNil()
-	assert.Int(nBytes).Named("# bytes of random buffer").Equals(len(p))
-}
-
-func TestNormalReading(t *testing.T) {
-	assert := unit.Assert(t)
-
-	testSize := 256
-	plaintext := make([]byte, testSize)
-	randomBytes(plaintext, t)
-
-	keySize := 16
-	key := make([]byte, keySize)
-	randomBytes(key, t)
-	iv := make([]byte, keySize)
-	randomBytes(iv, t)
-
-	aesBlock, err := aes.NewCipher(key)
-	assert.Error(err).IsNil()
-
-	aesStream := cipher.NewCFBEncrypter(aesBlock, iv)
-
-	ciphertext := make([]byte, testSize)
-	aesStream.XORKeyStream(ciphertext, plaintext)
-
-	ciphertextcopy := make([]byte, testSize)
-	copy(ciphertextcopy, ciphertext)
-
-	reader, err := NewDecryptionReader(bytes.NewReader(ciphertextcopy), key, iv)
-	assert.Error(err).IsNil()
-
-	readtext := make([]byte, testSize)
-	readSize := 0
-	for readSize < testSize {
-		nBytes := mrand.Intn(16) + 1
-		if nBytes > testSize-readSize {
-			nBytes = testSize - readSize
-		}
-		bytesRead, err := reader.Read(readtext[readSize : readSize+nBytes])
-		assert.Error(err).IsNil()
-		assert.Int(bytesRead).Equals(nBytes)
-		readSize += nBytes
-	}
-	assert.Bytes(readtext).Named("Plaintext").Equals(plaintext)
-}

io/vmess/vmess.go

@@ -22,6 +22,8 @@ const (
 	addrTypeDomain = byte(0x02)
 
 	Version = byte(0x01)
+  
+  blockSize = 16
 )
 
 var (
@@ -75,8 +77,14 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
 		return nil, ErrorInvalidUser
 	}
 	request.UserId = *userId
+  
+  aesCipher, err := aes.NewCipher(userId.Hash([]byte("PWD")))
+	if err != nil {
+		return nil, err
+	}
+	aesStream := cipher.NewCFBDecrypter(aesCipher, emptyIV)
+	decryptor := v2io.NewCryptionReader(aesStream, reader)
 
-	decryptor, err := NewDecryptionReader(reader, userId.Hash([]byte("PWD")), emptyIV)
 	if err != nil {
 		return nil, err
 	}