diff --git a/src/bc/de.rs b/src/bc/de.rs index 6c837c9..33bdc48 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -102,7 +102,10 @@ fn bc_legacy_login_msg<'a, 'b>(buf: &'b [u8]) fn bc_modern_msg<'a, 'b>(header: &'a BcHeader, buf: &'b [u8]) -> IResult<&'b [u8], ModernMsg> { - let end_of_xml = header.bin_offset.unwrap_or(header.body_len); + let end_of_xml = match header.bin_offset { + Some(off) if off > 0 => off, + _ => header.body_len + }; let (mut buf, body_buf) = take(end_of_xml)(buf)?; @@ -215,7 +218,6 @@ fn test_bc_modern_login_failed() { assert_eq!(header.enc_offset, 0x0); assert_eq!(header.encrypted, true); assert_eq!(header.class, 0x0000); - println!("{:?}", body); match body { BcBody::ModernMsg(ModernMsg{ xml: None, binary: None }) => { assert!(true); @@ -223,3 +225,23 @@ fn test_bc_modern_login_failed() { _ => assert!(false), } } + +#[test] +fn test_bc_modern_login_success() { + let sample = include_bytes!("samples/modern_login_success.bin"); + + let (buf, header) = bc_header(&sample[..]).unwrap(); + let (_, body) = bc_body(&header, buf).unwrap(); + assert_eq!(header.msg_id, 1); + assert_eq!(header.body_len, 2949); + assert_eq!(header.enc_offset, 0x0); + assert_eq!(header.encrypted, true); + assert_eq!(header.class, 0x0000); + + // Previously, we were not handling bin_offset == 0 (no bin offset) correctly. + // Test that we decoded XML and no binary. + match body { + BcBody::ModernMsg(ModernMsg{ xml: Some(_), binary: None }) => assert!(true), + _ => assert!(false), + } +} diff --git a/src/bc/samples/modern_login_failed.bin b/src/bc/samples/modern_login_failed.bin new file mode 100644 index 0000000..2f57793 Binary files /dev/null and b/src/bc/samples/modern_login_failed.bin differ diff --git a/src/bc/samples/modern_login_success.bin b/src/bc/samples/modern_login_success.bin new file mode 100644 index 0000000..9c4edb2 Binary files /dev/null and b/src/bc/samples/modern_login_success.bin differ diff --git a/src/bc/xml.rs b/src/bc/xml.rs index c94c5c7..15b8fbf 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -76,7 +76,6 @@ impl Default for LoginNet { #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] pub struct DeviceInfo { - #[yaserde(rename="Resolution")] pub resolution: Resolution, } @@ -178,3 +177,44 @@ fn test_login_ser() { assert_eq!(b, b3); assert_eq!(b2, b3); } + +#[test] +fn test_deviceinfo_partial_deser() { + let sample = indoc!(r#" + +
+