delay check of remote address

This commit is contained in:
Darien Raymond committed 2016-12-13 09:17:39 +01:00
1 parent 8ced9aeec8
commit 76776ddf99
2 files changed
+9 -1

No files matched your search

+5 -1
View File
@@ -97,7 +97,7 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
}
request.Address = v2net.DomainAddress(string(buffer.BytesFrom(-domainLength)))
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))
@@ -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
if request.Option.Has(RequestOptionOneTimeAuth) {
chunkReader = NewChunkReader(reader, NewAuthenticator(ChunkKeyGenerator(iv)))