From c2cc25e2a146e42d70cf341c9f4c67ec21542484 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 19 Apr 2020 00:15:47 -0500 Subject: [PATCH] Fix bug receiving DeviceInfo after successful login --- src/bc/de.rs | 26 +++++++++++++-- src/bc/samples/modern_login_failed.bin | Bin 0 -> 24 bytes src/bc/samples/modern_login_success.bin | Bin 0 -> 2973 bytes src/bc/xml.rs | 42 +++++++++++++++++++++++- 4 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/bc/samples/modern_login_failed.bin create mode 100644 src/bc/samples/modern_login_success.bin 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 0000000000000000000000000000000000000000..2f57793ad857740a21e6da4d9193bc9e5719cb84 GIT binary patch literal 24 RcmexxZx0tE0|HEdasWUd11A6g literal 0 HcmV?d00001 diff --git a/src/bc/samples/modern_login_success.bin b/src/bc/samples/modern_login_success.bin new file mode 100644 index 0000000000000000000000000000000000000000..9c4edb28fe2eee3c23d53c80cd07c3300df52178 GIT binary patch literal 2973 zcmbW3?N1te7RLwT1H~B~7SWC{TE!}$47RA1OUsA?JEIhzpfDnmD2pvqFw}-M?Yq^!=V6gWW~D@n(6!gm8Z6{Lbf` z^F8ygfBvMDVHoyx1$@Eho%F!;zj3v6^OgH^lY!<=|M(`J^8jv*?3MM`3QD$%fy_t@r63u-b~fg?`zSil0`! zqqo^oJ>uv0QBx5y16`&`C3)=tT4kewL!6#aI_we<4^C(l~TYTzC|##mOpm2{2W zu2yLF8|zCp6a51xMjDG5@QR(~5C@#P50^N|qh588bj#PKBHU5Oc)-HQfVW#{dLYB! znsv%_+(YiC2K;Pn+I2R^4K;V`aNrK-N~zphDALXbALQ1Yfu6g8;BKZr?66nT5P!%* zDU=6|5YI^159fHWr|_>w`$9~tyf!DQ)OJSQwUb8iY1s=gHfrt)-ucUfO3msi`px3t z801^Avo0hULvZjH(@n+l6mXvH8)tD`3I6>i1HtUisqxhn8MU2G3pTjli%h@JivEXs z+3moY=X~IYJeY7tZg=9AG}OImFiMk`n%82dX_Q9~fP}u>a4==&7illYz`3ni&IkRB z`iAdewTMIa>WZ2EQ_3gEJF9Bp9`mdLr@ndAKi*t}Rb<()U^8O1xuz=OcgaD>JHy#n zg{Ht+EAePkWoOmI>WY#)Tm+6cG5k67FVm^4JrLI;#%>(W32r+Z)EuVzCI5PPzTZFT zqe4$tDUnU}jRNngy|mz8c{1V!Zi7t@nnd+ttd(T8v4Pk?oJChy&%m5@6rI!UuY37c z#-fD2^qCmka}4=g*eYskSrBdZ5_&r$2;je92lt&rJfi%^w$FB%CPqtTMc{E?OMN3o zBP{!XdcDla*As63XRA&*lbrCMm}NvdHR6A7rO5TTr+z!rE7*YdcbTDK#P@YdK=IoT zH=M%CQ^EP(dXs?jzLPeJe3p#%p10~s;auHb@<0BaaSxq)2K`;BsM|&H^E$>oHuaRE zdB}5mo*25G+w2$Suw9G#oZee=bC7>kku7jxfNS=Xp$m9&zI) zODX>2oOgsVC~%}h1&$Yd@^v^62P2Md`YS09sKcYKKj;f7PKW)+CM^ki;{U)jV6h$yM|Hb67c1tXzR76m!=?QE zFCBRWA7d{;`VPAA-+idVVm3(!Z&>LH;3?d;mFe~ey_2mh+&k&_GO-eBZ&B*&qmF!^ zE*%x=m85g)^UH&K&z@mCedGn`c;66X@ zJ2%sc<@2#*OQxp8LUOp-5$A#X>i@9_Z z>1JDYj*GOY%j?r8TZ~*_qJST6lV>RC= zqk`#PAefCukgh5BXZwa74CplYyKg1%myHco>8Drt^2aS&*kicr&#MCTou}yB6}@~s z@oV(pSMUu#JU2Ix|F@1Ng#qAxV{O(waN4FJ*AkNh=WTT92I6j!DaEG||2sxoGBXu& zUR#GR@a(ZvNcD(&@_aA74@rB-NI{;G4mjflJ$-`opzyw + + + 0 + 1 + + 3840*2160 + 3840 + 2160 + + English + 0 + none + IPC + 33554880 + 0 + 0 + 1 + + "#); + + // Needs to ignore all the other crap that we don't care about + let b = Body::try_parse(sample.as_bytes()).unwrap(); + println!("{:?}", b); + match b { + Body { + device_info: Some(DeviceInfo { + resolution: Resolution { + width: 3840, + height: 2160, + .. + }, .. + }), .. + } => assert!(true), + _ => assert!(false) + } +}