From 5baacbeeed2a4dc2a9a613e73f88b3d4ec06fb40 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 1 Oct 2020 16:39:05 +0700 Subject: [PATCH 01/27] Implement bc make ext xml --- src/bc/model.rs | 12 +++++++++++- src/bc/xml.rs | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/bc/model.rs b/src/bc/model.rs index 9ddc4e8..006f7fd 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,4 +1,4 @@ -use super::xml::BcXml; +use super::xml::{BcXml, Extension, TopBcXmls}; use std::collections::HashSet; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -81,6 +81,16 @@ impl Bc { }), } } + + pub fn new_from_ext_xml(meta: BcMeta, xml: Extension) -> Bc { + Bc { + meta, + body: BcBody::ModernMsg(ModernMsg { + xml: Some(TopBcXmls::Extension(xml)), + binary: None, + }), + } + } } impl Default for BcContext { diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 727ae68..4c33d05 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -125,6 +125,8 @@ pub struct Preview { #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] pub struct Extension { + #[yaserde(attribute)] + pub version: String, #[yaserde(rename = "binaryData")] pub binary_data: u32, } From 3acd0b4a3cf48c88ec43ebe3571d2cf390c62807 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Mon, 5 Oct 2020 13:21:33 +0700 Subject: [PATCH 02/27] Updates to the readme --- README.md | 222 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 166 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 1915358..3f60f15 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,19 @@ ![CI](https://github.com/thirtythreeforty/neolink/workflows/CI/badge.svg) -Neolink is a small program that acts as a proxy between Reolink IP cameras and normal RTSP clients. -Certain cameras, such as the Reolink B800, do not implement ONVIF or RTSP, but instead use a proprietary "Baichuan" protocol only compatible with their apps and NVRs (any camera that uses "port 9000" will likely be using this protocol). - -Neolink allows you to use NVR software such as Shinobi or Blue Iris to receive video from these cameras instead. +Neolink is a small program that acts as a proxy between Reolink IP cameras and +normal RTSP clients. +Certain cameras, such as the Reolink B800, do not implement ONVIF or RTSP, but +instead use a proprietary "Baichuan" protocol only compatible with their apps +and NVRs (any camera that uses "port 9000" will likely be using this protocol). +Neolink allows you to use NVR software such as Shinobi or Blue Iris to receive +video from these cameras instead. The Reolink NVR is not required, and the cameras are unmodified. -Your NVR software connects to Neolink, which forwards the video stream from the camera. +Your NVR software connects to Neolink, which forwards the video stream from the +camera. -The Neolink project is not affiliated with Reolink in any way; everything it does has been reverse engineered. +The Neolink project is not affiliated with Reolink in any way; everything it +does has been reverse engineered. ## Supported cameras @@ -21,7 +26,8 @@ Currently it has been tested on the following cameras: - E1 - Lumus -Neolink does not support other cameras such as the RLC-420, since they already [provide native RTSP](https://support.reolink.com/hc/en-us/articles/360007010473-How-to-Live-View-Reolink-Cameras-via-VLC-Media-Player). +Neolink does not support other cameras such as the RLC-420, since they already +[provide native RTSP](https://support.reolink.com/hc/en-us/articles/360007010473-How-to-Live-View-Reolink-Cameras-via-VLC-Media-Player). ## Installation @@ -30,25 +36,33 @@ For now, follow these steps. ### Windows/Linux -1. [Install Gstreamer][gstreamer] from the most recent MSI installer on Windows, or your package manager on Linux. +1. [Install Gstreamer][gstreamer] from the most recent MSI installer on Windows, +or your package manager on Linux. + 2. If you are using Windows, add the following to your `PATH` environment variable: -``` -%GSTREAMER_1_0_ROOT_X86_64%\bin -``` + ``` + %GSTREAMER_1_0_ROOT_X86_64%\bin + ``` -Note that if you use Chocolatey to install Gstreamer, it does this automatically. + **Note:** If you use Chocolatey to install Gstreamer, it does this + automatically. + +3. Download and extract a [prebuilt binary from continuous integration][ci-download] +(click on the topmost commit for the most recent build). -3. Download and extract a [prebuilt binary from continuous integration][ci-download] (click on the topmost commit for the most recent build). 4. Write a configuration file for your cameras. See the section below. + 5. Launch Neolink from a shell, passing your configuration file: -``` -neolink --config my_config.toml -``` + ```bash + neolink --config my_config.toml + ``` 6. Connect your NVR software to Neolink's RTSP server. - The default URL is `rtsp://127.0.0.1:8554/your_camera_name` if you're running it on the same computer. + + The default URL is `rtsp://127.0.0.1:8554/your_camera_name` if you're running + it on the same computer. If you run it on a different server, you may need to open firewall ports. See the "Viewing" section below for more troubleshooting. @@ -60,11 +74,12 @@ neolink --config my_config.toml A Docker image is also available containing Neolink and all its dependencies. The image is `thirtythreeforty/neolink`. Port 8554 is exposed, which is the default listen port. -You must mount a configuration file (see below) into the container at `/etc/neolink.toml`. +You must mount a configuration file (see below) into the container at +`/etc/neolink.toml`. Here is a sample launch commmand: -``` +```bash docker run \ -p 8554:8554 \ --restart=on-failure \ @@ -72,87 +87,168 @@ docker run \ thirtythreeforty/neolink ``` -The Docker image is "best effort" and intended for advanced users; questions about running Docker are outside the scope of Neolink. +The Docker image is "best effort" and intended for advanced users; questions +about running Docker are outside the scope of Neolink. ## Configuration -**Note**: for a more comprehensive setup tutorial, refer to the [Blue Iris setup walkthrough in `docs/`][blue-iris-setup] (which is probably also helpful even with other NVR software). +**Note**: for a more comprehensive setup tutorial, refer to the +[Blue Iris setup walkthrough in `docs/`][blue-iris-setup] (which is probably + also helpful even with other NVR software). [blue-iris-setup]: docs/Setting%20Up%20Neolink%20For%20Use%20With%20Blue%20Iris.md -Copy and modify the `sample_config.toml` to specify the address, username, and password for each camera (if there is no password, you can omit that line). -Each `[[cameras]]` block creates a new camera; the `name` determines the RTSP path you should connect your client to. -Currently Neolink cannot auto-detect cameras like the official clients do; you must specify their IP addresses directly. +Copy and modify the `sample_config.toml` to specify the address, username, and +password for each camera (if there is no password, you can omit that line). -By default the H265 video format is used. Some cameras, for example E1, provide H264 streams. To use these you must specify `format = "h264"` in the `[[cameras]]` config. -Soon this will be auto-detected, and you will not have to know or care about the format. +Each `[[cameras]]` block creates a new camera; the `name` determines the RTSP +path you should connect your client to. +Currently Neolink cannot auto-detect cameras like the official clients do; you +must specify their IP addresses directly. -By default, the HD stream is available at the RTSP path `/name` or `/name/mainStream`, and the SD stream is available at `/name/subStream`. -You can use only the HD stream by adding `stream = "mainStream"` to the `[[cameras]]` config, or only the SD stream with `stream = "subStream"`. +By default the H265 video format is used. Some cameras, for example E1, provide +H264 streams. To use these you must specify `format = "h264"` in the +`[[cameras]]` config. Soon this will be auto-detected, and you will not have to know or care about +the format. -**Note**: The B400/D400 models only support a single stream at a time, so you must add this line to sections for those cameras. +By default, the HD stream is available at the RTSP path `/name` or +`/name/mainStream`, and the SD stream is available at `/name/subStream`. +You can use only the HD stream by adding `stream = "mainStream"` to the +`[[cameras]]` config, or only the SD stream with `stream = "subStream"`. + +**Note**: The B400/D400 models only support a single stream at a time, so you +must add this line to sections for those cameras. By default Neolink serves on all IP addresses on port 8554. You can modify this by changing the `bind` and the `bind_port` parameter. You only need one `bind`/`bind_port` setting at the top of the config file. -You can enable `rtsps` (TLS) by adding a `certificate = "/path/to/pem"` to the top section of the config file. This PEM should contain by the certificate and the key used for the server. If TLS is enabled all connections must use `rtsps`. You can also control client side TLS with the config option `tls_client_auth = "none|request|require"`; in this case the client should present a certificate signed by the server's CA. +You can enable `rtsps` (TLS) by adding a `certificate = "/path/to/pem"` to the +top section of the config file. This PEM should contain by the certificate +and the key used for the server. If TLS is enabled all connections must use +`rtsps`. You can also control client side TLS with the config option +`tls_client_auth = "none|request|require"`; in this case the client should +present a certificate signed by the server's CA. TLS is disabled by default. -You can password-protect the Neolink server by adding `[[users]]`` sections to the configuration file: +You can password-protect the Neolink server by adding `[[users]]` sections to +the configuration file: + ``` [[users]] name: someone pass: somepass ``` -you also need to add the allowed users into each camera by adding the following to `[[cameras]]`. + +you also need to add the allowed users into each camera by adding the following +to `[[cameras]]`. + ``` permitted_users = ["someone", "someoneelse"] ``` -Anywhere a username is accepted it can take any username or one of the following special values. +Anywhere a username is accepted it can take any username or one of the +following special values. + - `anyone` means any user with a valid user/pass - `anonymous` means no user/pass required The default `permitted_users` list is: -- `[ "anonymous"]` if no `[[users]]` were given in the config meaning no authentication required to connect. -- `[ "anyone" ]` if `[[users]]` were provided meaning any authourised users can connect. -You can change the Neolink log level by setting the `RUST_LOG` environment variable (not in the configuration file) to one of `error`, `warn`, `info`, `debug`, or `trace`: +- `[ "anonymous"]` if no `[[users]]` were given in the config meaning no +authentication required to connect. -``` +- `[ "anyone" ]` if `[[users]]` were provided meaning any authourised users can +connect. + +You can change the Neolink log level by setting the `RUST_LOG` environment +variable (not in the configuration file) to one of `error`, `warn`, `info`, +`debug`, or `trace`: + +```sh set RUST_LOG=debug ``` On Linux: -``` +```bash export RUST_LOG=debug ``` ## Viewing -Connect your RTSP client to the stream with the name you provided in the configuration file. -Again, the default URL is `rtsp://127.0.0.1:8554/your_camera_name` if you're running it on the same computer as the client. +Connect your RTSP client to the stream with the name you provided in the +configuration file. + +Again, the default URL is `rtsp://127.0.0.1:8554/your_camera_name` if you're +running it on the same computer as the client. The smaller SD video is `rtsp://127.0.0.1:8554/your_camera_name/subStream`. -4K cameras send large video "key frames" once every few seconds and the client must have a receive buffer large enough to store the entire frame. -If your client's buffer size is configurable (like Blue Iris), ensure it's set to 20MB, which should ensure plenty of headroom. +4K cameras send large video "key frames" once every few seconds and the client +must have a receive buffer large enough to store the entire frame. +If your client's buffer size is configurable (like Blue Iris), ensure it's set +to 20MB, which should ensure plenty of headroom. + +## Motion Detection and MQTT + +If your camera supports motion detection you can have neolink post MQTT +messages to an MQTT server whenever your camera detects motion. To enable this +add the following to your `[[cameras]]` table in the config toml. + +```toml +[cameras.mqtt] +# The address of the mqtt server +server = "127.0.0.1" + +# The port of the mqtt server +port = 1883 + +# Optional: User name and password for mqtt +credentials = ["User4MQTT", "Pass4MQTT"] + +# Optional: The servers encryption certificate +# Enabling this WILL turn on encryption +# You cannot use both ca and client_auth +ca = "/path/to/cert" + +# Optional: The clients encryption certificate and key +# Enabling this WILL turn on encryption +# You cannot use both ca and client_auth +client_auth = ["/Path/to/client/cert", "/Path/to/client/key"] +``` + +Each camera creates its own client with the id `Neolink-CameraName` and each +camera in the config needs a mqtt table to enable it. + +The topic of the message is: + +```mqtt +/neolink/CAMERANAME/status/motion +``` + +With a message of either `on` for motion detected or `off` for motion no longer +detected. ## Stability -Neolink has had minimal testing, but it seems to be very reliable in multiple users' testing. +Neolink has had minimal testing, but it seems to be very reliable in multiple +users' testing. -The formats of all configuration files and APIs is subject to change as required while it is pre-1.0. +The formats of all configuration files and APIs is subject to change as required +while it is pre-1.0. ## Development -Neolink is written in Rust, and binds to Gstreamer to provide RTSP server functionality. -To compile, ensure you have the Rust compiler, Gstreamer, and gst-rtsp-server installed. +Neolink is written in Rust, and binds to Gstreamer to provide RTSP server +functionality. + +To compile, ensure you have the Rust compiler, Gstreamer, and gst-rtsp-server +installed. + Then simply run: -``` +```bash cargo build ``` @@ -160,22 +256,36 @@ from this top directory. ### Baichuan Protocol -The "port 9000" protocol used by Reolink and some Swann cameras is internally referred to as the Baichuan protocol; this is the company based in China that is known internationally as Reolink. +The "port 9000" protocol used by Reolink and some Swann cameras is internally +referred to as the Baichuan protocol; this is the company based in China that +is known internationally as Reolink. + +This protocol is a slightly convoluted header-data format, and appears to have +been upgraded several times. + +The modern variant uses obfuscated XML commands and sends ordinary H.265 or +H.264 video streams encapsulated in a custom header. -This protocol is a slightly convoluted header-data format, and appears to have been upgraded several times. -The modern variant uses obfuscated XML commands and sends ordinary H.265 or H.264 video streams encapsulated in a custom header. More details about the on-the-wire protocol will come later. ### Baichuan dissector -A Wireshark dissector is available for the BC wire protocol in the `dissector` directory. -It dissects the BC header and also allows viewing the deobfuscated XML in command messages. -To use it, copy or symlink it into your Wireshark plugin directory; typically this is `~/.local/lib/wireshark/plugins/` under Linux. +A Wireshark dissector is available for the BC wire protocol in the `dissector` +directory. -Currently the dissector does not attempt to decode the Baichuan "extension" messages except `binaryData`. +It dissects the BC header and also allows viewing the deobfuscated XML in +command messages. +To use it, copy or symlink it into your Wireshark plugin directory; typically +this is `~/.local/lib/wireshark/plugins/` under Linux. + +Currently the dissector does not attempt to decode the Baichuan "extension" +messages except `binaryData`. This will change in the future as reverse engineering needs require. ## License -Neolink is free software, released under the GNU Affero General Public License v3. -This means that if you incorporate it into a piece of software available over the network, you must offer that software's source code to your users. +Neolink is free software, released under the GNU Affero General Public License +v3. + +This means that if you incorporate it into a piece of software available over +the network, you must offer that software's source code to your users. From 4ff53b73afbf9cdb2e373bda60e67dce0dd37b30 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 8 Oct 2020 13:59:55 +0700 Subject: [PATCH 03/27] Refractored bc connection to treat binary as a generic payload --- clippy.toml | 1 - src/bc/de.rs | 87 ++++++++++++++------------------- src/bc/model.rs | 25 +++++++--- src/bc/ser.rs | 28 ++++++++--- src/bc/xml.rs | 32 +++++++++--- src/bc_protocol.rs | 44 ++++++++++++----- src/bc_protocol/media_packet.rs | 17 +++---- src/bc_protocol/time.rs | 18 +++++-- src/main.rs | 1 + 9 files changed, 155 insertions(+), 98 deletions(-) delete mode 100644 clippy.toml diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index 3217898..0000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -enum-variant-size-threshold = 700 diff --git a/src/bc/de.rs b/src/bc/de.rs index 2a7dfec..7f01b17 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -1,5 +1,5 @@ use super::model::*; -use super::xml::{AllTopXmls, Extension}; +use super::xml::{BcPayloads, BcXml, BcXmls}; use super::xml_crypto; use err_derive::Error; use log::*; @@ -116,74 +116,59 @@ fn bc_modern_msg<'a, 'b>( Err, }; - 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 xml_len = match header.bin_offset { + Some(off) => off, + _ => header.body_len, }; - let (mut buf, body_buf) = take(end_of_xml)(buf)?; + let (buf, xml_buf) = take(xml_len)(buf)?; + let payload_len = header.body_len - xml_len; + let (buf, payload_buf) = take(payload_len)(buf)?; let decrypted; - let processed_body_buf = if !header.is_encrypted() { - buf + let processed_xml_buf = if !header.is_encrypted() { + xml_buf } else { - decrypted = xml_crypto::crypt(header.enc_offset, body_buf); + decrypted = xml_crypto::crypt(header.enc_offset, xml_buf); &decrypted }; // Now we'll take the buffer that Nom gave a ref to and parse it. - let mut xml = None; - let mut binary = None; - if end_of_xml > 0 { + let xml; + if xml_len > 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) + let parsed = BcXmls::try_parse(processed_xml_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. All remaining - // messages for that ID are pure binary. - match parsed { - AllTopXmls::BcXml(x) => { - xml = Some(x); - } - AllTopXmls::Extension(Extension { binary_data: _ }) => { - in_bin_mode = true; - } - } + xml = Some(parsed); + } else { + xml = 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)?; - - // 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); - - binary = Some(payload); - buf = buf_after; + // Now to handle the payload block + // This block can either be xml or binary depending on what the message expects. + // For our purposes we use try_parse and if all xml based parsers fail we treat + // As binary + let payload; + if payload_len > 0 { + // Extract remainder of message as binary, if it exists + let decrypted; + let processed_payload_buf = if !header.is_encrypted() { + xml_buf } 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))); + decrypted = xml_crypto::crypt(header.enc_offset, payload_buf); + &decrypted + }; + if let Ok(xml) = BcXml::try_parse(processed_payload_buf) { + payload = Some(BcPayloads::BcXml(xml)); + } else { + payload = Some(BcPayloads::Binary(payload_buf.to_vec())); } + } else { + payload = None; } - Ok((buf, ModernMsg { xml, binary })) + Ok((buf, ModernMsg { xml, payload })) } fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { diff --git a/src/bc/model.rs b/src/bc/model.rs index 006f7fd..06bb234 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,4 +1,4 @@ -use super::xml::{BcXml, Extension, TopBcXmls}; +pub use super::xml::{BcXml, Extension, BcXmls, BcPayloads}; use std::collections::HashSet; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -19,6 +19,7 @@ pub struct Bc { } #[derive(Debug, PartialEq, Eq)] +#[allow(clippy::large_enum_variant)] pub enum BcBody { LegacyMsg(LegacyMsg), ModernMsg(ModernMsg), @@ -26,8 +27,8 @@ pub enum BcBody { #[derive(Debug, Default, PartialEq, Eq)] pub struct ModernMsg { - pub xml: Option, - pub binary: Option>, + pub xml: Option, + pub payload: Option, } #[derive(Debug, PartialEq, Eq)] @@ -76,8 +77,8 @@ impl Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { - xml: Some(xml), - binary: None, + xml: Some(BcXmls::BcXml(xml)), + payload: None, }), } } @@ -86,8 +87,18 @@ impl Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { - xml: Some(TopBcXmls::Extension(xml)), - binary: None, + xml: Some(BcXmls::Extension(xml)), + payload: None, + }), + } + } + + pub fn new_from_meta(meta: BcMeta) -> Bc { + Bc { + meta, + body: BcBody::ModernMsg(ModernMsg { + xml: None, + payload: None, }), } } diff --git a/src/bc/ser.rs b/src/bc/ser.rs index f8a9fa5..fb4f711 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -1,5 +1,5 @@ use super::model::*; -use super::xml::BcXml; +use super::xml::{BcXmls, BcPayloads}; use super::xml_crypto; use cookie_factory::bytes::*; use cookie_factory::sequence::tuple; @@ -24,7 +24,7 @@ impl Bc { body_buf = buf; bin_offset = if has_bin_offset(self.meta.class) { // If we're required to put binary length, put 0 if we have no binary - Some(if modern.binary.is_some() { + Some(if modern.payload.is_some() { xml_len as u32 } else { 0 @@ -47,24 +47,38 @@ impl Bc { // Put the binary part of the body, TODO this is poorly written if let BcBody::ModernMsg(ModernMsg { - binary: Some(ref binary), + payload: Some(ref payload), .. }) = self.body { - let (buf2, _) = gen(slice(binary), buf)?; - buf = buf2 + let (buf2, _) = gen(bc_payload(header.enc_offset, payload), buf)?; + buf = buf2; } Ok(buf) } } -fn bc_xml(enc_offset: u32, xml: &BcXml) -> impl SerializeFn { - let xml_bytes = xml.serialize(vec![]).unwrap(); +fn bc_xml(enc_offset: u32, xml: &BcXmls) -> impl SerializeFn { + let xml_bytes = match xml { + BcXmls::BcXml(x) => x.serialize(vec![]).unwrap(), + BcXmls::Extension(x) => x.serialize(vec![]).unwrap(), + }; let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes); slice(enc_bytes) } +fn bc_payload(enc_offset: u32, payload: &BcPayloads) -> impl SerializeFn { + let payload_bytes = match payload { + BcPayloads::BcXml(x) => { + let xml_bytes = x.serialize(vec![]).unwrap(); + xml_crypto::crypt(enc_offset, &xml_bytes) + }, + BcPayloads::Binary(x) => x.to_owned(), + }; + slice(payload_bytes) +} + fn bc_header(header: &BcHeader) -> impl SerializeFn { // TODO this is actually a u16 "response code" in modern messages let (signaled_encryption, spare) = if header.class == 0x0000 { diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 4c33d05..0e3a45f 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -11,16 +11,32 @@ use indoc::indoc; #[derive(PartialEq, Eq, Debug, YaDeserialize)] #[yaserde(flatten)] -pub(super) enum AllTopXmls { +pub enum BcXmls { #[yaserde(rename = "body")] BcXml(BcXml), Extension(Extension), } // Required for YaDeserialize -impl Default for AllTopXmls { +impl Default for BcXmls { fn default() -> Self { - AllTopXmls::BcXml(Default::default()) + BcXmls::BcXml(Default::default()) + } +} + +#[derive(PartialEq, Eq, Debug, YaDeserialize)] +#[yaserde(flatten)] +pub enum BcPayloads { + #[yaserde(rename = "body")] + BcXml(BcXml), + #[yaserde(flatten)] + Binary(Vec), +} + +// Required for YaDeserialize +impl Default for BcPayloads { + fn default() -> Self { + BcPayloads::Binary(Default::default()) } } @@ -43,7 +59,7 @@ pub struct BcXml { pub norm: Option, } -impl AllTopXmls { +impl BcXmls { pub fn try_parse(s: impl Read) -> Result { yaserde::de::from_reader(s) } @@ -185,9 +201,9 @@ fn test_encryption_deser() { assert_eq!(enc.nonce, "9E6D1FCB9E69846D"); assert_eq!(enc.type_, "md5"); - let t = AllTopXmls::try_parse(sample.as_bytes()).unwrap(); + let t = BcXmls::try_parse(sample.as_bytes()).unwrap(); match t { - AllTopXmls::BcXml(top_b) if top_b == b => assert!(true), + BcXmls::BcXml(top_b) if top_b == b => assert!(true), _ => assert!(false), } } @@ -322,9 +338,9 @@ fn test_binary_deser() { "# ); - let b = AllTopXmls::try_parse(sample.as_bytes()).unwrap(); + let b = BcXmls::try_parse(sample.as_bytes()).unwrap(); match b { - AllTopXmls::Extension(Extension { binary_data: 1 }) => assert!(true), + BcXmls::Extension(Extension { binary_data: 1 }) => assert!(true), _ => assert!(false), } } diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 640f24b..7404d7d 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -24,9 +24,10 @@ use crate::Never; type Result = std::result::Result; -const RX_TIMEOUT: Duration = Duration::from_secs(5); +const RX_TIMEOUT: Duration = Duration::from_secs(500); #[derive(Debug, Error)] +#[allow(clippy::large_enum_variant)] pub enum Error { #[error(display = "Communication error")] CommunicationError(#[error(source)] std::io::Error), @@ -49,8 +50,13 @@ pub enum Error { #[error(display = "Timeout")] Timeout(#[error(source)] std::sync::mpsc::RecvTimeoutError), - #[error(display = "Media")] - MediaPacket(#[error(source)] self::media_packet::Error), + // We map std::sync::mpsc::RecvTimeoutError onto one of these based on + // the errors enum + #[error(display = "Dropped connection")] + TimeoutDropped, + + #[error(display = "Timeout")] + TimeoutTimeout, #[error(display = "Credential error")] AuthFailed, @@ -127,12 +133,18 @@ impl BcCamera { sub_login.send(legacy_login)?; - let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; + let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { + match e { + std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} + std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} + } + })?; + let nonce; match legacy_reply.body { BcBody::ModernMsg(ModernMsg { xml: - Some(BcXml { + Some(BcXmls::BcXml(BcXml { encryption: Some(encryption), .. }), @@ -181,13 +193,18 @@ impl BcCamera { ); sub_login.send(modern_login)?; - let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; + let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { + match e { + std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} + std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} + } + })?; let device_info; match modern_reply.body { BcBody::ModernMsg(ModernMsg { - xml: - Some(BcXml { + payload: + Some(BcPayloads::BcXml(BcXml { device_info: Some(info), .. }), @@ -199,7 +216,7 @@ impl BcCamera { } BcBody::ModernMsg(ModernMsg { xml: None, - binary: None, + payload: None, }) => return Err(Error::AuthFailed), _ => { return Err(Error::UnintelligibleReply { @@ -214,7 +231,7 @@ impl BcCamera { pub fn logout(&mut self) -> Result<()> { if self.logged_in { - // TODO + // TODO: Send message ID 2 } self.logged_in = false; Ok(()) @@ -238,7 +255,12 @@ impl BcCamera { sub_ping.send(ping)?; - sub_ping.rx.recv_timeout(RX_TIMEOUT)?; + sub_ping.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { + match e { + std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} + std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} + } + })?; Ok(()) } diff --git a/src/bc_protocol/media_packet.rs b/src/bc_protocol/media_packet.rs index 3d4689b..f2e3cce 100644 --- a/src/bc_protocol/media_packet.rs +++ b/src/bc_protocol/media_packet.rs @@ -1,6 +1,6 @@ use crate::bc::model::*; use crate::bc_protocol::connection::BcSubscription; -use err_derive::Error; +use super::Error; use log::trace; use log::*; use std::collections::VecDeque; @@ -17,12 +17,6 @@ const PAD_SIZE: usize = 8; type Result = std::result::Result; -#[derive(Debug, Error)] -pub enum Error { - #[error(display = "Timeout")] - Timeout(#[error(source)] std::sync::mpsc::RecvTimeoutError), -} - #[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)] pub enum MediaDataKind { VideoDataIframe, @@ -156,9 +150,14 @@ impl<'a> MediaDataSubscriber<'a> { fn fill_binary_buffer(&mut self, rx_timeout: Duration) -> Result<()> { // Loop messages until we get binary add that data and return loop { - let msg = self.bc_sub.rx.recv_timeout(rx_timeout)?; + let msg = self.bc_sub.rx.recv_timeout(rx_timeout).map_err(|e| { + match e { + std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} + std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} + } + })?; if let BcBody::ModernMsg(ModernMsg { - binary: Some(binary), + payload: Some(BcPayloads::Binary(binary)), .. }) = msg.body { diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index 8777f34..f4f43c2 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -20,11 +20,16 @@ impl BcCamera { }; sub_get_general.send(get)?; - let msg = sub_get_general.rx.recv_timeout(RX_TIMEOUT)?; + let msg = sub_get_general.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { + match e { + std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} + std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} + } + })?; if let BcBody::ModernMsg(ModernMsg { - xml: - Some(BcXml { + payload: + Some(BcPayloads::BcXml(BcXml { system_general: Some(SystemGeneral { time_zone: Some(time_zone), @@ -106,7 +111,12 @@ impl BcCamera { ); sub_set_general.send(set)?; - let msg = sub_set_general.rx.recv_timeout(RX_TIMEOUT)?; + let msg = sub_set_general.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { + match e { + std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} + std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} + } + })?; Ok(()) } diff --git a/src/main.rs b/src/main.rs index 0660aa3..ba790a2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,7 @@ use cmdline::Opt; use config::{CameraConfig, Config, UserConfig}; #[derive(Debug, Error)] +#[allow(clippy::large_enum_variant)] pub enum Error { #[error(display = "Configuration parsing error")] ConfigError(#[error(source)] toml::de::Error), From 31aefdbc742e90f54200315ba3d5c95c2b4b7b33 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 8 Oct 2020 15:13:37 +0700 Subject: [PATCH 04/27] Rename bin_offset to payload_offset --- dissector/baichuan.lua | 24 ++++++++++++------------ src/bc/de.rs | 8 ++++---- src/bc/model.rs | 10 +++++----- src/bc/ser.rs | 10 +++++----- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dissector/baichuan.lua b/dissector/baichuan.lua index 6657992..c5d0b2f 100644 --- a/dissector/baichuan.lua +++ b/dissector/baichuan.lua @@ -10,7 +10,7 @@ message_len = ProtoField.int32("baichuan.msg_len", "messageLen", base.DEC) xml_enc_offset = ProtoField.int32("baichuan.xml_encryption_offset", "xmlEncryptionOffset", base.DEC) xml_enc_used = ProtoField.bool("baichuan.xml_encryption_used", "encrypted", base.NONE) message_class = ProtoField.int32("baichuan.msg_class", "messageClass", base.DEC) -f_bin_offset = ProtoField.int32("baichuan.bin_offset", "binOffset", base.DEC) +f_payload_offset = ProtoField.int32("baichuan.payload_offset", "binOffset", base.DEC) username = ProtoField.string("baichuan.username", "username", base.ASCII) password = ProtoField.string("baichuan.password", "password", base.ASCII) @@ -21,7 +21,7 @@ bc_protocol.fields = { xml_enc_offset, xml_enc_used, message_class, - f_bin_offset, + f_payload_offset, username, password, } @@ -101,12 +101,12 @@ function bc_protocol.dissector(buffer, pinfo, tree) return buffer:len() end - -- bin_offset is either nil (no binary data) or nonzero - -- TODO: bin_offset is actually stateful! - local bin_offset = nil + -- payload_offset is either nil (no binary data) or nonzero + -- TODO: payload_offset is actually stateful! + local payload_offset = nil if header_len == 24 then - bin_offset = buffer(20, 4):le_uint() - if bin_offset == 0 then bin_offset = nil end + payload_offset = buffer(20, 4):le_uint() + if payload_offset == 0 then payload_offset = nil end end local bc_subtree = tree:add(bc_protocol, buffer(), @@ -125,7 +125,7 @@ function bc_protocol.dissector(buffer, pinfo, tree) header:add_le(xml_enc_used, buffer(16, 1)) header:add_le(message_class, buffer(18, 2)) :append_text(" (" .. class .. ")") - header:add_le(f_bin_offset, buffer(20, 4)) + header:add_le(f_payload_offset, buffer(20, 4)) if msg_len == 0 then return @@ -140,11 +140,11 @@ function bc_protocol.dissector(buffer, pinfo, tree) body:add_le(password, buffer(header_len + 32, 32)) end else - local body_tvb = buffer(header_len, bin_offset):tvb() + local body_tvb = buffer(header_len, payload_offset):tvb() body:add(body_tvb(), "XML Payload") if encrypted then - local ba = buffer(header_len, bin_offset):bytes() + local ba = buffer(header_len, payload_offset):bytes() local decrypted = xml_encrypt(ba, enc_offset) body_tvb = decrypted:tvb("Decrypted XML") -- Create a tree item that, when clicked, automatically shows the tab we just created @@ -152,8 +152,8 @@ function bc_protocol.dissector(buffer, pinfo, tree) end Dissector.get("xml"):call(body_tvb, pinfo, body) - if bin_offset ~= nil then - local binary_tvb = buffer(header_len + bin_offset, nil):tvb() + if payload_offset ~= nil then + local binary_tvb = buffer(header_len + payload_offset, nil):tvb() body:add(binary_tvb(), "Binary Payload") if msg_type == 0x03 then -- video Dissector.get("h265"):call(binary_tvb, pinfo, tree) diff --git a/src/bc/de.rs b/src/bc/de.rs index 7f01b17..4175a97 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -116,7 +116,7 @@ fn bc_modern_msg<'a, 'b>( Err, }; - let xml_len = match header.bin_offset { + let xml_len = match header.payload_offset { Some(off) => off, _ => header.body_len, }; @@ -183,7 +183,7 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { // A copy of the source code for the camera would be very useful. let encrypted = response_code != 0; - let (buf, bin_offset) = cond(has_bin_offset(class), le_u32)(buf)?; + let (buf, payload_offset) = cond(has_payload_offset(class), le_u32)(buf)?; Ok(( buf, @@ -193,7 +193,7 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { enc_offset, encrypted, class, - bin_offset, + payload_offset, }, )) } @@ -280,7 +280,7 @@ fn test_bc_modern_login_success() { assert_eq!(header.encrypted, true); assert_eq!(header.class, 0x0000); - // Previously, we were not handling bin_offset == 0 (no bin offset) correctly. + // Previously, we were not handling payload_offset == 0 (no bin offset) correctly. // Test that we decoded XML and no binary. match body { BcBody::ModernMsg(ModernMsg { diff --git a/src/bc/model.rs b/src/bc/model.rs index 06bb234..ec931a3 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -44,7 +44,7 @@ pub(super) struct BcHeader { pub enc_offset: u32, pub encrypted: bool, pub class: u16, - pub bin_offset: Option, + pub payload_offset: Option, } /// The components of the Baichuan TLV header that are not @@ -62,7 +62,7 @@ pub struct BcMeta { #[derive(Debug, PartialEq, Eq)] pub(super) struct BcSendInfo { pub body_len: u32, - pub bin_offset: Option, + pub payload_offset: Option, } #[derive(Debug)] @@ -146,9 +146,9 @@ impl BcHeader { } } - pub fn from_meta(meta: &BcMeta, body_len: u32, bin_offset: Option) -> BcHeader { + pub fn from_meta(meta: &BcMeta, body_len: u32, payload_offset: Option) -> BcHeader { BcHeader { - bin_offset, + payload_offset, body_len, msg_id: meta.msg_id, enc_offset: meta.client_idx, @@ -158,7 +158,7 @@ impl BcHeader { } } -pub(super) fn has_bin_offset(class: u16) -> bool { +pub(super) fn has_payload_offset(class: u16) -> bool { // See BcHeader::is_modern() for a description of which packets have the bin offset class == 0x6414 || class == 0x0000 } diff --git a/src/bc/ser.rs b/src/bc/ser.rs index fb4f711..028002a 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -14,7 +14,7 @@ impl Bc { // Ideally this would be a combinator, but that would be hairy because we have to // serialize the XML to have the metadata to build the header let body_buf; - let bin_offset; + let payload_offset; match &self.body { BcBody::ModernMsg(ref modern) => { let (buf, xml_len) = gen( @@ -22,7 +22,7 @@ impl Bc { vec![], )?; body_buf = buf; - bin_offset = if has_bin_offset(self.meta.class) { + payload_offset = if has_payload_offset(self.meta.class) { // If we're required to put binary length, put 0 if we have no binary Some(if modern.payload.is_some() { xml_len as u32 @@ -36,12 +36,12 @@ impl Bc { BcBody::LegacyMsg(ref legacy) => { let (buf, _) = gen(bc_legacy(legacy), vec![])?; body_buf = buf; - bin_offset = None; + payload_offset = None; } } // Now have enough info to create the header - let header = BcHeader::from_meta(&self.meta, body_buf.len() as u32, bin_offset); + let header = BcHeader::from_meta(&self.meta, body_buf.len() as u32, payload_offset); let (mut buf, _n) = gen(tuple((bc_header(&header), slice(body_buf))), buf)?; @@ -94,7 +94,7 @@ fn bc_header(header: &BcHeader) -> impl SerializeFn { le_u8(signaled_encryption), le_u8(spare), // skipped byte le_u16(header.class), - opt(header.bin_offset, le_u32), + opt(header.payload_offset, le_u32), )) } From d0f760ea7b7ff76a72e1faf33bef8ff653e15a7e Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 8 Oct 2020 15:53:46 +0700 Subject: [PATCH 05/27] Refractor to apply ext xml before payload_offset --- src/bc/de.rs | 30 +++++++++++++++--------------- src/bc/model.rs | 24 +++++++++++++++++------- src/bc/ser.rs | 44 ++++++++++++++++++++++---------------------- src/bc/xml.rs | 21 --------------------- src/bc_protocol.rs | 6 +++--- 5 files changed, 57 insertions(+), 68 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 4175a97..a5b8de6 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -1,5 +1,5 @@ use super::model::*; -use super::xml::{BcPayloads, BcXml, BcXmls}; +use super::xml::{BcPayloads, BcXml}; use super::xml_crypto; use err_derive::Error; use log::*; @@ -116,33 +116,33 @@ fn bc_modern_msg<'a, 'b>( Err, }; - let xml_len = match header.payload_offset { + let ext_len = match header.payload_offset { Some(off) => off, - _ => header.body_len, + _ => 0, // If missing payload_offset treat all as payload }; - let (buf, xml_buf) = take(xml_len)(buf)?; - let payload_len = header.body_len - xml_len; + let (buf, ext_buf) = take(ext_len)(buf)?; + let payload_len = header.body_len - ext_len; let (buf, payload_buf) = take(payload_len)(buf)?; let decrypted; - let processed_xml_buf = if !header.is_encrypted() { - xml_buf + let processed_ext_buf = if !header.is_encrypted() { + ext_buf } else { - decrypted = xml_crypto::crypt(header.enc_offset, xml_buf); + decrypted = xml_crypto::crypt(header.enc_offset, ext_buf); &decrypted }; // Now we'll take the buffer that Nom gave a ref to and parse it. - let xml; - if xml_len > 0 { + let extension; + if ext_len > 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 = BcXmls::try_parse(processed_xml_buf) + let parsed = Extension::try_parse(processed_ext_buf) .map_err(|_| Err::Error(make_error(buf, ErrorKind::MapRes)))?; - xml = Some(parsed); + extension = Some(parsed); } else { - xml = None; + extension = None; } // Now to handle the payload block @@ -154,7 +154,7 @@ fn bc_modern_msg<'a, 'b>( // Extract remainder of message as binary, if it exists let decrypted; let processed_payload_buf = if !header.is_encrypted() { - xml_buf + payload_buf } else { decrypted = xml_crypto::crypt(header.enc_offset, payload_buf); &decrypted @@ -168,7 +168,7 @@ fn bc_modern_msg<'a, 'b>( payload = None; } - Ok((buf, ModernMsg { xml, payload })) + Ok((buf, ModernMsg { extension, payload })) } fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { diff --git a/src/bc/model.rs b/src/bc/model.rs index ec931a3..41c43eb 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,4 +1,4 @@ -pub use super::xml::{BcXml, Extension, BcXmls, BcPayloads}; +pub use super::xml::{BcPayloads, BcXml, Extension}; use std::collections::HashSet; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -27,7 +27,7 @@ pub enum BcBody { #[derive(Debug, Default, PartialEq, Eq)] pub struct ModernMsg { - pub xml: Option, + pub extension: Option, pub payload: Option, } @@ -77,17 +77,17 @@ impl Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { - xml: Some(BcXmls::BcXml(xml)), - payload: None, + extension: None, + payload: Some(BcPayloads::BcXml(xml)), }), } } - pub fn new_from_ext_xml(meta: BcMeta, xml: Extension) -> Bc { + pub fn new_from_ext(meta: BcMeta, xml: Extension) -> Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { - xml: Some(BcXmls::Extension(xml)), + extension: Some(xml), payload: None, }), } @@ -97,11 +97,21 @@ impl Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { - xml: None, + extension: None, payload: None, }), } } + + pub fn new_from_ext_ext(meta: BcMeta, ext: Extension, xml: BcXml) -> Bc { + Bc { + meta, + body: BcBody::ModernMsg(ModernMsg { + extension: Some(ext), + payload: Some(BcPayloads::BcXml(xml)), + }), + } + } } impl Default for BcContext { diff --git a/src/bc/ser.rs b/src/bc/ser.rs index 028002a..c33c93e 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -1,5 +1,5 @@ use super::model::*; -use super::xml::{BcXmls, BcPayloads}; +use super::xml::{BcPayloads}; use super::xml_crypto; use cookie_factory::bytes::*; use cookie_factory::sequence::tuple; @@ -15,55 +15,55 @@ impl Bc { // serialize the XML to have the metadata to build the header let body_buf; let payload_offset; + + match &self.body { BcBody::ModernMsg(ref modern) => { - let (buf, xml_len) = gen( - opt_ref(&modern.xml, |xml| bc_xml(self.meta.client_idx, xml)), + // First serialize ext + let (temp_buf, ext_len) = gen( + opt_ref(&modern.extension, |ext| bc_ext(self.meta.client_idx, ext)), vec![], )?; - body_buf = buf; + + // Now get the offset of the payload payload_offset = if has_payload_offset(self.meta.class) { // If we're required to put binary length, put 0 if we have no binary Some(if modern.payload.is_some() { - xml_len as u32 + ext_len as u32 } else { 0 }) } else { None }; - } + + // Now get the payload part of the body and add to ext_buf + let (temp_buf, _) = gen( + opt_ref(&modern.payload, |payload_offset| bc_payload(self.meta.client_idx, payload_offset)), + temp_buf, + )?; + body_buf = temp_buf; + }, + BcBody::LegacyMsg(ref legacy) => { let (buf, _) = gen(bc_legacy(legacy), vec![])?; body_buf = buf; payload_offset = None; } - } + }; // Now have enough info to create the header let header = BcHeader::from_meta(&self.meta, body_buf.len() as u32, payload_offset); - let (mut buf, _n) = gen(tuple((bc_header(&header), slice(body_buf))), buf)?; + let (buf, _n) = gen(tuple((bc_header(&header), slice(body_buf))), buf)?; - // Put the binary part of the body, TODO this is poorly written - if let BcBody::ModernMsg(ModernMsg { - payload: Some(ref payload), - .. - }) = self.body - { - let (buf2, _) = gen(bc_payload(header.enc_offset, payload), buf)?; - buf = buf2; - } Ok(buf) } } -fn bc_xml(enc_offset: u32, xml: &BcXmls) -> impl SerializeFn { - let xml_bytes = match xml { - BcXmls::BcXml(x) => x.serialize(vec![]).unwrap(), - BcXmls::Extension(x) => x.serialize(vec![]).unwrap(), - }; +fn bc_ext(enc_offset: u32, xml: &Extension) -> impl SerializeFn { + let xml_bytes = xml.serialize(vec![]).unwrap(); let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes); slice(enc_bytes) } diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 0e3a45f..fc58068 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -9,21 +9,6 @@ use yaserde_derive::{YaDeserialize, YaSerialize}; #[cfg(test)] use indoc::indoc; -#[derive(PartialEq, Eq, Debug, YaDeserialize)] -#[yaserde(flatten)] -pub enum BcXmls { - #[yaserde(rename = "body")] - BcXml(BcXml), - Extension(Extension), -} - -// Required for YaDeserialize -impl Default for BcXmls { - fn default() -> Self { - BcXmls::BcXml(Default::default()) - } -} - #[derive(PartialEq, Eq, Debug, YaDeserialize)] #[yaserde(flatten)] pub enum BcPayloads { @@ -59,12 +44,6 @@ pub struct BcXml { pub norm: Option, } -impl BcXmls { - 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) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 7404d7d..d33c4e9 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -143,8 +143,8 @@ impl BcCamera { let nonce; match legacy_reply.body { BcBody::ModernMsg(ModernMsg { - xml: - Some(BcXmls::BcXml(BcXml { + payload: + Some(BcPayloads::BcXml(BcXml { encryption: Some(encryption), .. }), @@ -215,7 +215,7 @@ impl BcCamera { device_info = info; } BcBody::ModernMsg(ModernMsg { - xml: None, + extension: None, payload: None, }) => return Err(Error::AuthFailed), _ => { From edf2f25952b322b268634f695a9f1c454f78347e Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 15 Oct 2020 11:15:38 +0700 Subject: [PATCH 06/27] Fixes from rebase --- src/bc/xml.rs | 16 +++++++++++++++- src/bc_protocol.rs | 4 ++-- src/bc_protocol/time.rs | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/bc/xml.rs b/src/bc/xml.rs index fc58068..5f34261 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -53,6 +53,15 @@ impl BcXml { } } +impl Extension { + pub fn try_parse(s: impl Read) -> Result { + yaserde::de::from_reader(s) + } + pub fn serialize(&self, w: W) -> Result { + yaserde::ser::serialize_with_writer(self, w, &Config::default()) + } +} + #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] pub struct Encryption { #[yaserde(attribute)] @@ -123,7 +132,12 @@ pub struct Extension { #[yaserde(attribute)] pub version: String, #[yaserde(rename = "binaryData")] - pub binary_data: u32, + pub binary_data: Option, + #[yaserde(rename = "userName")] + pub user_name: Option, + pub token: Option, + #[yaserde(rename = "channelId")] + pub channel_id: Option, } #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index d33c4e9..c945d72 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -147,7 +147,7 @@ impl BcCamera { Some(BcPayloads::BcXml(BcXml { encryption: Some(encryption), .. - }), + })), .. }) => { nonce = encryption.nonce; @@ -207,7 +207,7 @@ impl BcCamera { Some(BcPayloads::BcXml(BcXml { device_info: Some(info), .. - }), + })), .. }) => { // Login succeeded! diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index f4f43c2..61d5548 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -42,7 +42,7 @@ impl BcCamera { .. }), .. - }), + })), .. }) = msg.body { From d92cb38ec98b3d34eb5800faeb2a2f3e84150690 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 15 Oct 2020 11:16:06 +0700 Subject: [PATCH 07/27] Rust fmted --- src/bc/ser.rs | 12 ++++++------ src/bc_protocol.rs | 24 +++++++++--------------- src/bc_protocol/media_packet.rs | 16 +++++++++------- src/bc_protocol/time.rs | 26 ++++++++++++++------------ 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/bc/ser.rs b/src/bc/ser.rs index c33c93e..fc6558e 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -1,5 +1,5 @@ use super::model::*; -use super::xml::{BcPayloads}; +use super::xml::BcPayloads; use super::xml_crypto; use cookie_factory::bytes::*; use cookie_factory::sequence::tuple; @@ -16,7 +16,6 @@ impl Bc { let body_buf; let payload_offset; - match &self.body { BcBody::ModernMsg(ref modern) => { // First serialize ext @@ -39,11 +38,13 @@ impl Bc { // Now get the payload part of the body and add to ext_buf let (temp_buf, _) = gen( - opt_ref(&modern.payload, |payload_offset| bc_payload(self.meta.client_idx, payload_offset)), + opt_ref(&modern.payload, |payload_offset| { + bc_payload(self.meta.client_idx, payload_offset) + }), temp_buf, )?; body_buf = temp_buf; - }, + } BcBody::LegacyMsg(ref legacy) => { let (buf, _) = gen(bc_legacy(legacy), vec![])?; @@ -57,7 +58,6 @@ impl Bc { let (buf, _n) = gen(tuple((bc_header(&header), slice(body_buf))), buf)?; - Ok(buf) } } @@ -73,7 +73,7 @@ fn bc_payload(enc_offset: u32, payload: &BcPayloads) -> impl Serialize BcPayloads::BcXml(x) => { let xml_bytes = x.serialize(vec![]).unwrap(); xml_crypto::crypt(enc_offset, &xml_bytes) - }, + } BcPayloads::Binary(x) => x.to_owned(), }; slice(payload_bytes) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index c945d72..e55e93c 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -133,11 +133,9 @@ impl BcCamera { sub_login.send(legacy_login)?; - let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { - match e { - std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} - std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} - } + let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, })?; let nonce; @@ -193,11 +191,9 @@ impl BcCamera { ); sub_login.send(modern_login)?; - let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { - match e { - std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} - std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} - } + let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, })?; let device_info; @@ -255,11 +251,9 @@ impl BcCamera { sub_ping.send(ping)?; - sub_ping.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { - match e { - std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} - std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} - } + sub_ping.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, })?; Ok(()) diff --git a/src/bc_protocol/media_packet.rs b/src/bc_protocol/media_packet.rs index f2e3cce..c16b701 100644 --- a/src/bc_protocol/media_packet.rs +++ b/src/bc_protocol/media_packet.rs @@ -1,6 +1,6 @@ +use super::Error; use crate::bc::model::*; use crate::bc_protocol::connection::BcSubscription; -use super::Error; use log::trace; use log::*; use std::collections::VecDeque; @@ -150,12 +150,14 @@ impl<'a> MediaDataSubscriber<'a> { fn fill_binary_buffer(&mut self, rx_timeout: Duration) -> Result<()> { // Loop messages until we get binary add that data and return loop { - let msg = self.bc_sub.rx.recv_timeout(rx_timeout).map_err(|e| { - match e { - std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} - std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} - } - })?; + let msg = self + .bc_sub + .rx + .recv_timeout(rx_timeout) + .map_err(|e| match e { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, + })?; if let BcBody::ModernMsg(ModernMsg { payload: Some(BcPayloads::Binary(binary)), .. diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index 61d5548..567cd3d 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -20,12 +20,13 @@ impl BcCamera { }; sub_get_general.send(get)?; - let msg = sub_get_general.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { - match e { - std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} - std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} - } - })?; + let msg = sub_get_general + .rx + .recv_timeout(RX_TIMEOUT) + .map_err(|e| match e { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, + })?; if let BcBody::ModernMsg(ModernMsg { payload: @@ -111,12 +112,13 @@ impl BcCamera { ); sub_set_general.send(set)?; - let msg = sub_set_general.rx.recv_timeout(RX_TIMEOUT).map_err(|e| { - match e { - std::sync::mpsc::RecvTimeoutError::Timeout => {Error::TimeoutTimeout} - std::sync::mpsc::RecvTimeoutError::Disconnected => {Error::TimeoutDropped} - } - })?; + let msg = sub_set_general + .rx + .recv_timeout(RX_TIMEOUT) + .map_err(|e| match e { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, + })?; Ok(()) } From 71de7da506e5a88a319b2d3adf9d05db61bc2342 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 29 Oct 2020 12:52:04 +0700 Subject: [PATCH 08/27] Base encryption solely off legacy login reply --- src/bc/de.rs | 4 ++-- src/bc/model.rs | 11 +++++++++++ src/bc/ser.rs | 24 ++++++++++++++++-------- src/bc_protocol.rs | 3 +++ src/bc_protocol/connection.rs | 17 +++++++++++++++-- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index a5b8de6..8b6aa60 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -126,7 +126,7 @@ fn bc_modern_msg<'a, 'b>( let (buf, payload_buf) = take(payload_len)(buf)?; let decrypted; - let processed_ext_buf = if !header.is_encrypted() { + let processed_ext_buf = if !context.get_encrypted() { ext_buf } else { decrypted = xml_crypto::crypt(header.enc_offset, ext_buf); @@ -153,7 +153,7 @@ fn bc_modern_msg<'a, 'b>( if payload_len > 0 { // Extract remainder of message as binary, if it exists let decrypted; - let processed_payload_buf = if !header.is_encrypted() { + let processed_payload_buf = if !context.get_encrypted() { payload_buf } else { decrypted = xml_crypto::crypt(header.enc_offset, payload_buf); diff --git a/src/bc/model.rs b/src/bc/model.rs index 41c43eb..149e76a 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,5 +1,6 @@ pub use super::xml::{BcPayloads, BcXml, Extension}; use std::collections::HashSet; +use std::sync::{Arc, atomic::{AtomicBool, Ordering}}; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -68,6 +69,7 @@ pub(super) struct BcSendInfo { #[derive(Debug)] pub struct BcContext { pub(super) in_bin_mode: HashSet, + pub(super) is_encrypted: Arc, } impl Bc { @@ -124,8 +126,17 @@ impl BcContext { pub fn new() -> BcContext { BcContext { in_bin_mode: HashSet::new(), + is_encrypted: Default::default(), } } + + pub fn set_encrypted(&mut self, is_encrypted: Arc) { + self.is_encrypted = is_encrypted; + } + + pub fn get_encrypted(&self) -> bool { + self.is_encrypted.load(Ordering::Relaxed) + } } impl BcHeader { diff --git a/src/bc/ser.rs b/src/bc/ser.rs index fc6558e..cef65ea 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -10,7 +10,7 @@ use std::io::Write; pub type Error = GenError; impl Bc { - pub fn serialize(&self, buf: W) -> Result { + pub fn serialize(&self, buf: W, encrypted: bool) -> Result { // Ideally this would be a combinator, but that would be hairy because we have to // serialize the XML to have the metadata to build the header let body_buf; @@ -20,7 +20,7 @@ impl Bc { BcBody::ModernMsg(ref modern) => { // First serialize ext let (temp_buf, ext_len) = gen( - opt_ref(&modern.extension, |ext| bc_ext(self.meta.client_idx, ext)), + opt_ref(&modern.extension, |ext| bc_ext(self.meta.client_idx, ext, encrypted)), vec![], )?; @@ -39,7 +39,7 @@ impl Bc { // Now get the payload part of the body and add to ext_buf let (temp_buf, _) = gen( opt_ref(&modern.payload, |payload_offset| { - bc_payload(self.meta.client_idx, payload_offset) + bc_payload(self.meta.client_idx, payload_offset, encrypted) }), temp_buf, )?; @@ -62,17 +62,25 @@ impl Bc { } } -fn bc_ext(enc_offset: u32, xml: &Extension) -> impl SerializeFn { +fn bc_ext(enc_offset: u32, xml: &Extension, encrypted: bool) -> impl SerializeFn { let xml_bytes = xml.serialize(vec![]).unwrap(); - let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes); - slice(enc_bytes) + if encrypted { + let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes); + slice(enc_bytes) + } else { + slice(xml_bytes) + } } -fn bc_payload(enc_offset: u32, payload: &BcPayloads) -> impl SerializeFn { +fn bc_payload(enc_offset: u32, payload: &BcPayloads, encrypted: bool) -> impl SerializeFn { let payload_bytes = match payload { BcPayloads::BcXml(x) => { let xml_bytes = x.serialize(vec![]).unwrap(); - xml_crypto::crypt(enc_offset, &xml_bytes) + if encrypted { + xml_crypto::crypt(enc_offset, &xml_bytes) + } else { + xml_bytes + } } BcPayloads::Binary(x) => x.to_owned(), }; diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index e55e93c..f31bf0a 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -139,6 +139,9 @@ impl BcCamera { })?; let nonce; + if let BcMeta {encrypted: true,..} = legacy_reply.meta { + connection.set_encrypted(true); + } match legacy_reply.body { BcBody::ModernMsg(ModernMsg { payload: diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 7003b6a..8d29504 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -7,7 +7,7 @@ use std::collections::btree_map::Entry; use std::collections::BTreeMap; use std::net::{Shutdown, SocketAddr, TcpStream}; use std::sync::mpsc::{channel, Receiver, Sender}; -use std::sync::{Arc, Mutex}; +use std::sync::{Arc, Mutex, atomic::{AtomicBool, Ordering}}; use std::thread::JoinHandle; use std::time::Duration; @@ -20,6 +20,7 @@ pub struct BcConnection { connection: Arc>, subscribers: Arc>>>, rx_thread: Option>, + is_encrypted: Arc, } pub struct BcSubscription<'a> { @@ -53,8 +54,11 @@ impl BcConnection { let mut subs = subscribers.clone(); let conn = tcp_conn.try_clone()?; + let is_encrypted = Arc::new(AtomicBool::new(false)); + let connections_isencrypted = is_encrypted.clone(); let rx_thread = std::thread::spawn(move || { let mut context = BcContext::new(); + context.set_encrypted(connections_isencrypted); while BcConnection::poll(&mut context, &conn, &mut subs).is_ok() {} }); @@ -62,6 +66,7 @@ impl BcConnection { connection: Arc::new(Mutex::new(tcp_conn)), subscribers, rx_thread: Some(rx_thread), + is_encrypted, }) } @@ -110,6 +115,14 @@ impl BcConnection { Ok(()) } + + pub fn set_encrypted(&self, value: bool) { + self.is_encrypted.store(value, Ordering::Relaxed); + } + + pub fn get_encrypted(&self) -> bool { + self.is_encrypted.load(Ordering::Relaxed) + } } impl Drop for BcConnection { @@ -136,7 +149,7 @@ impl<'a> BcSubscription<'a> { pub fn send(&self, bc: Bc) -> Result<()> { assert!(bc.meta.msg_id == self.msg_id); - bc.serialize(&*self.conn.connection.lock().unwrap())?; + bc.serialize(&*self.conn.connection.lock().unwrap(), self.conn.get_encrypted())?; Ok(()) } } From 6e1cf2f0200a1ac1e53c1a4d307b69f915fd0453 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Mon, 16 Nov 2020 09:23:44 +0700 Subject: [PATCH 09/27] Work on switching encoffset with channelid and msg_mum --- src/bc/de.rs | 13 ++++++++----- src/bc/model.rs | 28 ++++++++++++++-------------- src/bc/ser.rs | 12 ++++++++---- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 8b6aa60..1ce15db 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -129,7 +129,7 @@ fn bc_modern_msg<'a, 'b>( let processed_ext_buf = if !context.get_encrypted() { ext_buf } else { - decrypted = xml_crypto::crypt(header.enc_offset, ext_buf); + decrypted = xml_crypto::crypt(header.channel_id as u32, ext_buf); &decrypted }; @@ -156,7 +156,7 @@ fn bc_modern_msg<'a, 'b>( let processed_payload_buf = if !context.get_encrypted() { payload_buf } else { - decrypted = xml_crypto::crypt(header.enc_offset, payload_buf); + decrypted = xml_crypto::crypt(header.channel_id as u32, payload_buf); &decrypted }; if let Ok(xml) = BcXml::try_parse(processed_payload_buf) { @@ -175,7 +175,9 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { let (buf, _magic) = verify(le_u32, |x| *x == MAGIC_HEADER)(buf)?; let (buf, msg_id) = le_u32(buf)?; let (buf, body_len) = le_u32(buf)?; - let (buf, enc_offset) = le_u32(buf)?; + let (buf, channel_id) = le_u8(buf)?; + let (buf, stream_type) = le_u8(buf)?; + let (buf, msg_num) = le_u16(buf)?; let (buf, (response_code, _ignored, class)) = tuple((le_u8, le_u8, le_u16))(buf)?; // All modern messages are encrypted. In addition, it seems that the camera firmware checks @@ -190,8 +192,9 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { BcHeader { msg_id, body_len, - enc_offset, - encrypted, + channel_id, + stream_type, + msg_num, class, payload_offset, }, diff --git a/src/bc/model.rs b/src/bc/model.rs index 149e76a..a508192 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -42,8 +42,9 @@ pub enum LegacyMsg { pub(super) struct BcHeader { pub body_len: u32, pub msg_id: u32, - pub enc_offset: u32, - pub encrypted: bool, + pub channel_id: u8, + pub stream_type: u8, + pub msg_num: u16, pub class: u16, pub payload_offset: Option, } @@ -53,9 +54,10 @@ pub(super) struct BcHeader { #[derive(Debug, PartialEq, Eq)] pub struct BcMeta { pub msg_id: u32, - pub client_idx: u32, + pub channel_id: u8, + pub stream_type: u8, + pub msg_num: u16, pub class: u16, - pub encrypted: bool, } /// The components of the Baichuan header that must be filled out after the body is serialized, or @@ -142,28 +144,25 @@ impl BcContext { impl BcHeader { pub fn is_modern(&self) -> bool { // Most modern messages have an extra word at the end of the header; this - // serves as the start offset of the appended binary data, if any. + // serves as the start offset of the appended payload data, if any. // A notable exception is the encrypted reply to the login message; // in this case the message is modern (with XML encryption etc), but there is // no extra word. // Here are the message classes: // 0x6514: legacy, no bin offset (initial login message, encrypted or not) // 0x6614: modern, no bin offset (reply to encrypted 0x6514 login) - // 0x6414: modern, has bin offset, always encrypted (re-sent login message) + // 0x6414: modern, has bin offset, encrypted if supported (re-sent login message) // 0x0000, modern, has bin offset (most modern messages) self.class != 0x6514 } - pub fn is_encrypted(&self) -> bool { - self.encrypted || self.class == 0x6414 - } - pub fn to_meta(&self) -> BcMeta { BcMeta { msg_id: self.msg_id, - client_idx: self.enc_offset, + msg_num: self.msg_num, + channel_id: self.channel_id, + stream_type: self.stream_type, class: self.class, - encrypted: self.encrypted, } } @@ -172,9 +171,10 @@ impl BcHeader { payload_offset, body_len, msg_id: meta.msg_id, - enc_offset: meta.client_idx, + channel_id: meta.channel_id, + stream_type: meta.stream_type, + msg_num: meta.msg_num, class: meta.class, - encrypted: meta.encrypted, } } } diff --git a/src/bc/ser.rs b/src/bc/ser.rs index cef65ea..3b6df92 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -20,7 +20,7 @@ impl Bc { BcBody::ModernMsg(ref modern) => { // First serialize ext let (temp_buf, ext_len) = gen( - opt_ref(&modern.extension, |ext| bc_ext(self.meta.client_idx, ext, encrypted)), + opt_ref(&modern.extension, |ext| bc_ext(self.meta.channel_id as u32, ext, encrypted)), vec![], )?; @@ -39,7 +39,7 @@ impl Bc { // Now get the payload part of the body and add to ext_buf let (temp_buf, _) = gen( opt_ref(&modern.payload, |payload_offset| { - bc_payload(self.meta.client_idx, payload_offset, encrypted) + bc_payload(self.meta.channel_id as u32, payload_offset, encrypted) }), temp_buf, )?; @@ -92,13 +92,17 @@ fn bc_header(header: &BcHeader) -> impl SerializeFn { let (signaled_encryption, spare) = if header.class == 0x0000 { (0x00, 0x00) } else { - (header.encrypted as u8, 0xdc) + // Client is always 01dc + // Camera may reply with 01dd (encrypted) or 00dd (unencrypted) + (0x01, 0xdc) }; tuple(( le_u32(MAGIC_HEADER), le_u32(header.msg_id), le_u32(header.body_len), - le_u32(header.enc_offset), + le_u8(header.channel_id), + le_u8(header.stream_type), + le_u16(header.msg_num), le_u8(signaled_encryption), le_u8(spare), // skipped byte le_u16(header.class), From 25b561c976333dfdfb41e5faddc3c02e95624d84 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 26 Nov 2020 13:07:27 +0700 Subject: [PATCH 10/27] More chances to confrom to new protocol --- src/bc_protocol.rs | 37 ++++++++++++++++++++++++++++--------- src/bc_protocol/time.rs | 10 ++++++---- src/config.rs | 2 +- src/main.rs | 2 +- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index f31bf0a..586d781 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -7,6 +7,7 @@ use log::*; use std::io::Write; use std::net::{SocketAddr, ToSocketAddrs}; use std::time::Duration; +use std::sync::atomic::{AtomicU16, Ordering}; use Md5Trunc::*; @@ -16,8 +17,10 @@ mod time; pub struct BcCamera { address: SocketAddr, + channel_id: u8, connection: Option, logged_in: bool, + message_num: AtomicU16 } use crate::Never; @@ -72,7 +75,7 @@ impl Drop for BcCamera { } impl BcCamera { - pub fn new_with_addr(hostname: T) -> Result { + pub fn new_with_addr(hostname: T, channel_id: u8) -> Result { let address = hostname .to_socket_addrs()? .next() @@ -80,11 +83,17 @@ impl BcCamera { Ok(Self { address, + channel_id, + message_num: AtomicU16::new(0), connection: None, logged_in: false, }) } + pub fn new_message_num(&self) -> u16 { + self.message_num.fetch_add(1, Ordering::Relaxed) + } + pub fn connect(&mut self) -> Result<()> { self.connection = Some(BcConnection::new(self.address, RX_TIMEOUT)?); Ok(()) @@ -121,8 +130,9 @@ impl BcCamera { let legacy_login = Bc { meta: BcMeta { msg_id: MSG_ID_LOGIN, - client_idx: 0, - encrypted: true, + channel_id: self.channel_id, + msg_num: self.new_message_num(), + stream_type: 0, class: 0x6514, }, body: BcBody::LegacyMsg(LegacyMsg::LoginMsg { @@ -177,8 +187,9 @@ impl BcCamera { let modern_login = Bc::new_from_xml( BcMeta { msg_id: MSG_ID_LOGIN, - client_idx: 0, // TODO - encrypted: true, + channel_id: self.channel_id, + msg_num: self.new_message_num(), + stream_type: 0, class: 0x6414, }, BcXml { @@ -243,8 +254,9 @@ impl BcCamera { let ping = Bc { meta: BcMeta { msg_id: MSG_ID_PING, - client_idx: 0, - encrypted: true, + channel_id: self.channel_id, + msg_num: self.new_message_num(), + stream_type: 0, class: 0x6414, }, body: BcBody::ModernMsg(ModernMsg { @@ -274,11 +286,18 @@ impl BcCamera { .expect("Must be connected to start video"); let sub_video = connection.subscribe(MSG_ID_VIDEO)?; + let stream_num = match stream_name { + "mainStream" => 0, + "subStream" => 1, + _ => 0, + }; + let start_video = Bc::new_from_xml( BcMeta { msg_id: MSG_ID_VIDEO, - client_idx: 0, // TODO - encrypted: true, + channel_id: self.channel_id, + msg_num: self.new_message_num(), + stream_type: stream_num, class: 0x6414, // IDK why }, BcXml { diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index 567cd3d..98f4d92 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -12,8 +12,9 @@ impl BcCamera { let get = Bc { meta: BcMeta { msg_id: MSG_ID_GET_GENERAL, - client_idx: 0, - encrypted: true, + channel_id: self.channel_id, + msg_num: self.new_message_num(), + stream_type: 0, class: 0x6414, }, body: BcBody::ModernMsg(ModernMsg::default()), @@ -88,8 +89,9 @@ impl BcCamera { let set = Bc::new_from_xml( BcMeta { msg_id: MSG_ID_SET_GENERAL, - client_idx: 0, - encrypted: true, + channel_id: self.channel_id, + msg_num: self.new_message_num(), + stream_type: 0, class: 0x6414, }, BcXml { diff --git a/src/config.rs b/src/config.rs index 765649a..e467994 100644 --- a/src/config.rs +++ b/src/config.rs @@ -74,7 +74,7 @@ pub struct CameraConfig { #[validate(range(min = 0, max = 31, message = "Invalid channel", code = "channel_id"))] #[serde(default = "default_channel_id")] - pub channel_id: u32, + pub channel_id: u8, } #[derive(Debug, Deserialize, Validate, Clone)] diff --git a/src/main.rs b/src/main.rs index ba790a2..3f5e15c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -205,7 +205,7 @@ fn camera_main( ) -> Result { let mut connected = false; (|| { - let mut camera = BcCamera::new_with_addr(camera_config.camera_addr)?; + let mut camera = BcCamera::new_with_addr(camera_config.camera_addr, camera_config.channel_id)?; if camera_config.timeout.is_some() { warn!("The undocumented `timeout` config option has been removed and is no longer needed."); warn!("Please update your config file."); From dda603a9a41eac28a0461346e9a0f9618e361f2c Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 26 Nov 2020 16:43:31 +0700 Subject: [PATCH 11/27] Add message handle and status codes and handel encryption correctly Co-Authored-By: twistedddx --- src/bc/de.rs | 3 ++- src/bc/model.rs | 4 ++++ src/bc_protocol.rs | 6 +++++- src/bc_protocol/time.rs | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 1ce15db..c2c7ea5 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -178,7 +178,7 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { let (buf, channel_id) = le_u8(buf)?; let (buf, stream_type) = le_u8(buf)?; let (buf, msg_num) = le_u16(buf)?; - let (buf, (response_code, _ignored, class)) = tuple((le_u8, le_u8, le_u16))(buf)?; + let (buf, (response_code, class)) = tuple((le_u16, le_u16))(buf)?; // All modern messages are encrypted. In addition, it seems that the camera firmware checks // this field to see if some other messages should be encrypted. This is still somewhat fuzzy. @@ -195,6 +195,7 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { channel_id, stream_type, msg_num, + response_code, class, payload_offset, }, diff --git a/src/bc/model.rs b/src/bc/model.rs index a508192..05d12fb 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -45,6 +45,7 @@ pub(super) struct BcHeader { pub channel_id: u8, pub stream_type: u8, pub msg_num: u16, + pub response_code: u16, pub class: u16, pub payload_offset: Option, } @@ -56,6 +57,7 @@ pub struct BcMeta { pub msg_id: u32, pub channel_id: u8, pub stream_type: u8, + pub response_code: u16, pub msg_num: u16, pub class: u16, } @@ -161,6 +163,7 @@ impl BcHeader { msg_id: self.msg_id, msg_num: self.msg_num, channel_id: self.channel_id, + response_code: self.response_code, stream_type: self.stream_type, class: self.class, } @@ -173,6 +176,7 @@ impl BcHeader { msg_id: meta.msg_id, channel_id: meta.channel_id, stream_type: meta.stream_type, + response_code: meta.response_code, msg_num: meta.msg_num, class: meta.class, } diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 586d781..6b29054 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -133,6 +133,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: 0, + response_code: 0x01dc, class: 0x6514, }, body: BcBody::LegacyMsg(LegacyMsg::LoginMsg { @@ -149,7 +150,7 @@ impl BcCamera { })?; let nonce; - if let BcMeta {encrypted: true,..} = legacy_reply.meta { + if let BcMeta {response_code: 0x01dd,..} = legacy_reply.meta { connection.set_encrypted(true); } match legacy_reply.body { @@ -190,6 +191,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: 0, + response_code: 0, class: 0x6414, }, BcXml { @@ -257,6 +259,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: 0, + response_code: 0, class: 0x6414, }, body: BcBody::ModernMsg(ModernMsg { @@ -298,6 +301,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: stream_num, + response_code: 0, class: 0x6414, // IDK why }, BcXml { diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index 98f4d92..c87ab2d 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -14,6 +14,7 @@ impl BcCamera { msg_id: MSG_ID_GET_GENERAL, channel_id: self.channel_id, msg_num: self.new_message_num(), + response_code: 0, stream_type: 0, class: 0x6414, }, @@ -91,6 +92,7 @@ impl BcCamera { msg_id: MSG_ID_SET_GENERAL, channel_id: self.channel_id, msg_num: self.new_message_num(), + response_code: 0, stream_type: 0, class: 0x6414, }, From a961829c63711bef1f14a5eb8e9cc54189678606 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 26 Nov 2020 17:11:22 +0700 Subject: [PATCH 12/27] Bug fixes from merges Using u8 for channel id throughtout Using simpler map_err Co-Authored-By: twistedddx --- src/bc/xml.rs | 4 ++-- src/bc_protocol.rs | 18 ++++-------------- src/bc_protocol/time.rs | 12 ++---------- src/config.rs | 2 +- src/main.rs | 2 +- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 5f34261..2a83c9d 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -121,7 +121,7 @@ pub struct Preview { pub version: String, #[yaserde(rename = "channelId")] - pub channel_id: u32, + pub channel_id: u8, pub handle: u32, #[yaserde(rename = "streamType")] pub stream_type: String, @@ -137,7 +137,7 @@ pub struct Extension { pub user_name: Option, pub token: Option, #[yaserde(rename = "channelId")] - pub channel_id: Option, + pub channel_id: Option, } #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index e3814d0..9309a2b 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -154,10 +154,7 @@ impl BcCamera { sub_login.send(legacy_login)?; - let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let nonce; if let BcMeta {response_code: 0x01dd,..} = legacy_reply.meta { @@ -217,10 +214,7 @@ impl BcCamera { ); sub_login.send(modern_login)?; - let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let device_info; match modern_reply.body { @@ -279,10 +273,7 @@ impl BcCamera { sub_ping.send(ping)?; - sub_ping.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + sub_ping.rx.recv_timeout(RX_TIMEOUT)?; Ok(()) } @@ -291,7 +282,6 @@ impl BcCamera { &self, data_outs: &mut GstOutputs, stream_name: &str, - channel_id: u32, ) -> Result { let connection = self .connection @@ -317,7 +307,7 @@ impl BcCamera { BcXml { preview: Some(Preview { version: xml_ver(), - channel_id, + channel_id: self.channel_id, handle: 0, stream_type: stream_name.to_string(), }), diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index c87ab2d..44ad836 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -24,11 +24,7 @@ impl BcCamera { sub_get_general.send(get)?; let msg = sub_get_general .rx - .recv_timeout(RX_TIMEOUT) - .map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + .recv_timeout(RX_TIMEOUT)?; if let BcBody::ModernMsg(ModernMsg { payload: @@ -118,11 +114,7 @@ impl BcCamera { sub_set_general.send(set)?; let msg = sub_set_general .rx - .recv_timeout(RX_TIMEOUT) - .map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + .recv_timeout(RX_TIMEOUT)?; Ok(()) } diff --git a/src/config.rs b/src/config.rs index 1c4e42e..dc836b8 100644 --- a/src/config.rs +++ b/src/config.rs @@ -101,7 +101,7 @@ fn default_tls_client_auth() -> String { "none".to_string() } -fn default_channel_id() -> u32 { +fn default_channel_id() -> u8 { 0 } diff --git a/src/main.rs b/src/main.rs index 0e4f8a0..4ae8036 100644 --- a/src/main.rs +++ b/src/main.rs @@ -246,7 +246,7 @@ fn camera_main( "{}: Starting video stream {}", camera_config.name, stream_name ); - camera.start_video(outputs, stream_name, camera_config.channel_id) + camera.start_video(outputs, stream_name) })() .map_err(|err| CameraErr { connected, err }) } From 2e044055502e9c8be5ecf952f25b2986603ccb3f Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Wed, 9 Dec 2020 15:44:33 +0700 Subject: [PATCH 13/27] Format error cause nicely Co-Authored-By: twistedddx --- Cargo.lock | 9 ++------- src/bc_protocol/connection.rs | 10 +++++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aaa95d0..298e758 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1020,14 +1020,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" [[package]] name = "ryu" diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index fa143a4..6c8c127 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -1,5 +1,6 @@ use crate::bc; use crate::bc::model::*; +use std::error::Error as StdErr; // Just need the traits use err_derive::Error; use log::*; use socket2::{Domain, Socket, Type}; @@ -63,7 +64,14 @@ impl BcConnection { result = BcConnection::poll(&mut context, &conn, &mut subs); result.is_ok() } {} - error!("Deserialization error: {:?}", result.unwrap_err()); + let e = result.unwrap_err(); + error!("Deserialization error: {}", e); + let mut cause = e.source(); + while let Some(e) = cause { + error!("caused by: {}", e); + cause = e.source(); + + } }); Ok(BcConnection { From 772ba86156533910879bce2b3798f53728790c6b Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Wed, 14 Apr 2021 17:17:43 +0700 Subject: [PATCH 14/27] Bug fix and preperation for new encryption protocol --- Cargo.lock | 12 +++++++++ Cargo.toml | 1 + src/bc/de.rs | 37 ++++++++++++++++---------- src/bc/model.rs | 38 +++++++++++++++++++++----- src/bc/ser.rs | 50 ++++++++++++++++++++++------------- src/bc/xml_crypto.rs | 28 +++++++++++++++----- src/bc_protocol.rs | 13 +++------ src/bc_protocol/connection.rs | 33 ++++++++++++++--------- src/gst.rs | 6 +---- 9 files changed, 145 insertions(+), 73 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 298e758..64d5001 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,6 +30,17 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +[[package]] +name = "atomic_enum" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a57588a20357c74ee9036656b7fad5c54328ee8657c6ff29ba31fd5ea503a1c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "atty" version = "0.2.14" @@ -777,6 +788,7 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" name = "neolink" version = "0.3.0" dependencies = [ + "atomic_enum", "cookie-factory", "crossbeam", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index dde0a86..a9acc5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,3 +35,4 @@ yaserde_derive = "0.3.16" xml-rs = "0.8" validator = "0.10" validator_derive = "0.10" +atomic_enum = "0.1.1" diff --git a/src/bc/de.rs b/src/bc/de.rs index c2c7ea5..a6e5240 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -99,7 +99,7 @@ fn hex32<'a>() -> impl Fn(&'a [u8]) -> IResult<&'a [u8], String> { }) } -fn bc_legacy_login_msg<'a>(buf: &'a [u8]) -> IResult<&'a [u8], LegacyMsg> { +fn bc_legacy_login_msg(buf: &'_ [u8]) -> IResult<&'_ [u8], LegacyMsg> { let (buf, username) = hex32()(buf)?; let (buf, password) = hex32()(buf)?; @@ -121,16 +121,29 @@ fn bc_modern_msg<'a, 'b>( _ => 0, // If missing payload_offset treat all as payload }; + if header.msg_id == 1 && (header.response_code >> 8) == 0xdd { + // Login reply has the encryption info + // Set that the encryption type now + let encryption_protocol_byte = (header.response_code & 0xff) as usize; + match encryption_protocol_byte { + 0x00 => context.set_encrypted(EncryptionProtocol::Unencrypted), + 0x01 => context.set_encrypted(EncryptionProtocol::VersionOne), + 0x03 => context.set_encrypted(EncryptionProtocol::VersionThree), + _ => context.set_encrypted(EncryptionProtocol::Unknown), + } + } + let (buf, ext_buf) = take(ext_len)(buf)?; let payload_len = header.body_len - ext_len; let (buf, payload_buf) = take(payload_len)(buf)?; let decrypted; - let processed_ext_buf = if !context.get_encrypted() { - ext_buf - } else { - decrypted = xml_crypto::crypt(header.channel_id as u32, ext_buf); - &decrypted + let processed_ext_buf = match context.get_encrypted() { + EncryptionProtocol::Unencrypted => ext_buf, + encryption_protocol => { + decrypted = xml_crypto::crypt(header.channel_id as u32, ext_buf, encryption_protocol); + &decrypted + } }; // Now we'll take the buffer that Nom gave a ref to and parse it. @@ -152,14 +165,10 @@ fn bc_modern_msg<'a, 'b>( let payload; if payload_len > 0 { // Extract remainder of message as binary, if it exists - let decrypted; - let processed_payload_buf = if !context.get_encrypted() { - payload_buf - } else { - decrypted = xml_crypto::crypt(header.channel_id as u32, payload_buf); - &decrypted - }; - if let Ok(xml) = BcXml::try_parse(processed_payload_buf) { + let encryption_protocol = context.get_encrypted(); + let processed_payload_buf = + xml_crypto::crypt(header.channel_id as u32, payload_buf, encryption_protocol); + if let Ok(xml) = BcXml::try_parse(processed_payload_buf.as_slice()) { payload = Some(BcPayloads::BcXml(xml)); } else { payload = Some(BcPayloads::Binary(payload_buf.to_vec())); diff --git a/src/bc/model.rs b/src/bc/model.rs index 05d12fb..ae507ae 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,6 +1,7 @@ pub use super::xml::{BcPayloads, BcXml, Extension}; +use atomic_enum::atomic_enum; use std::collections::HashSet; -use std::sync::{Arc, atomic::{AtomicBool, Ordering}}; +use std::sync::{atomic::Ordering, Arc}; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -70,10 +71,21 @@ pub(super) struct BcSendInfo { pub payload_offset: Option, } +#[atomic_enum] +#[derive(PartialEq)] +pub enum EncryptionProtocol { + Unencrypted = 0, + VersionOne, + VersionThree, + Unknown, +} + #[derive(Debug)] pub struct BcContext { pub(super) in_bin_mode: HashSet, - pub(super) is_encrypted: Arc, + // Arc because it is shared between context + // and connection for deserialisation and serialistion respectivly + pub(super) encryption_protocol: Arc, } impl Bc { @@ -130,16 +142,28 @@ impl BcContext { pub fn new() -> BcContext { BcContext { in_bin_mode: HashSet::new(), - is_encrypted: Default::default(), + encryption_protocol: Arc::new(AtomicEncryptionProtocol::new( + EncryptionProtocol::Unencrypted, + )), } } - pub fn set_encrypted(&mut self, is_encrypted: Arc) { - self.is_encrypted = is_encrypted; + pub fn new_with_encryption_protocol( + encryption_protocol: Arc, + ) -> BcContext { + BcContext { + in_bin_mode: HashSet::new(), + encryption_protocol, + } } - pub fn get_encrypted(&self) -> bool { - self.is_encrypted.load(Ordering::Relaxed) + pub fn set_encrypted(&mut self, encryption_protocol: EncryptionProtocol) { + self.encryption_protocol + .store(encryption_protocol, Ordering::Relaxed); + } + + pub fn get_encrypted(&self) -> EncryptionProtocol { + self.encryption_protocol.load(Ordering::Relaxed) } } diff --git a/src/bc/ser.rs b/src/bc/ser.rs index 3b6df92..7bc13a9 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -5,12 +5,17 @@ use cookie_factory::bytes::*; use cookie_factory::sequence::tuple; use cookie_factory::{combinator::*, gen}; use cookie_factory::{GenError, SerializeFn, WriteContext}; +use log::error; use std::io::Write; pub type Error = GenError; impl Bc { - pub fn serialize(&self, buf: W, encrypted: bool) -> Result { + pub fn serialize( + &self, + buf: W, + encryption_protocol: EncryptionProtocol, + ) -> Result { // Ideally this would be a combinator, but that would be hairy because we have to // serialize the XML to have the metadata to build the header let body_buf; @@ -20,7 +25,9 @@ impl Bc { BcBody::ModernMsg(ref modern) => { // First serialize ext let (temp_buf, ext_len) = gen( - opt_ref(&modern.extension, |ext| bc_ext(self.meta.channel_id as u32, ext, encrypted)), + opt_ref(&modern.extension, |ext| { + bc_ext(self.meta.channel_id as u32, ext, encryption_protocol) + }), vec![], )?; @@ -39,7 +46,11 @@ impl Bc { // Now get the payload part of the body and add to ext_buf let (temp_buf, _) = gen( opt_ref(&modern.payload, |payload_offset| { - bc_payload(self.meta.channel_id as u32, payload_offset, encrypted) + bc_payload( + self.meta.channel_id as u32, + payload_offset, + encryption_protocol, + ) }), temp_buf, )?; @@ -47,7 +58,10 @@ impl Bc { } BcBody::LegacyMsg(ref legacy) => { - let (buf, _) = gen(bc_legacy(legacy), vec![])?; + let (buf, _) = gen(bc_legacy(legacy), vec![]).map_err(|e| { + error!("Send error: {}", e); + e + })?; body_buf = buf; payload_offset = None; } @@ -62,25 +76,25 @@ impl Bc { } } -fn bc_ext(enc_offset: u32, xml: &Extension, encrypted: bool) -> impl SerializeFn { +fn bc_ext( + enc_offset: u32, + xml: &Extension, + encryption_protocol: EncryptionProtocol, +) -> impl SerializeFn { let xml_bytes = xml.serialize(vec![]).unwrap(); - if encrypted { - let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes); - slice(enc_bytes) - } else { - slice(xml_bytes) - } + let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes, encryption_protocol); + slice(enc_bytes) } -fn bc_payload(enc_offset: u32, payload: &BcPayloads, encrypted: bool) -> impl SerializeFn { +fn bc_payload( + enc_offset: u32, + payload: &BcPayloads, + encryption_protocol: EncryptionProtocol, +) -> impl SerializeFn { let payload_bytes = match payload { BcPayloads::BcXml(x) => { let xml_bytes = x.serialize(vec![]).unwrap(); - if encrypted { - xml_crypto::crypt(enc_offset, &xml_bytes) - } else { - xml_bytes - } + xml_crypto::crypt(enc_offset, &xml_bytes, encryption_protocol) } BcPayloads::Binary(x) => x.to_owned(), }; @@ -110,7 +124,7 @@ fn bc_header(header: &BcHeader) -> impl SerializeFn { )) } -fn bc_legacy<'a, W: Write>(legacy: &'a LegacyMsg) -> impl SerializeFn + 'a { +fn bc_legacy(legacy: &'_ LegacyMsg) -> impl SerializeFn + '_ { move |out: WriteContext| { use LegacyMsg::*; match legacy { diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index edfcfe0..efc0c69 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,11 +1,27 @@ +use super::model::EncryptionProtocol; +use log::error; + const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; -pub fn crypt(offset: u32, buf: &[u8]) -> Vec { - let key_iter = XML_KEY.iter().cycle().skip(offset as usize % 8); - key_iter - .zip(buf) - .map(|(key, i)| *i ^ key ^ (offset as u8)) - .collect() +pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: EncryptionProtocol) -> Vec { + match encryption_protocol { + EncryptionProtocol::Unencrypted => buf.to_vec(), + EncryptionProtocol::VersionOne => { + let key_iter = XML_KEY.iter().cycle().skip(offset as usize % 8); + key_iter + .zip(buf) + .map(|(key, i)| *i ^ key ^ (offset as u8)) + .collect() + } + EncryptionProtocol::VersionThree => { + // New protocol here + unimplemented!(); + } + _ => { + error!("Unknown encryption protocol"); + unimplemented!(); + } + } } #[test] diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 9309a2b..09159a9 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -8,8 +8,8 @@ use err_derive::Error; use log::*; use std::io::Write; use std::net::{SocketAddr, ToSocketAddrs}; -use std::time::Duration; use std::sync::atomic::{AtomicU16, Ordering}; +use std::time::Duration; use Md5Trunc::*; @@ -23,7 +23,7 @@ pub struct BcCamera { channel_id: u8, connection: Option, logged_in: bool, - message_num: AtomicU16 + message_num: AtomicU16, } use crate::Never; @@ -157,9 +157,6 @@ impl BcCamera { let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let nonce; - if let BcMeta {response_code: 0x01dd,..} = legacy_reply.meta { - connection.set_encrypted(true); - } match legacy_reply.body { BcBody::ModernMsg(ModernMsg { payload: @@ -278,11 +275,7 @@ impl BcCamera { Ok(()) } - pub fn start_video( - &self, - data_outs: &mut GstOutputs, - stream_name: &str, - ) -> Result { + pub fn start_video(&self, data_outs: &mut GstOutputs, stream_name: &str) -> Result { let connection = self .connection .as_ref() diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 6c8c127..2899b9a 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -1,14 +1,14 @@ use crate::bc; use crate::bc::model::*; -use std::error::Error as StdErr; // Just need the traits use err_derive::Error; use log::*; use socket2::{Domain, Socket, Type}; use std::collections::btree_map::Entry; use std::collections::BTreeMap; +use std::error::Error as StdErr; // Just need the traits use std::net::{Shutdown, SocketAddr, TcpStream}; use std::sync::mpsc::{channel, Receiver, Sender}; -use std::sync::{Arc, Mutex, atomic::{AtomicBool, Ordering}}; +use std::sync::{atomic::Ordering, Arc, Mutex}; use std::thread::JoinHandle; use std::time::Duration; @@ -21,7 +21,9 @@ pub struct BcConnection { connection: Arc>, subscribers: Arc>>>, rx_thread: Option>, - is_encrypted: Arc, + // Arc because it is shared between context + // and connection for deserialisation and serialistion respectivly + encryption_protocol: Arc, } pub struct BcSubscription<'a> { @@ -55,10 +57,13 @@ impl BcConnection { let mut subs = subscribers.clone(); let conn = tcp_conn.try_clone()?; - let is_encrypted = Arc::new(AtomicBool::new(false)); - let connections_isencrypted = is_encrypted.clone(); + let encryption_protocol = Arc::new(AtomicEncryptionProtocol::new( + EncryptionProtocol::Unencrypted, + )); + let connections_encryption_protocol = encryption_protocol.clone(); let rx_thread = std::thread::spawn(move || { - let mut context = BcContext::new(); + let mut context = + BcContext::new_with_encryption_protocol(connections_encryption_protocol); let mut result; while { result = BcConnection::poll(&mut context, &conn, &mut subs); @@ -70,7 +75,6 @@ impl BcConnection { while let Some(e) = cause { error!("caused by: {}", e); cause = e.source(); - } }); @@ -78,7 +82,7 @@ impl BcConnection { connection: Arc::new(Mutex::new(tcp_conn)), subscribers, rx_thread: Some(rx_thread), - is_encrypted, + encryption_protocol, }) } @@ -128,12 +132,12 @@ impl BcConnection { Ok(()) } - pub fn set_encrypted(&self, value: bool) { - self.is_encrypted.store(value, Ordering::Relaxed); + pub fn set_encrypted(&self, value: EncryptionProtocol) { + self.encryption_protocol.store(value, Ordering::Relaxed); } - pub fn get_encrypted(&self) -> bool { - self.is_encrypted.load(Ordering::Relaxed) + pub fn get_encrypted(&self) -> EncryptionProtocol { + self.encryption_protocol.load(Ordering::Relaxed) } } @@ -161,7 +165,10 @@ impl<'a> BcSubscription<'a> { pub fn send(&self, bc: Bc) -> Result<()> { assert!(bc.meta.msg_id == self.msg_id); - bc.serialize(&*self.conn.connection.lock().unwrap(), self.conn.get_encrypted())?; + bc.serialize( + &*self.conn.connection.lock().unwrap(), + self.conn.get_encrypted(), + )?; Ok(()) } } diff --git a/src/gst.rs b/src/gst.rs index 1b4cf4d..53fec3b 100644 --- a/src/gst.rs +++ b/src/gst.rs @@ -13,7 +13,6 @@ use gstreamer_rtsp_server::{ RTSP_PERM_MEDIA_FACTORY_ACCESS, RTSP_PERM_MEDIA_FACTORY_CONSTRUCT, RTSP_TOKEN_MEDIA_FACTORY_ROLE, }; -use itertools::Itertools; use log::*; use std::collections::HashSet; use std::fs; @@ -142,10 +141,7 @@ impl RtspServer { debug!( "Permitting {} to access {}", // This is hashmap or (iter) equivalent of join, it requres itertools - permitted_users - .iter() - .cloned() - .intersperse(", ") + itertools::Itertools::intersperse(permitted_users.iter().cloned(), ", ") .collect::(), paths.join(", ") ); From f479c8282ae00fb4e2a356fadf8116f8cb1e58c2 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 15 Apr 2021 09:23:13 +0700 Subject: [PATCH 15/27] Added firmware update to messages.md --- dissector/messages.md | 66 +++++++++++++++++++++++ src/bc/samples/e1_firmwareupgrade.pcapng | Bin 0 -> 146408 bytes 2 files changed, 66 insertions(+) create mode 100644 src/bc/samples/e1_firmwareupgrade.pcapng diff --git a/dissector/messages.md b/dissector/messages.md index 3b1f904..bddf73d 100644 --- a/dissector/messages.md +++ b/dissector/messages.md @@ -1111,6 +1111,72 @@ a PR to improve it. cameras only have weak encryption that is easily broken since the decryption key is fixed and well-known. + - 67: ` (FW Upgrade)` + + - Client + + - Header + + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 43 | 00 00 01 00 | 00 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | + + - Body + + ```xml + + + + FIRMWAREFILE.pak + SIZE_IN_BYTES + 0 + + + ``` + + - **Notes:** updateParameter refers to updating the settings. If 1 it will restore factory settings. If 0 it will keep current. + + - Camera + + - Header + + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 43 | 00 00 00 00 | 00 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | + + - Client + + - Header + + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 43 | 00 00 94 58 | 00 00 00 00 | 00 00 | 64 14 | 00 00 00 6a | + + - Body + + ```xml + + + 1 + + ``` + + - Binary + + This contains binary data of the file but stops once the message size reaches + 38000 bytes and continues in another packet. There does not appear to + be a checksum or hash and this part contains only the raw bytes of the file. + + - Camera + + - Header + + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 43 | 00 00 00 00 | 00 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | + + - **Notes:** Last two messages repeat until all data is sent + - 76: `` - Client diff --git a/src/bc/samples/e1_firmwareupgrade.pcapng b/src/bc/samples/e1_firmwareupgrade.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..04e7babc64e8fca0396d40f107948f0e97de30c4 GIT binary patch literal 146408 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 M2EP994^WN&0|MeZ{{R30 literal 0 HcmV?d00001 From 02f4cab6ba84d40fa17da81ba8fc2134f1e18913 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 12:35:55 +0700 Subject: [PATCH 16/27] Added AES encryption --- Cargo.lock | 99 +++++++++++++----- Cargo.toml | 2 +- src/bc/de.rs | 7 +- src/bc/model.rs | 48 ++++++--- .../samples/EncryptionProtocol02_login.pcapng | Bin 0 -> 13476 bytes src/bc/ser.rs | 8 +- src/bc/xml_crypto.rs | 16 ++- src/bc_protocol.rs | 11 +- src/bc_protocol/connection.rs | 12 +-- 9 files changed, 146 insertions(+), 57 deletions(-) create mode 100644 src/bc/samples/EncryptionProtocol02_login.pcapng diff --git a/Cargo.lock b/Cargo.lock index de5cfa3..ca6db0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,17 +30,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -[[package]] -name = "atomic_enum" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a57588a20357c74ee9036656b7fad5c54328ee8657c6ff29ba31fd5ea503a1c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "atty" version = "0.2.14" @@ -76,12 +65,24 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +[[package]] +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "clap" version = "2.33.1" @@ -109,7 +110,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -123,7 +124,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", ] @@ -145,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -159,7 +160,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -171,7 +172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -214,6 +215,21 @@ dependencies = [ "synstructure", ] +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "futures" version = "0.3.5" @@ -405,7 +421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 0.1.10", "futures-channel", "futures-core", "futures-util", @@ -725,7 +741,7 @@ checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" dependencies = [ "arrayvec", "bitflags", - "cfg-if", + "cfg-if 0.1.10", "ryu", "static_assertions", ] @@ -742,7 +758,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -788,7 +804,6 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" name = "neolink" version = "0.3.0" dependencies = [ - "atomic_enum", "cookie-factory", "crossbeam", "env_logger", @@ -805,6 +820,7 @@ dependencies = [ "log", "md5", "nom", + "openssl", "regex", "serde", "socket2", @@ -861,9 +877,36 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[package]] +name = "openssl" +version = "0.10.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-sys", +] + +[[package]] +name = "openssl-sys" +version = "0.9.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] [[package]] name = "paste" @@ -1112,7 +1155,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi", @@ -1321,7 +1364,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "standback", "stdweb", @@ -1451,6 +1494,12 @@ dependencies = [ "validator", ] +[[package]] +name = "vcpkg" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" + [[package]] name = "vec_map" version = "0.8.2" @@ -1475,7 +1524,7 @@ version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen-macro", ] diff --git a/Cargo.toml b/Cargo.toml index 6c80ef6..9bc29ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,4 +35,4 @@ yaserde_derive = "0.3.16" xml-rs = "0.8" validator = "0.10" validator_derive = "0.10" -atomic_enum = "0.1.1" +openssl = "0.10.33" diff --git a/src/bc/de.rs b/src/bc/de.rs index a6e5240..0a4c4b9 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -127,8 +127,11 @@ fn bc_modern_msg<'a, 'b>( let encryption_protocol_byte = (header.response_code & 0xff) as usize; match encryption_protocol_byte { 0x00 => context.set_encrypted(EncryptionProtocol::Unencrypted), - 0x01 => context.set_encrypted(EncryptionProtocol::VersionOne), - 0x03 => context.set_encrypted(EncryptionProtocol::VersionThree), + 0x01 => context.set_encrypted(EncryptionProtocol::BCEncrypt), + 0x03 => context.set_encrypted(EncryptionProtocol::Aes(AesKey { + nonce: None, + passwd: None, + })), _ => context.set_encrypted(EncryptionProtocol::Unknown), } } diff --git a/src/bc/model.rs b/src/bc/model.rs index 3906586..1d766e7 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,7 +1,6 @@ pub use super::xml::{BcPayloads, BcXml, Extension}; -use atomic_enum::atomic_enum; use std::collections::HashSet; -use std::sync::{atomic::Ordering, Arc}; +use std::sync::{Arc, Mutex}; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -72,12 +71,32 @@ pub(super) struct BcSendInfo { pub payload_offset: Option, } -#[atomic_enum] -#[derive(PartialEq)] +#[derive(Debug, Clone)] +pub struct AesKey { + pub nonce: Option, + pub passwd: Option, +} + +impl AesKey { + pub fn get_key(&self) -> Option> { + if let (Some(nonce), Some(passwd)) = (&self.nonce, &self.passwd) { + let key_phrase = format!("{}-{}", nonce, passwd); + let key_phrase_hash = format!("{:X}\0", md5::compute(&key_phrase)) + .to_uppercase() + .into_bytes(); + let key = &key_phrase_hash[0..16]; + Some(key.to_vec()) + } else { + None + } + } +} + +#[derive(Debug, Clone)] pub enum EncryptionProtocol { - Unencrypted = 0, - VersionOne, - VersionThree, + Unencrypted, + BCEncrypt, + Aes(AesKey), Unknown, } @@ -86,7 +105,7 @@ pub struct BcContext { pub(super) in_bin_mode: HashSet, // Arc because it is shared between context // and connection for deserialisation and serialistion respectivly - pub(super) encryption_protocol: Arc, + pub(super) encryption_protocol: Arc>, } impl Bc { @@ -122,7 +141,7 @@ impl Bc { } } - pub fn new_from_ext_ext(meta: BcMeta, ext: Extension, xml: BcXml) -> Bc { + pub fn new_from_ext_xml(meta: BcMeta, ext: Extension, xml: BcXml) -> Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { @@ -143,14 +162,12 @@ impl BcContext { pub fn new() -> BcContext { BcContext { in_bin_mode: HashSet::new(), - encryption_protocol: Arc::new(AtomicEncryptionProtocol::new( - EncryptionProtocol::Unencrypted, - )), + encryption_protocol: Arc::new(Mutex::new(EncryptionProtocol::Unencrypted)), } } pub fn new_with_encryption_protocol( - encryption_protocol: Arc, + encryption_protocol: Arc>, ) -> BcContext { BcContext { in_bin_mode: HashSet::new(), @@ -159,12 +176,11 @@ impl BcContext { } pub fn set_encrypted(&mut self, encryption_protocol: EncryptionProtocol) { - self.encryption_protocol - .store(encryption_protocol, Ordering::Relaxed); + *(self.encryption_protocol.lock().unwrap()) = encryption_protocol; } pub fn get_encrypted(&self) -> EncryptionProtocol { - self.encryption_protocol.load(Ordering::Relaxed) + (*(self.encryption_protocol.lock().unwrap())).clone() } } diff --git a/src/bc/samples/EncryptionProtocol02_login.pcapng b/src/bc/samples/EncryptionProtocol02_login.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..11a3af10bddb81416f8d37798fc9f76a37faede1 GIT binary patch literal 13476 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 literal 0 HcmV?d00001 diff --git a/src/bc/ser.rs b/src/bc/ser.rs index 7bc13a9..f87bb45 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -26,7 +26,11 @@ impl Bc { // First serialize ext let (temp_buf, ext_len) = gen( opt_ref(&modern.extension, |ext| { - bc_ext(self.meta.channel_id as u32, ext, encryption_protocol) + bc_ext( + self.meta.channel_id as u32, + ext, + encryption_protocol.clone(), + ) }), vec![], )?; @@ -49,7 +53,7 @@ impl Bc { bc_payload( self.meta.channel_id as u32, payload_offset, - encryption_protocol, + encryption_protocol.clone(), ) }), temp_buf, diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index efc0c69..e4f5e57 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,21 +1,31 @@ use super::model::EncryptionProtocol; use log::error; +use openssl::symm::*; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; +const IV: &[u8] = b"0123456789abcdef"; pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: EncryptionProtocol) -> Vec { match encryption_protocol { EncryptionProtocol::Unencrypted => buf.to_vec(), - EncryptionProtocol::VersionOne => { + EncryptionProtocol::BCEncrypt => { let key_iter = XML_KEY.iter().cycle().skip(offset as usize % 8); key_iter .zip(buf) .map(|(key, i)| *i ^ key ^ (offset as u8)) .collect() } - EncryptionProtocol::VersionThree => { + EncryptionProtocol::Aes(key) => { // New protocol here - unimplemented!(); + let aeskey = key.get_key(); + if let Some(aeskey) = &aeskey { + let t = Cipher::aes_128_cfb128(); + decrypt(t, aeskey, Some(IV), &buf).unwrap() + } else { + // Not yet ready to decrypt (still in login phase) + // Use BCEncrypt + crypt(offset, buf, EncryptionProtocol::BCEncrypt) + } } _ => { error!("Unknown encryption protocol"); diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 58c01b4..fda0692 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -158,7 +158,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: 0, - response_code: 0x01dc, + response_code: 0x03dc, class: 0x6514, }, body: BcBody::LegacyMsg(LegacyMsg::LoginMsg { @@ -254,6 +254,15 @@ impl BcCamera { } } + if let EncryptionProtocol::Aes(_) = connection.get_encrypted() { + // We setup the data for the AES key now + // as all subsequent communications will use it + let nonce = Some(nonce); + let passwd = Some(password.unwrap_or("").to_string()); + let full_key = AesKey { nonce, passwd }; + connection.set_encrypted(EncryptionProtocol::Aes(full_key)); + } + Ok(device_info) } diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 2899b9a..3949c8f 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -8,7 +8,7 @@ use std::collections::BTreeMap; use std::error::Error as StdErr; // Just need the traits use std::net::{Shutdown, SocketAddr, TcpStream}; use std::sync::mpsc::{channel, Receiver, Sender}; -use std::sync::{atomic::Ordering, Arc, Mutex}; +use std::sync::{Arc, Mutex}; use std::thread::JoinHandle; use std::time::Duration; @@ -23,7 +23,7 @@ pub struct BcConnection { rx_thread: Option>, // Arc because it is shared between context // and connection for deserialisation and serialistion respectivly - encryption_protocol: Arc, + encryption_protocol: Arc>, } pub struct BcSubscription<'a> { @@ -57,9 +57,7 @@ impl BcConnection { let mut subs = subscribers.clone(); let conn = tcp_conn.try_clone()?; - let encryption_protocol = Arc::new(AtomicEncryptionProtocol::new( - EncryptionProtocol::Unencrypted, - )); + let encryption_protocol = Arc::new(Mutex::new(EncryptionProtocol::Unencrypted)); let connections_encryption_protocol = encryption_protocol.clone(); let rx_thread = std::thread::spawn(move || { let mut context = @@ -133,11 +131,11 @@ impl BcConnection { } pub fn set_encrypted(&self, value: EncryptionProtocol) { - self.encryption_protocol.store(value, Ordering::Relaxed); + *(self.encryption_protocol.lock().unwrap()) = value; } pub fn get_encrypted(&self) -> EncryptionProtocol { - self.encryption_protocol.load(Ordering::Relaxed) + (*self.encryption_protocol.lock().unwrap()).clone() } } From 1227ff1e96c520580dd4ad19707a4db79b541f1c Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sat, 17 Apr 2021 01:41:43 -0500 Subject: [PATCH 17/27] Refactor AesKey to only contain key bytes --- src/bc/de.rs | 11 ++++------- src/bc/model.rs | 24 +----------------------- src/bc/ser.rs | 10 +++++----- src/bc/xml_crypto.rs | 12 +++--------- src/bc_protocol.rs | 16 ++++++++++++---- 5 files changed, 25 insertions(+), 48 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 0a4c4b9..b0bcd99 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -128,11 +128,8 @@ fn bc_modern_msg<'a, 'b>( match encryption_protocol_byte { 0x00 => context.set_encrypted(EncryptionProtocol::Unencrypted), 0x01 => context.set_encrypted(EncryptionProtocol::BCEncrypt), - 0x03 => context.set_encrypted(EncryptionProtocol::Aes(AesKey { - nonce: None, - passwd: None, - })), - _ => context.set_encrypted(EncryptionProtocol::Unknown), + 0x03 => context.set_encrypted(EncryptionProtocol::Aes(None)), + _ => return Err(Err::Error(make_error(buf, ErrorKind::MapRes))), } } @@ -144,7 +141,7 @@ fn bc_modern_msg<'a, 'b>( let processed_ext_buf = match context.get_encrypted() { EncryptionProtocol::Unencrypted => ext_buf, encryption_protocol => { - decrypted = xml_crypto::crypt(header.channel_id as u32, ext_buf, encryption_protocol); + decrypted = xml_crypto::crypt(header.channel_id as u32, ext_buf, &encryption_protocol); &decrypted } }; @@ -170,7 +167,7 @@ fn bc_modern_msg<'a, 'b>( // Extract remainder of message as binary, if it exists let encryption_protocol = context.get_encrypted(); let processed_payload_buf = - xml_crypto::crypt(header.channel_id as u32, payload_buf, encryption_protocol); + xml_crypto::crypt(header.channel_id as u32, payload_buf, &encryption_protocol); if let Ok(xml) = BcXml::try_parse(processed_payload_buf.as_slice()) { payload = Some(BcPayloads::BcXml(xml)); } else { diff --git a/src/bc/model.rs b/src/bc/model.rs index 1d766e7..de842aa 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -71,33 +71,11 @@ pub(super) struct BcSendInfo { pub payload_offset: Option, } -#[derive(Debug, Clone)] -pub struct AesKey { - pub nonce: Option, - pub passwd: Option, -} - -impl AesKey { - pub fn get_key(&self) -> Option> { - if let (Some(nonce), Some(passwd)) = (&self.nonce, &self.passwd) { - let key_phrase = format!("{}-{}", nonce, passwd); - let key_phrase_hash = format!("{:X}\0", md5::compute(&key_phrase)) - .to_uppercase() - .into_bytes(); - let key = &key_phrase_hash[0..16]; - Some(key.to_vec()) - } else { - None - } - } -} - #[derive(Debug, Clone)] pub enum EncryptionProtocol { Unencrypted, BCEncrypt, - Aes(AesKey), - Unknown, + Aes(Option<[u8; 16]>), } #[derive(Debug)] diff --git a/src/bc/ser.rs b/src/bc/ser.rs index f87bb45..230db00 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -14,7 +14,7 @@ impl Bc { pub fn serialize( &self, buf: W, - encryption_protocol: EncryptionProtocol, + encryption_protocol: &EncryptionProtocol, ) -> Result { // Ideally this would be a combinator, but that would be hairy because we have to // serialize the XML to have the metadata to build the header @@ -29,7 +29,7 @@ impl Bc { bc_ext( self.meta.channel_id as u32, ext, - encryption_protocol.clone(), + encryption_protocol, ) }), vec![], @@ -53,7 +53,7 @@ impl Bc { bc_payload( self.meta.channel_id as u32, payload_offset, - encryption_protocol.clone(), + encryption_protocol, ) }), temp_buf, @@ -83,7 +83,7 @@ impl Bc { fn bc_ext( enc_offset: u32, xml: &Extension, - encryption_protocol: EncryptionProtocol, + encryption_protocol: &EncryptionProtocol, ) -> impl SerializeFn { let xml_bytes = xml.serialize(vec![]).unwrap(); let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes, encryption_protocol); @@ -93,7 +93,7 @@ fn bc_ext( fn bc_payload( enc_offset: u32, payload: &BcPayloads, - encryption_protocol: EncryptionProtocol, + encryption_protocol: &EncryptionProtocol, ) -> impl SerializeFn { let payload_bytes = match payload { BcPayloads::BcXml(x) => { diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index e4f5e57..de03ac5 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,11 +1,10 @@ use super::model::EncryptionProtocol; -use log::error; use openssl::symm::*; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; const IV: &[u8] = b"0123456789abcdef"; -pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: EncryptionProtocol) -> Vec { +pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol) -> Vec { match encryption_protocol { EncryptionProtocol::Unencrypted => buf.to_vec(), EncryptionProtocol::BCEncrypt => { @@ -17,20 +16,15 @@ pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: EncryptionProtocol) - } EncryptionProtocol::Aes(key) => { // New protocol here - let aeskey = key.get_key(); - if let Some(aeskey) = &aeskey { + if let Some(aeskey) = key { let t = Cipher::aes_128_cfb128(); decrypt(t, aeskey, Some(IV), &buf).unwrap() } else { // Not yet ready to decrypt (still in login phase) // Use BCEncrypt - crypt(offset, buf, EncryptionProtocol::BCEncrypt) + crypt(offset, buf, &EncryptionProtocol::BCEncrypt) } } - _ => { - error!("Unknown encryption protocol"); - unimplemented!(); - } } } diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index fda0692..63d4ae4 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -6,6 +6,7 @@ use crate::gst::GstOutputs; use adpcm::adpcm_to_pcm; use err_derive::Error; use log::*; +use std::convert::TryInto; use std::io::Write; use std::net::{SocketAddr, ToSocketAddrs}; use std::sync::atomic::{AtomicU16, Ordering}; @@ -257,10 +258,9 @@ impl BcCamera { if let EncryptionProtocol::Aes(_) = connection.get_encrypted() { // We setup the data for the AES key now // as all subsequent communications will use it - let nonce = Some(nonce); - let passwd = Some(password.unwrap_or("").to_string()); - let full_key = AesKey { nonce, passwd }; - connection.set_encrypted(EncryptionProtocol::Aes(full_key)); + let passwd = password.unwrap_or(""); + let full_key = make_aes_key(&nonce, passwd); + connection.set_encrypted(EncryptionProtocol::Aes(Some(full_key))); } Ok(device_info) @@ -431,6 +431,14 @@ fn md5_string(input: &str, trunc: Md5Trunc) -> String { md5 } +pub fn make_aes_key(nonce: &str, passwd: &str) -> [u8; 16] { + let key_phrase = format!("{}-{}", nonce, passwd); + let key_phrase_hash = format!("{:X}\0", md5::compute(&key_phrase)) + .to_uppercase() + .into_bytes(); + key_phrase_hash[0..16].try_into().unwrap() +} + #[test] fn test_md5_string() { // Note that these literals are only 31 characters long - see explanation above. From 30fad0870673c40c0bfcc6356d51ed9eea712b4e Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 17:03:29 +0700 Subject: [PATCH 18/27] Bug fixes and making serde respect the status code to send --- src/bc/de.rs | 7 +------ src/bc/model.rs | 2 +- src/bc/ser.rs | 17 ++--------------- src/bc_protocol.rs | 2 +- src/bc_protocol/connection.rs | 4 ++-- 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index b0bcd99..47d6219 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -128,7 +128,7 @@ fn bc_modern_msg<'a, 'b>( match encryption_protocol_byte { 0x00 => context.set_encrypted(EncryptionProtocol::Unencrypted), 0x01 => context.set_encrypted(EncryptionProtocol::BCEncrypt), - 0x03 => context.set_encrypted(EncryptionProtocol::Aes(None)), + 0x02 => context.set_encrypted(EncryptionProtocol::Aes(None)), _ => return Err(Err::Error(make_error(buf, ErrorKind::MapRes))), } } @@ -189,11 +189,6 @@ fn bc_header(buf: &[u8]) -> IResult<&[u8], BcHeader> { let (buf, msg_num) = le_u16(buf)?; let (buf, (response_code, class)) = tuple((le_u16, le_u16))(buf)?; - // All modern messages are encrypted. In addition, it seems that the camera firmware checks - // this field to see if some other messages should be encrypted. This is still somewhat fuzzy. - // A copy of the source code for the camera would be very useful. - let encrypted = response_code != 0; - let (buf, payload_offset) = cond(has_payload_offset(class), le_u32)(buf)?; Ok(( diff --git a/src/bc/model.rs b/src/bc/model.rs index de842aa..f4e2ff0 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -81,7 +81,7 @@ pub enum EncryptionProtocol { #[derive(Debug)] pub struct BcContext { pub(super) in_bin_mode: HashSet, - // Arc because it is shared between context + // Arc> because it is shared between context // and connection for deserialisation and serialistion respectivly pub(super) encryption_protocol: Arc>, } diff --git a/src/bc/ser.rs b/src/bc/ser.rs index 230db00..e448d5d 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -26,11 +26,7 @@ impl Bc { // First serialize ext let (temp_buf, ext_len) = gen( opt_ref(&modern.extension, |ext| { - bc_ext( - self.meta.channel_id as u32, - ext, - encryption_protocol, - ) + bc_ext(self.meta.channel_id as u32, ext, encryption_protocol) }), vec![], )?; @@ -106,14 +102,6 @@ fn bc_payload( } fn bc_header(header: &BcHeader) -> impl SerializeFn { - // TODO this is actually a u16 "response code" in modern messages - let (signaled_encryption, spare) = if header.class == 0x0000 { - (0x00, 0x00) - } else { - // Client is always 01dc - // Camera may reply with 01dd (encrypted) or 00dd (unencrypted) - (0x01, 0xdc) - }; tuple(( le_u32(MAGIC_HEADER), le_u32(header.msg_id), @@ -121,8 +109,7 @@ fn bc_header(header: &BcHeader) -> impl SerializeFn { le_u8(header.channel_id), le_u8(header.stream_type), le_u16(header.msg_num), - le_u8(signaled_encryption), - le_u8(spare), // skipped byte + le_u16(header.response_code), le_u16(header.class), opt(header.payload_offset, le_u32), )) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 63d4ae4..5ef8162 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -159,7 +159,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: 0, - response_code: 0x03dc, + response_code: 0xdc03, class: 0x6514, }, body: BcBody::LegacyMsg(LegacyMsg::LoginMsg { diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 3949c8f..cc783c9 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -21,7 +21,7 @@ pub struct BcConnection { connection: Arc>, subscribers: Arc>>>, rx_thread: Option>, - // Arc because it is shared between context + // Arc> because it is shared between context // and connection for deserialisation and serialistion respectivly encryption_protocol: Arc>, } @@ -165,7 +165,7 @@ impl<'a> BcSubscription<'a> { bc.serialize( &*self.conn.connection.lock().unwrap(), - self.conn.get_encrypted(), + &self.conn.get_encrypted(), )?; Ok(()) } From f4630f4d071ade164b7c644fde6f72807170c98c Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 17:07:40 +0700 Subject: [PATCH 19/27] Treat AES encrypt and decrypt differently --- src/bc/de.rs | 5 +++-- src/bc/ser.rs | 4 ++-- src/bc/xml_crypto.rs | 38 +++++++++++++++++++++++++++++++------- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 47d6219..1c616fb 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -141,7 +141,8 @@ fn bc_modern_msg<'a, 'b>( let processed_ext_buf = match context.get_encrypted() { EncryptionProtocol::Unencrypted => ext_buf, encryption_protocol => { - decrypted = xml_crypto::crypt(header.channel_id as u32, ext_buf, &encryption_protocol); + decrypted = + xml_crypto::decrypt(header.channel_id as u32, ext_buf, &encryption_protocol); &decrypted } }; @@ -167,7 +168,7 @@ fn bc_modern_msg<'a, 'b>( // Extract remainder of message as binary, if it exists let encryption_protocol = context.get_encrypted(); let processed_payload_buf = - xml_crypto::crypt(header.channel_id as u32, payload_buf, &encryption_protocol); + xml_crypto::decrypt(header.channel_id as u32, payload_buf, &encryption_protocol); if let Ok(xml) = BcXml::try_parse(processed_payload_buf.as_slice()) { payload = Some(BcPayloads::BcXml(xml)); } else { diff --git a/src/bc/ser.rs b/src/bc/ser.rs index e448d5d..aa68eb5 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -82,7 +82,7 @@ fn bc_ext( encryption_protocol: &EncryptionProtocol, ) -> impl SerializeFn { let xml_bytes = xml.serialize(vec![]).unwrap(); - let enc_bytes = xml_crypto::crypt(enc_offset, &xml_bytes, encryption_protocol); + let enc_bytes = xml_crypto::encrypt(enc_offset, &xml_bytes, encryption_protocol); slice(enc_bytes) } @@ -94,7 +94,7 @@ fn bc_payload( let payload_bytes = match payload { BcPayloads::BcXml(x) => { let xml_bytes = x.serialize(vec![]).unwrap(); - xml_crypto::crypt(enc_offset, &xml_bytes, encryption_protocol) + xml_crypto::encrypt(enc_offset, &xml_bytes, encryption_protocol) } BcPayloads::Binary(x) => x.to_owned(), }; diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index de03ac5..66bfa1d 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -4,7 +4,7 @@ use openssl::symm::*; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; const IV: &[u8] = b"0123456789abcdef"; -pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol) -> Vec { +pub fn decrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol) -> Vec { match encryption_protocol { EncryptionProtocol::Unencrypted => buf.to_vec(), EncryptionProtocol::BCEncrypt => { @@ -15,14 +15,38 @@ pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol) .collect() } EncryptionProtocol::Aes(key) => { - // New protocol here + // AES decryption if let Some(aeskey) = key { let t = Cipher::aes_128_cfb128(); - decrypt(t, aeskey, Some(IV), &buf).unwrap() + openssl::symm::decrypt(t, aeskey, Some(IV), &buf).unwrap() } else { // Not yet ready to decrypt (still in login phase) // Use BCEncrypt - crypt(offset, buf, &EncryptionProtocol::BCEncrypt) + decrypt(offset, buf, &EncryptionProtocol::BCEncrypt) + } + } + } +} + +pub fn encrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol) -> Vec { + match encryption_protocol { + EncryptionProtocol::Unencrypted => { + // Encrypt is the same as decrypt + decrypt(offset, buf, encryption_protocol) + } + EncryptionProtocol::BCEncrypt => { + // Encrypt is the same as decrypt + decrypt(offset, buf, encryption_protocol) + } + EncryptionProtocol::Aes(key) => { + // AES encryption + if let Some(aeskey) = key { + let t = Cipher::aes_128_cfb128(); + openssl::symm::encrypt(t, aeskey, Some(IV), &buf).unwrap() + } else { + // Not yet ready to decrypt (still in login phase) + // Use BCEncrypt + encrypt(offset, buf, &EncryptionProtocol::BCEncrypt) } } } @@ -33,7 +57,7 @@ fn test_xml_crypto() { let sample = include_bytes!("samples/xml_crypto_sample1.bin"); let should_be = include_bytes!("samples/xml_crypto_sample1_plaintext.bin"); - let decrypted = crypt(0, &sample[..]); + let decrypted = decrypt(0, &sample[..]); assert_eq!(decrypted, &should_be[..]); } @@ -41,7 +65,7 @@ fn test_xml_crypto() { fn test_xml_crypto_roundtrip() { let zeros: [u8; 256] = [0; 256]; - let decrypted = crypt(0, &zeros[..]); - let encrypted = crypt(0, &decrypted[..]); + let decrypted = encrypt(0, &zeros[..]); + let encrypted = decrypt(0, &decrypted[..]); assert_eq!(encrypted, &zeros[..]); } From eda598c40f6c63ae3e608aad3be2aaf03e72861a Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 17:09:05 +0700 Subject: [PATCH 20/27] Restore timeout duration --- src/bc_protocol.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 5ef8162..3f60db6 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -31,7 +31,7 @@ use crate::Never; type Result = std::result::Result; -const RX_TIMEOUT: Duration = Duration::from_secs(500); +const RX_TIMEOUT: Duration = Duration::from_secs(5); #[derive(Debug, Error)] #[allow(clippy::large_enum_variant)] From ce9f3e7a1b72bea02da3cd4755f6c5c1c8c794e3 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 21:29:14 +0700 Subject: [PATCH 21/27] Removed extra init method for context --- src/bc/model.rs | 17 +---------------- src/bc_protocol/connection.rs | 3 +-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/bc/model.rs b/src/bc/model.rs index f4e2ff0..ec0f966 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -130,23 +130,8 @@ impl Bc { } } -impl Default for BcContext { - fn default() -> BcContext { - Self::new() - } -} - impl BcContext { - pub fn new() -> BcContext { - BcContext { - in_bin_mode: HashSet::new(), - encryption_protocol: Arc::new(Mutex::new(EncryptionProtocol::Unencrypted)), - } - } - - pub fn new_with_encryption_protocol( - encryption_protocol: Arc>, - ) -> BcContext { + pub fn new(encryption_protocol: Arc>) -> BcContext { BcContext { in_bin_mode: HashSet::new(), encryption_protocol, diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index cc783c9..44c30a2 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -60,8 +60,7 @@ impl BcConnection { let encryption_protocol = Arc::new(Mutex::new(EncryptionProtocol::Unencrypted)); let connections_encryption_protocol = encryption_protocol.clone(); let rx_thread = std::thread::spawn(move || { - let mut context = - BcContext::new_with_encryption_protocol(connections_encryption_protocol); + let mut context = BcContext::new(connections_encryption_protocol); let mut result; while { result = BcConnection::poll(&mut context, &conn, &mut subs); From 0dc25690f4c72ec304f87d7181beddd00c58fc07 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 21:29:56 +0700 Subject: [PATCH 22/27] Removed docs for prototype mqtt --- README.md | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/README.md b/README.md index 2cb8740..1b7e6eb 100644 --- a/README.md +++ b/README.md @@ -209,46 +209,6 @@ must have a receive buffer large enough to store the entire frame. If your client's buffer size is configurable (like Blue Iris), ensure it's set to 20MB, which should ensure plenty of headroom. -## Motion Detection and MQTT - -If your camera supports motion detection you can have neolink post MQTT -messages to an MQTT server whenever your camera detects motion. To enable this -add the following to your `[[cameras]]` table in the config toml. - -```toml -[cameras.mqtt] -# The address of the mqtt server -server = "127.0.0.1" - -# The port of the mqtt server -port = 1883 - -# Optional: User name and password for mqtt -credentials = ["User4MQTT", "Pass4MQTT"] - -# Optional: The servers encryption certificate -# Enabling this WILL turn on encryption -# You cannot use both ca and client_auth -ca = "/path/to/cert" - -# Optional: The clients encryption certificate and key -# Enabling this WILL turn on encryption -# You cannot use both ca and client_auth -client_auth = ["/Path/to/client/cert", "/Path/to/client/key"] -``` - -Each camera creates its own client with the id `Neolink-CameraName` and each -camera in the config needs a mqtt table to enable it. - -The topic of the message is: - -```mqtt -/neolink/CAMERANAME/status/motion -``` - -With a message of either `on` for motion detected or `off` for motion no longer -detected. - ## Stability Neolink has had minimal testing, but it seems to be very reliable in multiple From 4721d364f11ce865250eb3b8bc97b476f3756f93 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 21:30:12 +0700 Subject: [PATCH 23/27] Use context to keep track of binary --- src/bc/de.rs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 1c616fb..d04db78 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -154,6 +154,13 @@ fn bc_modern_msg<'a, 'b>( // Err case. This error-error-error thing is the same idiom Nom uses internally. let parsed = Extension::try_parse(processed_ext_buf) .map_err(|_| Err::Error(make_error(buf, ErrorKind::MapRes)))?; + if let Extension { + binary_data: Some(1), + .. + } = &parsed + { + context.in_bin_mode.insert(header.msg_num as u32); + } extension = Some(parsed); } else { extension = None; @@ -169,10 +176,12 @@ fn bc_modern_msg<'a, 'b>( let encryption_protocol = context.get_encrypted(); let processed_payload_buf = xml_crypto::decrypt(header.channel_id as u32, payload_buf, &encryption_protocol); - if let Ok(xml) = BcXml::try_parse(processed_payload_buf.as_slice()) { - payload = Some(BcPayloads::BcXml(xml)); - } else { + if context.in_bin_mode.contains(&(header.msg_num as u32)) { payload = Some(BcPayloads::Binary(payload_buf.to_vec())); + } else { + let xml = BcXml::try_parse(processed_payload_buf.as_slice()) + .map_err(|_| Err::Error(make_error(buf, ErrorKind::MapRes)))?; + payload = Some(BcPayloads::BcXml(xml)); } } else { payload = None; From 949192b62090018454cd39121b5a35c9fa6e3840 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sat, 17 Apr 2021 15:52:08 -0500 Subject: [PATCH 24/27] Use pure Rust AES implementation --- Cargo.lock | 138 +++++++++++++++++++++++-------------------- Cargo.toml | 3 +- src/bc/xml_crypto.rs | 14 +++-- 3 files changed, 86 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca6db0f..c2233f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,36 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher", +] + +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher", + "opaque-debug", +] + [[package]] name = "aho-corasick" version = "0.7.13" @@ -66,10 +97,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] -name = "cc" -version = "1.0.67" +name = "cfb-mode" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "1d6975e91054798d325f85f50115056d7deccf6817fe7f947c438ee45b119632" +dependencies = [ + "cipher", +] [[package]] name = "cfg-if" @@ -78,10 +112,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "cfg-if" -version = "1.0.0" +name = "cipher" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] [[package]] name = "clap" @@ -110,7 +147,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -124,7 +161,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "crossbeam-utils", ] @@ -146,7 +183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if 0.1.10", + "cfg-if", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -160,7 +197,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "crossbeam-utils", "maybe-uninit", ] @@ -172,7 +209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if 0.1.10", + "cfg-if", "lazy_static", ] @@ -215,21 +252,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "futures" version = "0.3.5" @@ -325,6 +347,16 @@ dependencies = [ "slab", ] +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "gio" version = "0.9.0" @@ -421,7 +453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" dependencies = [ "bitflags", - "cfg-if 0.1.10", + "cfg-if", "futures-channel", "futures-core", "futures-util", @@ -741,7 +773,7 @@ checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" dependencies = [ "arrayvec", "bitflags", - "cfg-if 0.1.10", + "cfg-if", "ryu", "static_assertions", ] @@ -758,7 +790,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", ] [[package]] @@ -804,6 +836,8 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" name = "neolink" version = "0.3.0" dependencies = [ + "aes", + "cfb-mode", "cookie-factory", "crossbeam", "env_logger", @@ -820,7 +854,6 @@ dependencies = [ "log", "md5", "nom", - "openssl", "regex", "serde", "socket2", @@ -882,31 +915,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] -name = "openssl" -version = "0.10.33" +name = "opaque-debug" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-sys" -version = "0.9.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "paste" @@ -1155,7 +1167,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "libc", "redox_syscall", "winapi", @@ -1364,7 +1376,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "libc", "standback", "stdweb", @@ -1411,6 +1423,12 @@ dependencies = [ "serde", ] +[[package]] +name = "typenum" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" + [[package]] name = "unicode-bidi" version = "0.3.4" @@ -1494,12 +1512,6 @@ dependencies = [ "validator", ] -[[package]] -name = "vcpkg" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" - [[package]] name = "vec_map" version = "0.8.2" @@ -1524,7 +1536,7 @@ version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "wasm-bindgen-macro", ] diff --git a/Cargo.toml b/Cargo.toml index 9bc29ea..e7c8dac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,8 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +aes = "0.6" +cfb-mode = "0.6" cookie-factory = "0.3" crossbeam = "0.7" env_logger = "*" @@ -35,4 +37,3 @@ yaserde_derive = "0.3.16" xml-rs = "0.8" validator = "0.10" validator_derive = "0.10" -openssl = "0.10.33" diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index 66bfa1d..94cc1d4 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,5 +1,7 @@ use super::model::EncryptionProtocol; -use openssl::symm::*; +use aes::Aes128; +use cfb_mode::Cfb; +use cfb_mode::cipher::{NewStreamCipher, StreamCipher}; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; const IV: &[u8] = b"0123456789abcdef"; @@ -17,8 +19,9 @@ pub fn decrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol EncryptionProtocol::Aes(key) => { // AES decryption if let Some(aeskey) = key { - let t = Cipher::aes_128_cfb128(); - openssl::symm::decrypt(t, aeskey, Some(IV), &buf).unwrap() + let mut decrypted = buf.to_vec(); + Cfb::::new(aeskey.into(), IV.into()).decrypt(&mut decrypted); + decrypted } else { // Not yet ready to decrypt (still in login phase) // Use BCEncrypt @@ -41,8 +44,9 @@ pub fn encrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol EncryptionProtocol::Aes(key) => { // AES encryption if let Some(aeskey) = key { - let t = Cipher::aes_128_cfb128(); - openssl::symm::encrypt(t, aeskey, Some(IV), &buf).unwrap() + let mut encrypted = buf.to_vec(); + Cfb::::new(aeskey.into(), IV.into()).encrypt(&mut encrypted); + encrypted } else { // Not yet ready to decrypt (still in login phase) // Use BCEncrypt From 6ac4b70ff38e76fab599562cee4c7e36fdf51ad1 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sat, 17 Apr 2021 16:04:25 -0500 Subject: [PATCH 25/27] cargo fmt --- src/bc/xml_crypto.rs | 2 +- src/bc_protocol/time.rs | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index 94cc1d4..17b7473 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,7 +1,7 @@ use super::model::EncryptionProtocol; use aes::Aes128; -use cfb_mode::Cfb; use cfb_mode::cipher::{NewStreamCipher, StreamCipher}; +use cfb_mode::Cfb; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; const IV: &[u8] = b"0123456789abcdef"; diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index 44ad836..2e1e7d2 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -22,9 +22,7 @@ impl BcCamera { }; sub_get_general.send(get)?; - let msg = sub_get_general - .rx - .recv_timeout(RX_TIMEOUT)?; + let msg = sub_get_general.rx.recv_timeout(RX_TIMEOUT)?; if let BcBody::ModernMsg(ModernMsg { payload: @@ -112,9 +110,7 @@ impl BcCamera { ); sub_set_general.send(set)?; - let msg = sub_set_general - .rx - .recv_timeout(RX_TIMEOUT)?; + let msg = sub_set_general.rx.recv_timeout(RX_TIMEOUT)?; Ok(()) } From 05cb032d3cc87a7534dfa9f6a6e926020a8ab6b5 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 18 Apr 2021 08:13:01 +0700 Subject: [PATCH 26/27] Bump nom version --- Cargo.lock | 509 ++++++++++++++++++++++++++------------------------- Cargo.toml | 2 +- src/bc/de.rs | 17 +- 3 files changed, 272 insertions(+), 256 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2233f9..a19cc4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -51,15 +51,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "atty" @@ -74,15 +74,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base-x" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] name = "bitflags" @@ -91,10 +91,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] -name = "bumpalo" -version = "3.4.0" +name = "bitvec" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bumpalo" +version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] name = "cfb-mode" @@ -111,6 +123,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "cipher" version = "0.2.5" @@ -122,9 +140,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -136,10 +154,16 @@ dependencies = [ ] [[package]] -name = "cookie-factory" -version = "0.3.1" +name = "const_fn" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f21b581d2f0cb891554812435667bb9610d74feb1a4c6415bf09c28ff0381d" +checksum = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec" + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" [[package]] name = "crossbeam" @@ -147,7 +171,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -157,12 +181,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "cfg-if", "crossbeam-utils", + "maybe-uninit", ] [[package]] @@ -183,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -197,7 +221,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -209,7 +233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -221,15 +245,15 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "either" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", @@ -253,10 +277,26 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.5" +name = "form_urlencoded" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" dependencies = [ "futures-channel", "futures-core", @@ -269,9 +309,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" dependencies = [ "futures-core", "futures-sink", @@ -279,15 +319,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" dependencies = [ "futures-core", "futures-task", @@ -296,15 +336,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -314,24 +354,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" -dependencies = [ - "once_cell", -] +checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" dependencies = [ "futures-channel", "futures-core", @@ -340,7 +377,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project-lite", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -359,9 +396,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5492e80b45e6c56214894a9a0cbe1340ab5066eb44a2dbe151393b6d7942c0" +checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" dependencies = [ "bitflags", "futures", @@ -380,14 +417,15 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35993626299fbcaa73c0a19be8fdd01c950f9f3d3ac9cb4fb5532b924ab1a5d7" +checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", + "winapi", ] [[package]] @@ -427,9 +465,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cda4af5c2f4507b7a3535b798dca2135293f4bc3a17f399ce244ef15841c4c" +checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" dependencies = [ "libc", "system-deps", @@ -448,12 +486,12 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.16.2" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" +checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "futures-channel", "futures-core", "futures-util", @@ -472,9 +510,9 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e9ca4df66162132a8d0083c5c5a40dea29ac619acb02395dba09e26bc1c500" +checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" dependencies = [ "bitflags", "futures-core", @@ -492,9 +530,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d739f1289f37352884d716df1c571d365fe3eacb8164bc1996e8070053c949" +checksum = "813f64275c9e7b33b828b9efcf9dfa64b95996766d4de996e84363ac65b87e3d" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -505,9 +543,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872893487ce8876f18c63730402822804c5762869f631d8e3e6b18aafc8399f0" +checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" dependencies = [ "bitflags", "glib", @@ -521,9 +559,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fd5a77d39b47568fba01274dfcb28dc32382513c697009f80b89ef63fd32fd" +checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" dependencies = [ "glib-sys", "gobject-sys", @@ -534,9 +572,9 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf6b7e17559f3afd74285d3007c9268bbd47ecb692dcb27944a2f54385aba73" +checksum = "0ff4b9468ce5fc3d366374d6e156f4e66f316ef2580d4e6c6167a5a090f48996" dependencies = [ "gio", "glib", @@ -549,9 +587,9 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc58fef62ae238322f24ca6589bf39f885888ab3c345b8ce15998f9a0f1b199" +checksum = "5317f292e00d1e7b966a3876ca7568abdab3d0559b2c050d1dd3bbbef9c5b99f" dependencies = [ "gio-sys", "glib-sys", @@ -563,13 +601,11 @@ dependencies = [ [[package]] name = "gstreamer-rtsp" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c0154054089449fa595da343660d37a9241cdb8a8794a982c7dfc4a82629f1" +checksum = "46370552813cfdf431f409dd5ffefa24ae80f3189a034ec098123f4cf1286389" dependencies = [ "bitflags", - "gio", - "gio-sys", "glib", "glib-sys", "gobject-sys", @@ -583,9 +619,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8e59ac0e59b7c503359d4c617d1ca447ce2d263397b80d96f66312fb75ffc4" +checksum = "cb39e0061d9aa519948276813e45249ae1cf41d098a04da490b085a1f2180466" dependencies = [ "bitflags", "gio", @@ -608,9 +644,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09f446a03f00fe0859ca41ca6ab0150392e261eab8151c1f0e1067356e34dce" +checksum = "372f48e74995eb4855bac56210ea97d8cf34ef5b328c225f35bdbf3fdedd0d06" dependencies = [ "gio-sys", "glib-sys", @@ -625,9 +661,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e12559129061c3b4cc218ff997f42a7ba8a23f3c0db356e8f5a54e12fa7c3dd" +checksum = "0938ef76af0226e3d9488957b5bfdd3359d01adc1d3b4792e166bc2cec86f1be" dependencies = [ "gio-sys", "glib-sys", @@ -640,9 +676,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.16.0" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ebbe4fbea4f2c67982c667ba57b64b01d43bc3dc1dc4a8d3512cb33a2adc7c1" +checksum = "db2583808102240bf3e94b4dc5d099ee0ad36557211279c8b90b82c45c2b76e8" dependencies = [ "glib", "glib-sys", @@ -654,9 +690,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289c7f258d3387ae91c6058555922d8cf0704fc2bc870d1a03190bc81b040655" +checksum = "405adf64f61c427c1c3cd6d928f0ca891bde2614b7bd31c3b3670ae0da3ac79a" dependencies = [ "glib-sys", "gobject-sys", @@ -667,9 +703,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1321f34d53bb5f60ab1aaf581e29b664b8d41601714ee1bb7dbea490b5b9ff60" +checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" dependencies = [ "glib-sys", "gobject-sys", @@ -679,36 +715,33 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -717,9 +750,9 @@ dependencies = [ [[package]] name = "if_chain" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d" +checksum = "1f7280c75fb2e2fc47080ec80ccc481376923acb04501957fc38f935c3de5088" [[package]] name = "indoc" @@ -755,9 +788,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "lazy_static" @@ -767,30 +800,30 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lexical-core" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" +checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" dependencies = [ "arrayvec", "bitflags", - "cfg-if", + "cfg-if 1.0.0", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.74" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -813,15 +846,15 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ "autocfg", ] @@ -869,10 +902,12 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ + "bitvec", + "funty", "lexical-core", "memchr", "version_check", @@ -880,9 +915,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", "num-traits", @@ -890,9 +925,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", "num-integer", @@ -901,9 +936,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg", ] @@ -922,22 +957,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "paste" -version = "0.1.18" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "percent-encoding" @@ -946,24 +968,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "pin-project" -version = "0.4.23" +name = "pin-project-lite" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -973,15 +981,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "pretty-hex" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91bcc43e73799dc46a6c194a55e7aae1d86cc867c860fd4a436019af21bd8c" +checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "proc-macro-crate" @@ -1018,63 +1026,56 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[package]] -name = "redox_syscall" -version = "0.1.57" +name = "radium" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "regex" -version = "1.3.9" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "rustc_version" @@ -1120,18 +1121,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2", "quote", @@ -1140,9 +1141,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -1163,21 +1164,20 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "socket2" -version = "0.3.12" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "redox_syscall", "winapi", ] [[package]] name = "standback" -version = "0.2.9" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0437cfb83762844799a60e1e3b489d5ceb6a650fbacb86437badc1b6d87b246" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ "version_check", ] @@ -1245,9 +1245,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", @@ -1256,9 +1256,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", @@ -1287,9 +1287,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.36" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" +checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" dependencies = [ "proc-macro2", "quote", @@ -1324,10 +1324,16 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.1.0" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1343,40 +1349,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - [[package]] name = "time" -version = "0.2.16" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" +checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" dependencies = [ - "cfg-if", + "const_fn", "libc", "standback", "stdweb", @@ -1387,9 +1384,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" dependencies = [ "proc-macro-hack", "time-macros-impl", @@ -1410,15 +1407,24 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] @@ -1431,27 +1437,27 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -1467,16 +1473,17 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "unindent" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41d708427f8fd0e915dcebb2cae0f0e6acb2a939b2d399c265c39a38a18942" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" [[package]] name = "url" -version = "2.1.1" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" dependencies = [ + "form_urlencoded", "idna", "matches", "percent-encoding", @@ -1526,25 +1533,25 @@ checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wasm-bindgen" -version = "0.2.67" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.67" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", @@ -1557,9 +1564,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.67" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1567,9 +1574,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.67" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2", "quote", @@ -1580,9 +1587,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.67" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "winapi" @@ -1615,6 +1622,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "xml-rs" version = "0.8.3" diff --git a/Cargo.toml b/Cargo.toml index e7c8dac..dc2a4ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ log = { version = "0.4" } indoc = "0.3" itertools = "0.9" md5 = "0.7" -nom = "5.1" +nom = "6.1.2" regex = "1" serde = { version = "1.0", features = ["derive"] } socket2 = "0.3" diff --git a/src/bc/de.rs b/src/bc/de.rs index d04db78..6872583 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -15,10 +15,10 @@ pub enum Error { IoError(#[error(source)] std::io::Error), } -type NomErrorTuple<'a> = (&'a [u8], nom::error::ErrorKind); +type NomErrorType<'a> = nom::error::Error<&'a [u8]>; -impl<'a> From>> for Error { - fn from(k: nom::Err>) -> Self { +impl<'a> From>> for Error { + fn from(k: nom::Err>) -> Self { let reason = match k { nom::Err::Error(_) => "Nom Error", nom::Err::Failure(_) => "Nom Failure", @@ -38,7 +38,7 @@ impl Bc { fn read_from_reader(mut parser: P, mut rdr: R) -> Result where R: Read, - E: for<'a> From>> + From, + E: for<'a> From>> + From, P: FnMut(&[u8]) -> nom::IResult<&[u8], O>, { let mut input: Vec = Vec::new(); @@ -47,14 +47,17 @@ where Ok((_, parsed)) => return Ok(parsed), Err(nom::Err::Incomplete(needed)) => { match needed { - nom::Needed::Unknown => 1, // read one byte + nom::Needed::Unknown => std::num::NonZeroUsize::new(1).unwrap(), // read one byte nom::Needed::Size(len) => len, } } Err(e) => return Err(e.into()), }; - if 0 == (&mut rdr).take(to_read as u64).read_to_end(&mut input)? { + if 0 == (&mut rdr) + .take(to_read.get() as u64) + .read_to_end(&mut input)? + { return Err(std::io::Error::new( std::io::ErrorKind::UnexpectedEof, "Read returned 0 bytes", @@ -93,7 +96,7 @@ fn bc_body<'a, 'b, 'c>( } } -fn hex32<'a>() -> impl Fn(&'a [u8]) -> IResult<&'a [u8], String> { +fn hex32<'a>() -> impl FnMut(&'a [u8]) -> IResult<&'a [u8], String> { map_res(take(32usize), |slice: &'a [u8]| { String::from_utf8(slice.to_vec()) }) From 9692aa82daf638356ae8b918318868a86b86206e Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 18 Apr 2021 09:10:57 +0700 Subject: [PATCH 27/27] Update tests to the new protocol model --- src/bc/de.rs | 82 +++++++++++++++++++++++++++++--------------- src/bc/model.rs | 2 +- src/bc/ser.rs | 16 ++++++--- src/bc/xml.rs | 11 +++--- src/bc/xml_crypto.rs | 6 ++-- 5 files changed, 78 insertions(+), 39 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 6872583..0d88354 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -162,7 +162,7 @@ fn bc_modern_msg<'a, 'b>( .. } = &parsed { - context.in_bin_mode.insert(header.msg_num as u32); + context.in_bin_mode.insert(header.msg_num); } extension = Some(parsed); } else { @@ -179,7 +179,7 @@ fn bc_modern_msg<'a, 'b>( let encryption_protocol = context.get_encrypted(); let processed_payload_buf = xml_crypto::decrypt(header.channel_id as u32, payload_buf, &encryption_protocol); - if context.in_bin_mode.contains(&(header.msg_num as u32)) { + if context.in_bin_mode.contains(&(header.msg_num)) { payload = Some(BcPayloads::Binary(payload_buf.to_vec())); } else { let xml = BcXml::try_parse(processed_payload_buf.as_slice()) @@ -223,20 +223,28 @@ 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 encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); let (buf, header) = bc_header(&sample[..]).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); - assert_eq!(header.encrypted, true); + assert_eq!(header.channel_id, 0); + assert_eq!(header.stream_type, 0); + assert_eq!(header.payload_offset, None); + assert_eq!(header.response_code, 0xdd01); assert_eq!(header.class, 0x6614); match body { BcBody::ModernMsg(ModernMsg { - xml: Some(ref xml), - binary: None, - }) => assert_eq!(xml.encryption.as_ref().unwrap().nonce, "9E6D1FCB9E69846D"), + payload: + Some(BcPayloads::BcXml(BcXml { + encryption: Some(encryption), + .. + })), + .. + }) => assert_eq!(encryption.nonce, "9E6D1FCB9E69846D"), _ => assert!(false), } } @@ -245,14 +253,18 @@ 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 encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); let (buf, header) = bc_header(&sample[..]).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); - assert_eq!(header.encrypted, true); + assert_eq!(header.channel_id, 0); + assert_eq!(header.stream_type, 0); + assert_eq!(header.payload_offset, None); + assert_eq!(header.response_code, 0xdc01); assert_eq!(header.class, 0x6514); match body { BcBody::LegacyMsg(LegacyMsg::LoginMsg { username, password }) => { @@ -267,19 +279,23 @@ 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 encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); let (buf, header) = bc_header(&sample[..]).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); - assert_eq!(header.encrypted, true); + assert_eq!(header.channel_id, 0); + assert_eq!(header.stream_type, 0); + assert_eq!(header.payload_offset, Some(0x0)); + assert_eq!(header.response_code, 0x190); // 400 assert_eq!(header.class, 0x0000); match body { BcBody::ModernMsg(ModernMsg { - xml: None, - binary: None, + extension: None, + payload: None, }) => { assert!(true); } @@ -291,22 +307,26 @@ 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 encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); let (buf, header) = bc_header(&sample[..]).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); - assert_eq!(header.encrypted, true); + assert_eq!(header.channel_id, 0); + assert_eq!(header.stream_type, 0); + assert_eq!(header.payload_offset, Some(0x0)); + assert_eq!(header.response_code, 0xc8); // 200 assert_eq!(header.class, 0x0000); // Previously, we were not handling payload_offset == 0 (no bin offset) correctly. // Test that we decoded XML and no binary. match body { BcBody::ModernMsg(ModernMsg { - xml: Some(_), - binary: None, + extension: None, + payload: Some(_), }) => assert!(true), _ => assert!(false), } @@ -317,23 +337,31 @@ 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 encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); 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), + extension: + Some(Extension { + binary_data: Some(1), + .. + }), + payload: Some(BcPayloads::Binary(bin)), }) => { assert_eq!(bin.len(), 32); } _ => assert!(false), } + + context.in_bin_mode.insert(msg1.meta.msg_num); + let msg2 = Bc::deserialize(&mut context, &sample2[..]).unwrap(); match msg2.body { BcBody::ModernMsg(ModernMsg { - xml: None, - binary: Some(bin), + extension: None, + payload: Some(BcPayloads::Binary(bin)), }) => { assert_eq!(bin.len(), 30344); } diff --git a/src/bc/model.rs b/src/bc/model.rs index ec0f966..1dcb6a8 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -80,7 +80,7 @@ pub enum EncryptionProtocol { #[derive(Debug)] pub struct BcContext { - pub(super) in_bin_mode: HashSet, + pub(super) in_bin_mode: HashSet, // Arc> because it is shared between context // and connection for deserialisation and serialistion respectivly pub(super) encryption_protocol: Arc>, diff --git a/src/bc/ser.rs b/src/bc/ser.rs index aa68eb5..bd33b7d 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -177,13 +177,17 @@ fn do_nothing() -> impl SerializeFn { #[test] fn test_legacy_login_roundtrip() { - let mut context = BcContext::new(); + let encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); // 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]>(&mut context, &sample[..]).unwrap(); - let ser_buf = msg.serialize(vec![]).unwrap(); + let ser_buf = msg + .serialize(vec![], &EncryptionProtocol::BCEncrypt) + .unwrap(); let msg2 = Bc::deserialize::<&[u8]>(&mut context, ser_buf.as_ref()).unwrap(); assert_eq!(msg, msg2); assert_eq!(&sample[..], ser_buf.as_slice()); @@ -191,14 +195,18 @@ fn test_legacy_login_roundtrip() { #[test] fn test_modern_login_roundtrip() { - let mut context = BcContext::new(); + let encryption_protocol = + std::sync::Arc::new(std::sync::Mutex::new(EncryptionProtocol::BCEncrypt)); + let mut context = BcContext::new(encryption_protocol); // 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]>(&mut context, &sample[..]).unwrap(); - let ser_buf = msg.serialize(vec![]).unwrap(); + let ser_buf = msg + .serialize(vec![], &EncryptionProtocol::BCEncrypt) + .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 761fdd9..85f3e27 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -207,9 +207,9 @@ fn test_encryption_deser() { assert_eq!(enc.nonce, "9E6D1FCB9E69846D"); assert_eq!(enc.type_, "md5"); - let t = BcXmls::try_parse(sample.as_bytes()).unwrap(); + let t = BcXml::try_parse(sample.as_bytes()).unwrap(); match t { - BcXmls::BcXml(top_b) if top_b == b => assert!(true), + top_b if top_b == b => assert!(true), _ => assert!(false), } } @@ -344,9 +344,12 @@ fn test_binary_deser() { "# ); - let b = BcXmls::try_parse(sample.as_bytes()).unwrap(); + let b = Extension::try_parse(sample.as_bytes()).unwrap(); match b { - BcXmls::Extension(Extension { binary_data: 1 }) => assert!(true), + Extension { + binary_data: Some(1), + .. + } => assert!(true), _ => assert!(false), } } diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index 17b7473..e784a59 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -61,7 +61,7 @@ fn test_xml_crypto() { let sample = include_bytes!("samples/xml_crypto_sample1.bin"); let should_be = include_bytes!("samples/xml_crypto_sample1_plaintext.bin"); - let decrypted = decrypt(0, &sample[..]); + let decrypted = decrypt(0, &sample[..], &EncryptionProtocol::BCEncrypt); assert_eq!(decrypted, &should_be[..]); } @@ -69,7 +69,7 @@ fn test_xml_crypto() { fn test_xml_crypto_roundtrip() { let zeros: [u8; 256] = [0; 256]; - let decrypted = encrypt(0, &zeros[..]); - let encrypted = decrypt(0, &decrypted[..]); + let decrypted = encrypt(0, &zeros[..], &EncryptionProtocol::BCEncrypt); + let encrypted = decrypt(0, &decrypted[..], &EncryptionProtocol::BCEncrypt); assert_eq!(encrypted, &zeros[..]); }