github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix error propagation in vmess server

pull/876/head
Darien Raymond 2018-02-22 15:25:26 +01:00
parent cdfbd0317f
commit 80a1e73361
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/vmess/encoding/server.go
View File

@ -195,7 +195,7 @@ func (s *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
// 1 bytes reserved // 1 bytes reserved
request.Command = protocol.RequestCommand(buffer.Byte(37)) request.Command = protocol.RequestCommand(buffer.Byte(37))
invalidRequest := false var invalidRequestErr error
switch request.Command { switch request.Command {
case protocol.RequestCommandMux: case protocol.RequestCommandMux:
request.Address = net.DomainAddress("v1.mux.cool") request.Address = net.DomainAddress("v1.mux.cool")
@ -205,18 +205,17 @@ func (s *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
request.Address = addr request.Address = addr
request.Port = port request.Port = port
} else { } else {
invalidRequest = true invalidRequestErr = newError("invalid address").Base(err)
newError("failed to read address").Base(err).WriteToLog()
} }
default: default:
invalidRequest = true invalidRequestErr = newError("invalid request command: ", request.Command)
} }
if invalidRequest { if invalidRequestErr != nil {
randomLen := dice.Roll(32) + 1 randomLen := dice.Roll(32) + 1
// Read random number of bytes for prevent detection. // Read random number of bytes for prevent detection.
buffer.AppendSupplier(buf.ReadFullFrom(decryptor, randomLen)) buffer.AppendSupplier(buf.ReadFullFrom(decryptor, randomLen))
return nil, newError("invalid request") return nil, invalidRequestErr
} }
if padingLen > 0 { if padingLen > 0 {