other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 20:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check "serverNames" and "shortIds" (client side) 

Prevents https://github.com/XTLS/Xray-core/issues/1675
This commit is contained in:
RPRX 2023-02-21 13:43:13 +00:00 committed by GitHub
parent 4d5c3195d2
commit 9d3de59d3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/conf/transport_internet.go
View File

@ -631,12 +631,18 @@ func (c *REALITYConfig) Build() (proto.Message, error) {
if config.Fingerprint == "hellogolang" { if config.Fingerprint == "hellogolang" {
return nil, newError(`invalid "fingerprint": `, config.Fingerprint) return nil, newError(`invalid "fingerprint": `, config.Fingerprint)
} }
if len(c.ServerNames) != 0 {
return nil, newError(`non-empty "serverNames", please use "serverName" instead`)
}
if c.PublicKey == "" { if c.PublicKey == "" {
return nil, newError(`empty "publicKey"`) return nil, newError(`empty "publicKey"`)
} }
if config.PublicKey, err = base64.RawURLEncoding.DecodeString(c.PublicKey); err != nil || len(config.PublicKey) != 32 { if config.PublicKey, err = base64.RawURLEncoding.DecodeString(c.PublicKey); err != nil || len(config.PublicKey) != 32 {
return nil, newError(`invalid "publicKey": `, c.PublicKey) return nil, newError(`invalid "publicKey": `, c.PublicKey)
} }
if len(c.ShortIds) != 0 {
return nil, newError(`non-empty "shortIds", please use "shortId" instead`)
}
config.ShortId = make([]byte, 8) config.ShortId = make([]byte, 8)
if _, err = hex.Decode(config.ShortId, []byte(c.ShortId)); err != nil { if _, err = hex.Decode(config.ShortId, []byte(c.ShortId)); err != nil {
return nil, newError(`invalid "shortId": `, c.ShortId) return nil, newError(`invalid "shortId": `, c.ShortId)