black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 10:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Shadowsocks tests; AEAD drop small UDP packets

Browse source 
https://t.me/projectXray/172063
This commit is contained in:
RPRX 2021-01-19 10:35:30 +00:00 committed by GitHub
parent 33755d6e90
commit 8ff43519fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
proxy/shadowsocks/protocol.go
View file

@ -268,6 +268,9 @@ func DecodeUDPPacket(users []*protocol.MemoryUser, payload *buf.Buffer) (*protoc
if len(users) > 1 { if len(users) > 1 {
bs := payload.Bytes() bs := payload.Bytes()
if len(bs) <= 32 {
return nil, nil, newError("len(bs) <= 32")
}
var aeadCipher *AEADCipher var aeadCipher *AEADCipher
var ivLen int32 var ivLen int32

10
proxy/shadowsocks/protocol_test.go
View file

@ -28,7 +28,7 @@ func TestUDPEncoding(t *testing.T) {
Email: "love@example.com", Email: "love@example.com",
Account: toAccount(&Account{ Account: toAccount(&Account{
Password: "shadowsocks-password", Password: "shadowsocks-password",
CipherType: CipherType_AES_128_CFB, CipherType: CipherType_AES_128_GCM,
}), }),
}, },
} }
@ -65,7 +65,7 @@ func TestTCPRequest(t *testing.T) {
Email: "love@example.com", Email: "love@example.com",
Account: toAccount(&Account{ Account: toAccount(&Account{
Password: "tcp-password", Password: "tcp-password",
CipherType: CipherType_CHACHA20, CipherType: CipherType_CHACHA20_POLY1305,
}), }),
}, },
}, },
@ -81,7 +81,7 @@ func TestTCPRequest(t *testing.T) {
Email: "love@example.com", Email: "love@example.com",
Account: toAccount(&Account{ Account: toAccount(&Account{
Password: "password", Password: "password",
CipherType: CipherType_AES_256_CFB, CipherType: CipherType_AES_256_GCM,
}), }),
}, },
}, },
@ -97,7 +97,7 @@ func TestTCPRequest(t *testing.T) {
Email: "love@example.com", Email: "love@example.com",
Account: toAccount(&Account{ Account: toAccount(&Account{
Password: "password", Password: "password",
CipherType: CipherType_CHACHA20_IETF, CipherType: CipherType_AES_128_GCM,
}), }),
}, },
}, },
@ -139,7 +139,7 @@ func TestUDPReaderWriter(t *testing.T) {
user := &protocol.MemoryUser{ user := &protocol.MemoryUser{
Account: toAccount(&Account{ Account: toAccount(&Account{
Password: "test-password", Password: "test-password",
CipherType: CipherType_CHACHA20_IETF, CipherType: CipherType_CHACHA20_POLY1305,
}), }),
} }
cache := buf.New() cache := buf.New()

32
testing/scenarios/shadowsocks_test.go
View file

@ -52,10 +52,10 @@ func TestShadowsocksAES256TCP(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_TCP}, Network: []net.Network{net.Network_TCP},
}), }),
}, },
@ -150,10 +150,10 @@ func TestShadowsocksAES128UDP(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_UDP}, Network: []net.Network{net.Network_UDP},
}), }),
}, },
@ -276,10 +276,10 @@ func TestShadowsocksChacha20TCP(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_TCP}, Network: []net.Network{net.Network_TCP},
}), }),
}, },
@ -369,10 +369,10 @@ func TestShadowsocksChacha20Poly1305TCP(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_TCP}, Network: []net.Network{net.Network_TCP},
}), }),
}, },
@ -461,10 +461,10 @@ func TestShadowsocksAES256GCMTCP(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_TCP}, Network: []net.Network{net.Network_TCP},
}), }),
}, },
@ -560,10 +560,10 @@ func TestShadowsocksAES128GCMUDP(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_UDP}, Network: []net.Network{net.Network_UDP},
}), }),
}, },
@ -658,10 +658,10 @@ func TestShadowsocksAES128GCMUDPMux(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_TCP}, Network: []net.Network{net.Network_TCP},
}), }),
}, },
@ -757,10 +757,10 @@ func TestShadowsocksNone(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP), Listen: net.NewIPOrDomain(net.LocalHostIP),
}), }),
ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{ ProxySettings: serial.ToTypedMessage(&shadowsocks.ServerConfig{
User: &protocol.User{ Users: []*protocol.User{{
Account: account, Account: account,
Level: 1, Level: 1,
}, }},
Network: []net.Network{net.Network_TCP}, Network: []net.Network{net.Network_TCP},
}), }),
}, },