test case for shadowsocks tcp

proxy/shadowsocks/config_json_test.go

@@ -0,0 +1,27 @@
+// +build json
+
+package shadowsocks
+
+import (
+	"encoding/json"
+	"testing"
+
+	v2testing "github.com/v2ray/v2ray-core/testing"
+	"github.com/v2ray/v2ray-core/testing/assert"
+)
+
+func TestConfigParsing(t *testing.T) {
+	v2testing.Current(t)
+
+	rawJson := `{
+    "method": "aes-128-cfb",
+    "password": "v2ray-password"
+  }`
+
+	config := new(Config)
+	err := json.Unmarshal([]byte(rawJson), config)
+	assert.Error(err).IsNil()
+
+	assert.Int(config.Cipher.KeySize()).Equals(16)
+	assert.Bytes(config.Key).Equals([]byte{160, 224, 26, 2, 22, 110, 9, 80, 65, 52, 80, 20, 38, 243, 224, 241})
+}

proxy/shadowsocks/shadowsocks.go

@@ -3,6 +3,7 @@
 package shadowsocks
 
 import (
+	"crypto/rand"
 	"sync"
 
 	"github.com/v2ray/v2ray-core/app"
@@ -80,7 +81,10 @@ func (this *Shadowsocks) handleConnection(conn *listener.TCPConn) {
 	packet := v2net.NewPacket(v2net.TCPDestination(request.Address, request.Port), nil, true)
 	ray := this.space.PacketDispatcher().DispatchToOutbound(packet)
 
-	writer, err := this.config.Cipher.NewEncodingStream(key, iv, conn)
+	respIv := make([]byte, this.config.Cipher.IVSize())
+	rand.Read(respIv)
+
+	writer, err := this.config.Cipher.NewEncodingStream(key, respIv, conn)
 	if err != nil {
 		log.Error("Shadowsocks: Failed to create encoding stream: ", err)
 		return
@@ -89,7 +93,18 @@ func (this *Shadowsocks) handleConnection(conn *listener.TCPConn) {
 	var writeFinish sync.Mutex
 	writeFinish.Lock()
 	go func() {
-		v2net.ChanToWriter(writer, ray.InboundOutput())
+		firstChunk := alloc.NewBuffer().Clear()
+		defer firstChunk.Release()
+
+		firstChunk.Append(respIv)
+
+		if payload, ok := <-ray.InboundOutput(); ok {
+			firstChunk.Append(payload.Value)
+			payload.Release()
+
+			writer.Write(firstChunk.Value)
+			v2net.ChanToWriter(writer, ray.InboundOutput())
+		}
 		writeFinish.Unlock()
 	}()