mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-19 07:01:09 +00:00
re-enable vmess test
This commit is contained in:
1 parent
8f93612dec
commit
228e1eeabe
11 files changed
+137
-68
No files matched your search
@@ -43,7 +43,7 @@ func TestAuthenticationResponseWrite(t *testing.T) {
|
||||
response := NewAuthenticationResponse(byte(0x05))
|
||||
|
||||
buffer := bytes.NewBuffer(make([]byte, 0, 10))
|
||||
WriteAuthentication(buffer, &response)
|
||||
WriteAuthentication(buffer, response)
|
||||
assert.Bytes(buffer.Bytes()).Equals([]byte{socksVersion, byte(0x05)})
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package socks
|
||||
|
||||
import (
|
||||
"io"
|
||||
|
||||
v2net "github.com/v2ray/v2ray-core/net"
|
||||
)
|
||||
|
||||
type Socks5UDPRequest struct {
|
||||
fragment byte
|
||||
address v2net.Address
|
||||
data []byte
|
||||
}
|
||||
|
||||
func ReadUDPRequest(reader io.Reader) (request Socks5UDPRequest, err error) {
|
||||
//buf := make([]byte, 4 * 1024) // Regular UDP packet size is 1500 bytes.
|
||||
|
||||
return
|
||||
}
|
||||
+17
-8
@@ -10,10 +10,13 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
mrand "math/rand"
|
||||
"time"
|
||||
|
||||
"github.com/v2ray/v2ray-core"
|
||||
v2hash "github.com/v2ray/v2ray-core/hash"
|
||||
v2io "github.com/v2ray/v2ray-core/io"
|
||||
"github.com/v2ray/v2ray-core/log"
|
||||
v2math "github.com/v2ray/v2ray-core/math"
|
||||
v2net "github.com/v2ray/v2ray-core/net"
|
||||
)
|
||||
|
||||
@@ -57,7 +60,6 @@ func NewVMessRequestReader(vUserSet core.UserSet) *VMessRequestReader {
|
||||
}
|
||||
|
||||
func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
|
||||
|
||||
buffer := make([]byte, 256)
|
||||
|
||||
nBytes, err := reader.Read(buffer[:core.IDBytesLen])
|
||||
@@ -76,7 +78,7 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
aesStream := cipher.NewCFBDecrypter(aesCipher, core.TimestampHash(timeSec))
|
||||
aesStream := cipher.NewCFBDecrypter(aesCipher, v2hash.Int64Hash(timeSec))
|
||||
decryptor := v2io.NewCryptionReader(aesStream, reader)
|
||||
|
||||
if err != nil {
|
||||
@@ -180,18 +182,25 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
|
||||
}
|
||||
|
||||
type VMessRequestWriter struct {
|
||||
idHash v2hash.CounterHash
|
||||
randomRangeInt64 v2math.RandomInt64InRange
|
||||
}
|
||||
|
||||
func NewVMessRequestWriter() *VMessRequestWriter {
|
||||
return &VMessRequestWriter{}
|
||||
func NewVMessRequestWriter(idHash v2hash.CounterHash, randomRangeInt64 v2math.RandomInt64InRange) *VMessRequestWriter {
|
||||
return &VMessRequestWriter{
|
||||
idHash: idHash,
|
||||
randomRangeInt64: randomRangeInt64,
|
||||
}
|
||||
}
|
||||
|
||||
func (w *VMessRequestWriter) Write(writer io.Writer, request *VMessRequest) error {
|
||||
buffer := make([]byte, 0, 300)
|
||||
userHash, timeSec := request.UserId.TimeRangeHash(30)
|
||||
|
||||
log.Debug("Writing userhash: %v", userHash)
|
||||
buffer = append(buffer, userHash...)
|
||||
counter := w.randomRangeInt64(time.Now().UTC().Unix(), 30)
|
||||
idHash := w.idHash.Hash(request.UserId.Bytes, counter)
|
||||
|
||||
log.Debug("Writing userhash: %v", idHash)
|
||||
buffer = append(buffer, idHash...)
|
||||
|
||||
encryptionBegin := len(buffer)
|
||||
|
||||
@@ -241,7 +250,7 @@ func (w *VMessRequestWriter) Write(writer io.Writer, request *VMessRequest) erro
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
aesStream := cipher.NewCFBEncrypter(aesCipher, core.TimestampHash(timeSec))
|
||||
aesStream := cipher.NewCFBEncrypter(aesCipher, v2hash.Int64Hash(counter))
|
||||
cWriter := v2io.NewCryptionWriter(aesStream, writer)
|
||||
|
||||
_, err = writer.Write(buffer[0:encryptionBegin])
|
||||
|
||||
@@ -7,13 +7,14 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/v2ray/v2ray-core"
|
||||
v2hash "github.com/v2ray/v2ray-core/hash"
|
||||
v2math "github.com/v2ray/v2ray-core/math"
|
||||
v2net "github.com/v2ray/v2ray-core/net"
|
||||
"github.com/v2ray/v2ray-core/testing/mocks"
|
||||
"github.com/v2ray/v2ray-core/testing/unit"
|
||||
)
|
||||
|
||||
func TestVMessSerialization(t *testing.T) {
|
||||
t.Skip()
|
||||
assert := unit.Assert(t)
|
||||
|
||||
userId, err := core.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
|
||||
@@ -21,7 +22,7 @@ func TestVMessSerialization(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
userSet := mocks.MockUserSet{[]core.ID{}, make(map[string]int)}
|
||||
userSet := mocks.MockUserSet{[]core.ID{}, make(map[string]int), make(map[string]int64)}
|
||||
userSet.AddUser(core.User{userId})
|
||||
|
||||
request := new(VMessRequest)
|
||||
@@ -47,13 +48,15 @@ func TestVMessSerialization(t *testing.T) {
|
||||
request.Address = v2net.DomainAddress("v2ray.com", 80)
|
||||
|
||||
buffer := bytes.NewBuffer(make([]byte, 0, 300))
|
||||
requestWriter := NewVMessRequestWriter()
|
||||
mockTime := int64(1823730)
|
||||
requestWriter := NewVMessRequestWriter(v2hash.NewTimeHash(v2hash.HMACHash{}), func(base int64, delta int) int64 { return mockTime })
|
||||
err = requestWriter.Write(buffer, request)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
userSet.UserHashes[string(buffer.Bytes()[:16])] = 0
|
||||
userSet.Timestamps[string(buffer.Bytes()[:16])] = mockTime
|
||||
|
||||
requestReader := NewVMessRequestReader(&userSet)
|
||||
actualRequest, err := requestReader.Read(buffer)
|
||||
@@ -72,7 +75,7 @@ func TestVMessSerialization(t *testing.T) {
|
||||
|
||||
func BenchmarkVMessRequestWriting(b *testing.B) {
|
||||
userId, _ := core.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
|
||||
userSet := mocks.MockUserSet{[]core.ID{}, make(map[string]int)}
|
||||
userSet := mocks.MockUserSet{[]core.ID{}, make(map[string]int), make(map[string]int64)}
|
||||
userSet.AddUser(core.User{userId})
|
||||
|
||||
request := new(VMessRequest)
|
||||
@@ -86,7 +89,7 @@ func BenchmarkVMessRequestWriting(b *testing.B) {
|
||||
request.Command = byte(0x01)
|
||||
request.Address = v2net.DomainAddress("v2ray.com", 80)
|
||||
|
||||
requestWriter := NewVMessRequestWriter()
|
||||
requestWriter := NewVMessRequestWriter(v2hash.NewTimeHash(v2hash.HMACHash{}), v2math.GenerateRandomInt64InRange)
|
||||
for i := 0; i < b.N; i++ {
|
||||
requestWriter.Write(ioutil.Discard, request)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user