YGGverse/xash3d-master
1
0
Fork 0
mirror of https://git.mentality.rip/numas13/xash3d-master.git synced 2025-01-22 04:44:31 +00:00
Code Issues Projects Releases Wiki Activity

protocol: do not validate utf8 for wrong version response

Browse Source
This commit is contained in:
Denis Drakhnia 2024-01-17 18:21:15 +02:00
parent 31d918da8f
commit 1ba1ccfe82
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
protocol/src/server.rs
View File

@ -469,13 +469,17 @@ where
cur.expect(GetServerInfoResponse::HEADER)?;
if !cur.as_slice().starts_with(b"\\") {
let s = cur.get_str(cur.remaining())?;
let p = s.rfind(':').ok_or(Error::InvalidPacket)?;
let msg = &s[p + 1..];
match msg.trim() {
"wrong version" => return Err(Error::InvalidProtocolVersion),
_ => return Err(Error::InvalidPacket),
}
let s = cur.get_bytes(cur.remaining())?;
let p = s
.iter()
.rev()
.position(|c| *c == b':')
.ok_or(Error::InvalidPacket)?;
let msg = &s[s.len() - p..];
return match msg {
b" wrong version\n" => Err(Error::InvalidProtocolVersion),
_ => Err(Error::InvalidPacket),
};
}
let mut ret = Self::default();
@ -645,6 +649,15 @@ mod tests {
);
}
#[test]
fn get_server_info_response_wrong_version() {
let s = b"\xff\xff\xff\xffinfo\nfoobar: wrong version\n";
assert_eq!(Packet::decode(s), Err(Error::InvalidProtocolVersion));
let s = b"\xff\xff\xff\xffinfo\nfoobar\xff: wrong version\n";
assert_eq!(Packet::decode(s), Err(Error::InvalidProtocolVersion));
}
#[test]
fn server_add_bots_is_a_number() {
let s = b"0\n\\protocol\\48\\challenge\\4161802725\\players\\0\\max\\32\\bots\\3\\gamedir\\valve\\map\\rats_bathroom\\type\\d\\password\\0\\os\\l\\secure\\0\\lan\\0\\version\\0.19.4\\region\\255\\product\\valve\\nat\\0";