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

delay check of remote address

pull/330/head
Darien Raymond 2016-12-13 09:17:39 +01:00
parent 8ced9aeec8
commit 76776ddf99
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/shadowsocks/protocol.go
View File

@ -97,7 +97,7 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
} }
request.Address = v2net.DomainAddress(string(buffer.BytesFrom(-domainLength))) request.Address = v2net.DomainAddress(string(buffer.BytesFrom(-domainLength)))
default: default:
return nil, nil, errors.New("Shadowsocks|TCP: Unknown address type: ", addrType) // Check address validity after OTA verification.
} }
err = buffer.AppendSupplier(buf.ReadFullFrom(reader, 2)) err = buffer.AppendSupplier(buf.ReadFullFrom(reader, 2))
@ -120,6 +120,10 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
} }
} }
if request.Address == nil {
return nil, nil, errors.New("Shadowsocks|TCP: Invalid remote address.")
}
var chunkReader buf.Reader var chunkReader buf.Reader
if request.Option.Has(RequestOptionOneTimeAuth) { if request.Option.Has(RequestOptionOneTimeAuth) {
chunkReader = NewChunkReader(reader, NewAuthenticator(ChunkKeyGenerator(iv))) chunkReader = NewChunkReader(reader, NewAuthenticator(ChunkKeyGenerator(iv)))

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

@ -152,6 +152,10 @@ func (v *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
return nil, errors.New("VMess|Server: Invalid auth.") return nil, errors.New("VMess|Server: Invalid auth.")
} }
if request.Address == nil {
return nil, errors.New("VMess|Server: Invalid remote address.")
}
return request, nil return request, nil
} }