From 68d1c5b70f12dcc64e6eece84c4dbe386b2f6c75 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 19 Apr 2020 14:05:45 -0500 Subject: [PATCH] Implement stateful packet parsing based on binaryData --- Cargo.toml | 7 +- src/bc/de.rs | 129 ++++++++++++++++++------- src/bc/model.rs | 14 +++ src/bc/samples/modern_video_start1.bin | Bin 0 -> 162 bytes src/bc/samples/modern_video_start2.bin | Bin 0 -> 30368 bytes src/bc/ser.rs | 12 ++- src/bc/xml.rs | 57 +++++++++-- src/bc_protocol.rs | 6 +- 8 files changed, 174 insertions(+), 51 deletions(-) create mode 100644 src/bc/samples/modern_video_start1.bin create mode 100644 src/bc/samples/modern_video_start2.bin diff --git a/Cargo.toml b/Cargo.toml index 7a46ed2..e9bbbdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,11 +8,12 @@ edition = "2018" [dependencies] cookie-factory = "0.3.1" +env_logger = "*" err-derive = "0.2.4" -log = "0.4.8" +log = { version = "0.4.8", features = ["release_max_level_warn"] } indoc = "0.3.5" md5 = "0.7.0" nom = "5.1.1" -yaserde = "0.3.15" -yaserde_derive = "0.3.15" +yaserde = { git = "https://github.com/media-io/yaserde.git" } +yaserde_derive = { git = "https://github.com/media-io/yaserde.git" } xml-rs = "0.8.2" diff --git a/src/bc/de.rs b/src/bc/de.rs index 24ba5d0..89c4f47 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -1,9 +1,10 @@ use err_derive::Error; +use log::error; use nom::IResult; use nom::{bytes::streaming::take, number::streaming::*, combinator::*, sequence::*}; use std::io::Read; use super::model::*; -use super::xml::BcXml; +use super::xml::{Extension, AllTopXmls}; use super::xml_crypto; #[derive(Debug, Error)] @@ -28,16 +29,16 @@ impl<'a> From>> for Error { } impl Bc { - pub fn deserialize(r: R) -> Result { + pub fn deserialize(context: &mut BcContext, r: R) -> Result { // Throw away the nom-specific return types - read_from_reader(bc_msg, r) + read_from_reader(|reader| bc_msg(context, reader), r) } } -fn read_from_reader(parser: P, mut rdr: R) -> Result +fn read_from_reader(mut parser: P, mut rdr: R) -> Result where R: Read, E: for<'a> From>> + From, - P: Fn(&[u8]) -> nom::IResult<&[u8], O>, + P: FnMut(&[u8]) -> nom::IResult<&[u8], O>, { let mut input: Vec = Vec::new(); loop { @@ -56,9 +57,9 @@ fn read_from_reader(parser: P, mut rdr: R) -> Result } } -fn bc_msg(buf: &[u8]) -> IResult<&[u8], Bc> { +fn bc_msg<'a, 'b>(context: &'a mut BcContext, buf: &'b [u8]) -> IResult<&'b [u8], Bc> { let (buf, header) = bc_header(buf)?; - let (buf, body) = bc_body(&header, buf)?; + let (buf, body) = bc_body(context, &header, buf)?; let bc = Bc { meta: header.to_meta(), @@ -68,11 +69,11 @@ fn bc_msg(buf: &[u8]) -> IResult<&[u8], Bc> { Ok((buf, bc)) } -fn bc_body<'a, 'b>(header: &'a BcHeader, buf: &'b [u8]) +fn bc_body<'a, 'b, 'c>(context: &'c mut BcContext, header: &'a BcHeader, buf: &'b [u8]) -> IResult<&'b [u8], BcBody> { if header.is_modern() { - let (buf, body) = bc_modern_msg(header, buf)?; + let (buf, body) = bc_modern_msg(context, header, buf)?; Ok((buf, BcBody::ModernMsg(body))) } else { let (buf, body) = match header.msg_id { @@ -99,12 +100,20 @@ fn bc_legacy_login_msg<'a, 'b>(buf: &'b [u8]) })) } -fn bc_modern_msg<'a, 'b>(header: &'a BcHeader, buf: &'b [u8]) +fn bc_modern_msg<'a, 'b, 'c>(context: &mut BcContext, header: &'a BcHeader, buf: &'b [u8]) -> IResult<&'b [u8], ModernMsg> { - let end_of_xml = match header.bin_offset { - Some(off) if off > 0 => off, - _ => header.body_len + use nom::{Err, error::{make_error, ErrorKind}}; + + let mut in_bin_mode = context.in_bin_mode.contains(&header.msg_id); + + // We'd like to know where the XML stops, but we haven't parsed the XML yet to see if the + // binaryData offset in the header is valid + let end_of_xml = if in_bin_mode { 0 } else { + match header.bin_offset { + Some(off) if off > 0 => off, + _ => header.body_len + } }; let (mut buf, body_buf) = take(end_of_xml)(buf)?; @@ -115,31 +124,48 @@ fn bc_modern_msg<'a, 'b>(header: &'a BcHeader, buf: &'b [u8]) &decrypted }; - // Extract remainder of message as binary, if it exists + // Now we'll take the buffer that Nom gave a ref to and parse it. + let mut xml = None; let mut binary = None; - if let Some(bin_offset) = header.bin_offset { - if bin_offset > 0 { - let (buf_after, payload) = map(take(header.body_len - bin_offset), - |x: &[u8]| x.to_vec())(buf)?; - binary = Some(payload); - buf = buf_after; + if end_of_xml > 0 { + // Apply the XML parse function, but throw away the reference to decrypted in the Ok and + // Err case. This error-error-error thing is the same idiom Nom uses internally. + let parsed = AllTopXmls::try_parse(processed_body_buf) + .map_err(|_| Err::Error(make_error(buf, ErrorKind::MapRes)))?; + + // If this is the first message containing binary, the Extension message puts the message + // ID into binary mode, then the first binary is sent after the XML. + match parsed { + AllTopXmls::BcXml(x) => { xml = Some(x); } + AllTopXmls::Extension(Extension { binary_data: _ }) => { + in_bin_mode = true; + } } } - // Now we'll take the buffer that Nom gave a ref to and parse it. Do this last, so we don't - // parse over and over if we get Incompletes on the binary part. Apply the XML parse function, - // but throw away the reference to decrypted in the Ok and Err case This error-error-error - // thing is the same idiom Nom uses internally. - use nom::{Err, error::{make_error, ErrorKind}}; - let xml = if end_of_xml > 0 { - let parsed = BcXml::try_parse(processed_body_buf) - .map_err(|_| Err::Error(make_error(buf, ErrorKind::MapRes)))?; - Some(parsed) - } else { None }; + // If we are in binary mode, extract it + if in_bin_mode { + if let Some(bin_offset) = header.bin_offset { + // Extract remainder of message as binary, if it exists + let (buf_after, payload) = map(take(header.body_len - bin_offset), + |x: &[u8]| x.to_vec())(buf)?; - let msg = ModernMsg { xml, binary, }; + // Since the parser operates in streaming mode, must wait until after we successfully + // receive enough bytes before modifying the context (otherwise we'll alter the + // behavior of future passes of this function even if we didn't yet consume the + // message). + context.in_bin_mode.insert(header.msg_id); - Ok((buf, msg)) + binary = Some(payload); + buf = buf_after; + } else { + // Seriously, Nom, what even is this + error!("Expected header to contain a binary offset, but there was none"); + return Err(Err::Error(make_error(buf, ErrorKind::Verify))); + } + } + + Ok((buf, ModernMsg { xml, binary })) } fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { @@ -170,8 +196,10 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { fn test_bc_modern_login() { let sample = include_bytes!("samples/model_sample_modern_login.bin"); + let mut context = BcContext::new(); + let (buf, header) = bc_header(&sample[..]).unwrap(); - let (_, body) = bc_body(&header, buf).unwrap(); + let (_, body) = bc_body(&mut context, &header, buf).unwrap(); assert_eq!(header.msg_id, 1); assert_eq!(header.body_len, 145); assert_eq!(header.enc_offset, 0x1000000); @@ -189,8 +217,10 @@ fn test_bc_modern_login() { fn test_bc_legacy_login() { let sample = include_bytes!("samples/model_sample_legacy_login.bin"); + let mut context = BcContext::new(); + let (buf, header) = bc_header(&sample[..]).unwrap(); - let (_, body) = bc_body(&header, buf).unwrap(); + let (_, body) = bc_body(&mut context, &header, buf).unwrap(); assert_eq!(header.msg_id, 1); assert_eq!(header.body_len, 1836); assert_eq!(header.enc_offset, 0x1000000); @@ -211,8 +241,10 @@ fn test_bc_legacy_login() { fn test_bc_modern_login_failed() { let sample = include_bytes!("samples/modern_login_failed.bin"); + let mut context = BcContext::new(); + let (buf, header) = bc_header(&sample[..]).unwrap(); - let (_, body) = bc_body(&header, buf).unwrap(); + let (_, body) = bc_body(&mut context, &header, buf).unwrap(); assert_eq!(header.msg_id, 1); assert_eq!(header.body_len, 0); assert_eq!(header.enc_offset, 0x0); @@ -230,8 +262,10 @@ fn test_bc_modern_login_failed() { fn test_bc_modern_login_success() { let sample = include_bytes!("samples/modern_login_success.bin"); + let mut context = BcContext::new(); + let (buf, header) = bc_header(&sample[..]).unwrap(); - let (_, body) = bc_body(&header, buf).unwrap(); + let (_, body) = bc_body(&mut context, &header, buf).unwrap(); assert_eq!(header.msg_id, 1); assert_eq!(header.body_len, 2949); assert_eq!(header.enc_offset, 0x0); @@ -245,3 +279,26 @@ fn test_bc_modern_login_success() { _ => assert!(false), } } + +#[test] +fn test_bc_binary_mode() { + let sample1 = include_bytes!("samples/modern_video_start1.bin"); + let sample2 = include_bytes!("samples/modern_video_start2.bin"); + + let mut context = BcContext::new(); + + let msg1 = Bc::deserialize(&mut context, &sample1[..]).unwrap(); + let msg2 = Bc::deserialize(&mut context, &sample2[..]).unwrap(); + match msg1.body { + BcBody::ModernMsg(ModernMsg{ xml: None, binary: Some(bin) }) => { + assert_eq!(bin.len(), 32); + } + _ => assert!(false), + } + match msg2.body { + BcBody::ModernMsg(ModernMsg{ xml: None, binary: Some(bin) }) => { + assert_eq!(bin.len(), 30344); + } + _ => assert!(false), + } +} diff --git a/src/bc/model.rs b/src/bc/model.rs index bbe2708..555a87c 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,3 +1,4 @@ +use std::collections::HashSet; use super::xml::BcXml; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -62,6 +63,19 @@ pub(super) struct BcSendInfo { pub bin_offset: Option, } +#[derive(Debug)] +pub struct BcContext { + pub(super) in_bin_mode: HashSet, +} + +impl BcContext { + pub fn new() -> BcContext { + BcContext { + in_bin_mode: HashSet::new() + } + } +} + impl BcHeader { pub fn is_modern(&self) -> bool { // Most modern messages have an extra word at the end of the header; this diff --git a/src/bc/samples/modern_video_start1.bin b/src/bc/samples/modern_video_start1.bin new file mode 100644 index 0000000000000000000000000000000000000000..9267f788bc825f65460b02538203d44609f99be8 GIT binary patch literal 162 zcmexxZx0tU0|P@B5CZ|{2_TUL#L7Z0YG$5%vvT7?RZK#n&Kb(eW!tk$PpEbY(n0BjIF&ih-S>pcK5uisLr5i%r4oRmKker9qxJ9z&}*g zTAFcpU1V%&Kxp``^vFn6O$PCait2_221W`%8yWZ+7z#Lmv`7UDhlq(fgk)d<04z%; A=Kufz literal 0 HcmV?d00001 diff --git a/src/bc/samples/modern_video_start2.bin b/src/bc/samples/modern_video_start2.bin new file mode 100644 index 0000000000000000000000000000000000000000..140eb70d19bc3279568c0c9615b24d341799a9d8 GIT binary patch literal 30368 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 PlHyPxCwEBgroJ0JSj&tW literal 0 HcmV?d00001 diff --git a/src/bc/ser.rs b/src/bc/ser.rs index 2c1bc62..794b08e 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -133,24 +133,28 @@ fn do_nothing() -> impl SerializeFn { #[test] fn test_legacy_login_roundtrip() { + let mut context = BcContext::new(); + // I don't want to make up a sample message; just load it let sample = include_bytes!("samples/model_sample_legacy_login.bin"); - let msg = Bc::deserialize::<&[u8]>(&sample[..]).unwrap(); + let msg = Bc::deserialize::<&[u8]>(&mut context, &sample[..]).unwrap(); let ser_buf = msg.serialize(vec!()).unwrap(); - let msg2 = Bc::deserialize::<&[u8]>(ser_buf.as_ref()).unwrap(); + let msg2 = Bc::deserialize::<&[u8]>(&mut context, ser_buf.as_ref()).unwrap(); assert_eq!(msg, msg2); assert_eq!(&sample[..], ser_buf.as_slice()); } #[test] fn test_modern_login_roundtrip() { + let mut context = BcContext::new(); + // I don't want to make up a sample message; just load it let sample = include_bytes!("samples/model_sample_modern_login.bin"); - let msg = Bc::deserialize::<&[u8]>(&sample[..]).unwrap(); + let msg = Bc::deserialize::<&[u8]>(&mut context, &sample[..]).unwrap(); let ser_buf = msg.serialize(vec!()).unwrap(); - let msg2 = Bc::deserialize::<&[u8]>(ser_buf.as_ref()).unwrap(); + let msg2 = Bc::deserialize::<&[u8]>(&mut context, ser_buf.as_ref()).unwrap(); assert_eq!(msg, msg2); } diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 051d4fb..f35e87e 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -5,15 +5,27 @@ use std::io::{Read, Write}; // YaSerde is currently naming the traits and the derive macros identically use yaserde_derive::{YaDeserialize, YaSerialize}; use yaserde::{ser::Config, YaDeserialize, YaSerialize}; -// YaSerde currently needs this imported -#[allow(pub_use_of_private_extern_crate)] -use yaserde::log; #[cfg(test)] use indoc::indoc; +#[derive(PartialEq, Eq, Debug, YaDeserialize)] +#[yaserde(flatten)] +pub(super) enum AllTopXmls { + #[yaserde(rename="body")] + BcXml(BcXml), + Extension(Extension), +} + +// Required for YaDeserialize +impl Default for AllTopXmls { + fn default() -> Self { + AllTopXmls::BcXml(Default::default()) + } +} + #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] -#[yaserde(rename="body")] +#[yaserde(root="body")] pub struct BcXml { #[yaserde(rename="Encryption")] pub encryption: Option, @@ -25,6 +37,12 @@ pub struct BcXml { pub device_info: Option, } +impl AllTopXmls { + pub fn try_parse(s: impl Read) -> Result { + yaserde::de::from_reader(s) + } +} + impl BcXml { pub fn try_parse(s: impl Read) -> Result { yaserde::de::from_reader(s) @@ -87,6 +105,11 @@ pub struct Resolution { pub height: u32, } +#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +pub struct Extension { + #[yaserde(rename="binaryData")] + pub binary_data: u32, +} pub fn xml_ver() -> String { "1.1".to_string() @@ -103,11 +126,17 @@ fn test_encryption_deser() { "#); let b: BcXml = yaserde::de::from_str(sample).unwrap(); - let enc = b.encryption.unwrap(); + let enc = b.encryption.as_ref().unwrap(); assert_eq!(enc.version, "1.1"); assert_eq!(enc.nonce, "9E6D1FCB9E69846D"); assert_eq!(enc.type_, "md5"); + + let t = AllTopXmls::try_parse(sample.as_bytes()).unwrap(); + match t { + AllTopXmls::BcXml(top_b) if top_b == b => assert!(true), + _ => assert!(false) + } } #[test] @@ -204,7 +233,6 @@ fn test_deviceinfo_partial_deser() { // Needs to ignore all the other crap that we don't care about let b = BcXml::try_parse(sample.as_bytes()).unwrap(); - println!("{:?}", b); match b { BcXml { device_info: Some(DeviceInfo { @@ -218,3 +246,20 @@ fn test_deviceinfo_partial_deser() { _ => assert!(false) } } + +#[test] +fn test_binary_deser() { + let _ = env_logger::builder().is_test(true).try_init(); + + let sample = indoc!(r#" + + + 1 + + "#); + let b = AllTopXmls::try_parse(sample.as_bytes()).unwrap(); + match b { + AllTopXmls::Extension(Extension { binary_data: 1 }) => assert!(true), + _ => assert!(false) + } +} diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index fa34f0a..8507b2d 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -9,6 +9,7 @@ use Md5Trunc::*; pub struct BcCamera { address: SocketAddr, + bc_context: BcContext, connection: Option, logged_in: bool, } @@ -54,6 +55,7 @@ impl BcCamera { address, connection: None, logged_in: false, + bc_context: BcContext::new(), }) } @@ -99,7 +101,7 @@ impl BcCamera { legacy_login.serialize(connection)?; - let legacy_reply = Bc::deserialize(connection)?; + let legacy_reply = Bc::deserialize(&mut self.bc_context, connection)?; let nonce; match legacy_reply.body { BcBody::ModernMsg(ModernMsg { @@ -151,7 +153,7 @@ impl BcCamera { modern_login.serialize(connection)?; - let modern_reply = Bc::deserialize(connection)?; + let modern_reply = Bc::deserialize(&mut self.bc_context, connection)?; let device_info; match modern_reply.body { BcBody::ModernMsg(ModernMsg {