Packed APS encoding

Author: TaeHagen

src/aps.rs

@@ -771,7 +771,7 @@ impl<S: RequestState> SignedRequest<S> {
         debug!("sending apns query {:?}", request);
 
         let receiver = aps.subscribe().await;
-        aps.send_message(topic, plist_to_bin(&request)?, None).await?;
+        aps.send_message(topic, request, None).await?;
 
         let response = aps.wait_for_timeout(receiver, get_message(|payload| {
             let Some(recv_id) = payload.as_dictionary().unwrap().get("U") else {
@@ -1397,7 +1397,7 @@ impl IdmsAuthListener {
     }
 
     pub fn handle(&self, message: APSMessage) -> Result<Option<IdmsMessage>, PushError> {
-        let APSMessage::Notification { topic, payload, .. } = message else { return Ok(None) };
+        let APSMessage::Notification { topic, payload: Value::Data(payload), .. } = message else { return Ok(None) };
         if &topic != &sha1("com.apple.idmsauth".as_bytes()) { return Ok(None) }
 
         let data: serde_json::value::Map<String, serde_json::Value> = serde_json::from_slice(&payload)?;

src/auth.rs

@@ -625,7 +625,7 @@ pub struct CloudKitNotifWatcher {
 
 impl CloudKitNotifWatcher {
     pub async fn handle(&self, msg: &APSMessage) -> Result<Vec<RecordZoneIdentifier>, PushError> {
-        let APSMessage::Notification { topic, payload, .. } = &msg else { return Ok(vec![]) };
+        let APSMessage::Notification { topic, payload: Value::Data(payload), .. } = &msg else { return Ok(vec![]) };
         if topic != &self.for_topic { return Ok(vec![]) }
 
         let data = std::str::from_utf8(payload).expect("Failed to decode?");

src/icloud/cloudkit.rs

@@ -15,7 +15,7 @@ use rand::RngCore;
 use uuid::Uuid;
 use std::str::FromStr;
 use std::fmt::Debug;
-use crate::util::{DebugMutex, DebugRwLock};
+use crate::{aps::new_aps_id, util::{DebugMutex, DebugRwLock}};
 
 use crate::{APSConnectionResource, APSMessage, IDSUser, MessageInst, OSConfig, PushError, aps::{APSConnection, APSInterestToken, get_message}, ids::{MessageBody, user::{IDSError, IDSLookupUser}}, register, util::{Resource, ResourceManager, base64_decode, base64_encode, bin_deserialize, bin_deserialize_sha, bin_serialize, duration_since_epoch, encode_hex, plist_to_bin, plist_to_string, ungzip}};
 
@@ -718,7 +718,7 @@ impl IdentityResource {
     }
 
     pub async fn handle(&self, msg: APSMessage) -> Result<bool, PushError> {
-        let APSMessage::Notification { id: _, topic, token: _, payload, channel: _ } = msg else { return Ok(false) };
+        let APSMessage::Notification { id: _, topic, token: _, payload: Value::Data(payload), channel: _ } = msg else { return Ok(false) };
         if topic != sha1("com.apple.private.ids".as_bytes()) { return Ok(false) };
 
         #[derive(Deserialize)]
@@ -766,9 +766,9 @@ impl IdentityResource {
     pub async fn receive_message(&self, msg: APSMessage, topics: &[&'static str]) -> Result<Option<IDSRecvMessage>, PushError> {
         let APSMessage::Notification { id: _, topic, token: _, payload, channel: _ } = msg else { return Ok(None) };
         let Some(topic) = topics.iter().find(|t| sha1(t.as_bytes()) == topic) else { return Ok(None) };
-        debug!("ID got message {topic} {:?}", plist::from_bytes::<Value>(&payload)?);
+        debug!("ID got message {topic} {:?}", &payload);
 
-        let mut payload = plist::from_bytes::<IDSRecvMessage>(&payload)?;
+        let mut payload = plist::from_value::<IDSRecvMessage>(&payload)?;
 
 
         payload.topic = *topic;
@@ -882,7 +882,7 @@ impl IdentityResource {
 
     pub async fn certify_delivery(&self, topic: &'static str, delivery: &CertifiedContext, notify: bool) -> Result<(), PushError> {
         debug!("Certifying delivery for message {} notify {notify}", Uuid::from_bytes(delivery.uuid.clone().try_into().expect("Bad message uuid size!")).to_string());
-        let msg_id = rand::thread_rng().next_u32();
+        let msg_id = new_aps_id();
         let mut dict = Dictionary::from_iter([
             // sends APN ack
             ("cdr", Value::Data(delivery.receipt.clone())),
@@ -902,7 +902,7 @@ impl IdentityResource {
                 ("gd".to_string(), Value::Boolean(true)),
             ]);
         }
-        self.aps.send_message(topic, plist_to_bin(&dict)?, Some(msg_id)).await?;
+        self.aps.send_message(topic, dict, Some(msg_id)).await?;
 
         Ok(())
     }
@@ -1014,7 +1014,7 @@ pub struct SendMessage {
     pub user_agent: String,
     pub v: Option<u32>,
     #[serde(rename = "i")]
-    pub message_id: u32,
+    pub message_id: i32,
     #[serde(rename = "U")]
     pub uuid: Data,
     #[serde(rename = "dtl")]
@@ -1107,7 +1107,7 @@ impl InnerSendJob {
 
         let mut messages = self.conn.subscribe().await;
 
-        let msg_id = rand::thread_rng().next_u32();
+        let msg_id = new_aps_id();
         let uuid = Uuid::from_str(&message.id).unwrap().as_bytes().to_vec();
         let is_relay_message = message.relay.is_some();
         let apns_topic = if is_relay_message {
@@ -1147,8 +1147,7 @@ impl InnerSendJob {
 
             debug!("Sending value {value:?}");
 
-            let binary = plist_to_bin(&value)?;
-            self.conn.send_message(apns_topic, binary, Some(msg_id)).await?
+            self.conn.send_message(apns_topic, value, Some(msg_id)).await?
         }
 
         if !message.no_response {

src/ids/identity_manager.rs

@@ -181,7 +181,7 @@ impl IMClient {
                 e: duration_since_epoch().as_nanos() as u64,
             };
 
-            conn.send_message("com.apple.madrid", plist_to_bin(&msg).unwrap(), None).await?;
+            conn.send_message("com.apple.madrid", msg, None).await?;
         }
         Ok(())
     }

src/imessage/aps_client.rs

@@ -14,7 +14,7 @@ use async_recursion::async_recursion;
 use std::io::Seek;
 use rand::RngCore;
 
-use crate::{aps::get_message, ids::{identity_manager::{IDSSendMessage, MessageTarget, Raw}, CertifiedContext, IDSRecvMessage}, mmcs::{self, put_authorize_body, AuthorizedOperation, MMCSReceipt, ReadContainer, WriteContainer}, util::{base64_decode, base64_encode, bin_deserialize, bin_serialize, duration_since_epoch, plist_to_string, KeyedArchive, NSArray, NSArrayClass, NSDataClass, NSDictionary, NSDictionaryClass}, OSConfig};
+use crate::{OSConfig, aps::{get_message, new_aps_id}, ids::{CertifiedContext, IDSRecvMessage, identity_manager::{IDSSendMessage, MessageTarget, Raw}}, mmcs::{self, AuthorizedOperation, MMCSReceipt, ReadContainer, WriteContainer, put_authorize_body}, util::{KeyedArchive, NSArray, NSArrayClass, NSDataClass, NSDictionary, NSDictionaryClass, base64_decode, base64_encode, bin_deserialize, bin_serialize, duration_since_epoch, plist_to_string}};
 
 use crate::{aps::APSConnectionResource, error::PushError, mmcs::{get_mmcs, prepare_put, put_mmcs, MMCSConfig, Container, DataCacher, PreparedPut}, mmcsp, util::{decode_hex, encode_hex, gzip, plist_to_bin, ungzip}};
 
@@ -1161,7 +1161,7 @@ struct RequestMMCSUpload {
     v: u64,
     ua: String,
     c: u64,
-    i: u32,
+    i: i32,
     #[serde(rename = "cV")]
     cv: u32,
     #[serde(rename = "cH")]
@@ -1249,7 +1249,7 @@ impl MMCSFile {
         let mut inputs = vec![(&prepared.mmcs, None, send_container)];
         let (headers, body) = put_authorize_body(&mmcs_config, &inputs);
 
-        let msg_id = rand::thread_rng().next_u32();
+        let msg_id = new_aps_id();
         let complete = RequestMMCSUpload {
             c: 150,
             ua: mmcs_config.mini_ua.clone(),
@@ -1261,9 +1261,8 @@ impl MMCSFile {
             headers: format!("{}\n", headers.into_iter().map(|(k, v)| format!("{}:{}", k, v)).collect::<Vec<_>>().join("\n")),
             body: body.into()
         };
-        let binary = plist_to_bin(&complete)?;
         let recv = apns.subscribe().await;
-        apns.send_message("com.apple.madrid", binary, Some(msg_id)).await?;
+        apns.send_message("com.apple.madrid", complete, Some(msg_id)).await?;
 
         let reader = apns.wait_for_timeout(recv, get_message(|loaded| {
             let Some(c) = loaded.as_dictionary().unwrap().get("c") else {
@@ -1272,7 +1271,7 @@ impl MMCSFile {
             let Some(i) = loaded.as_dictionary().unwrap().get("i") else {
                 return None
             };
-            if c.as_unsigned_integer().unwrap() == 150 && i.as_unsigned_integer().unwrap() as u32 == msg_id {
+            if c.as_unsigned_integer().unwrap() == 150 && i.as_signed_integer().unwrap() as i32 == msg_id {
                 Some(loaded)
             } else { None }
         }, &["com.apple.madrid"])).await?;
@@ -1311,7 +1310,7 @@ impl MMCSFile {
             v: u64,
             ua: String,
             c: u64,
-            i: u32,
+            i: i32,
             #[serde(rename = "cH")]
             headers: String,
             #[serde(rename = "mR")]
@@ -1341,7 +1340,7 @@ impl MMCSFile {
         let recieve_container = IMessageContainer::new(&self.key, writer, true);
 
         let domain = self.url.replace(&format!("/{}", &self.object), "");
-        let msg_id = rand::thread_rng().next_u32();
+        let msg_id = new_aps_id();
         let header = format!("x-mme-client-info:{}", mmcs_config.mme_client_info);
         let request_download = RequestMMCSDownload {
             object: self.object.to_string(),
@@ -1363,9 +1362,8 @@ impl MMCSFile {
 
         info!("mmcs obj {} sig {}", self.object, encode_hex(&self.signature));
 
-        let binary = plist_to_bin(&request_download)?;
         let recv = apns.subscribe().await;
-        apns.send_message("com.apple.madrid", binary, Some(msg_id)).await?;
+        apns.send_message("com.apple.madrid", request_download, Some(msg_id)).await?;
 
         let reader = apns.wait_for_timeout(recv, get_message(|loaded| {
             let Some(c) = loaded.as_dictionary().unwrap().get("c") else {
@@ -1374,7 +1372,7 @@ impl MMCSFile {
             let Some(i) = loaded.as_dictionary().unwrap().get("i") else {
                 return None
             };
-            if c.as_unsigned_integer().unwrap() == 151 && i.as_unsigned_integer().unwrap() as u32 == msg_id {
+            if c.as_unsigned_integer().unwrap() == 151 && i.as_signed_integer().unwrap() as i32 == msg_id {
                 Some(loaded)
             } else { None }
         }, &["com.apple.madrid"])).await?;

src/imessage/messages.rs

@@ -567,7 +567,7 @@ impl<P: AnisetteProvider> SharedStreamClient<P> {
     }
 
     pub async fn handle(&self, msg: APSMessage) -> Result<Option<Vec<String>>, PushError> {
-        let APSMessage::Notification { id: _, topic, token: _, payload, channel: _ } = msg else { return Ok(None) };
+        let APSMessage::Notification { id: _, topic, token: _, payload: Value::Data(payload), channel: _ } = msg else { return Ok(None) };
         if topic != sha1("com.apple.sharedstreams".as_bytes()) { return Ok(None) };
 
         #[derive(Deserialize)]

src/sharedstreams.rs

@@ -16,7 +16,7 @@ use tokio::sync::{broadcast, mpsc};
 use uuid::Uuid;
 use rand::{rngs::OsRng, RngCore};
 
-use crate::{APSConnection, APSMessage, IdentityManager, OSConfig, PushError, TokenProvider, aps::{APSChannel, APSChannelIdentifier, APSInterestToken, get_message}, ids::{IDSRecvMessage, identity_manager::{IDSSendMessage, Raw}, user::QueryOptions}, util::{DebugMutex, DebugRwLock, base64_decode, base64_encode, decode_hex, encode_hex, plist_to_bin}};
+use crate::{APSConnection, APSMessage, IdentityManager, OSConfig, PushError, TokenProvider, aps::{APSChannel, APSChannelIdentifier, APSInterestToken, get_message, new_aps_id}, ids::{IDSRecvMessage, identity_manager::{IDSSendMessage, Raw}, user::QueryOptions}, util::{DebugMutex, DebugRwLock, base64_decode, base64_encode, decode_hex, encode_hex, plist_to_bin}};
 use crate::util::{CompactECKey, ec_serialize, ec_serialize_priv, bin_serialize, bin_deserialize, proto_serialize, proto_deserialize, ec_deserialize_priv_compact, ec_deserialize_compact, proto_serialize_vec, proto_deserialize_vec};
 use aes_gcm::KeyInit;
 
@@ -197,7 +197,7 @@ pub struct ManageRequest {
     #[serde(rename = "v")]
     version: u32,
     #[serde(rename = "i")]
-    id: u32,
+    id: i32,
     #[serde(rename = "U")]
     uuid: Data,
 }
@@ -419,7 +419,7 @@ impl<T: AnisetteProvider + Send + Sync + 'static> StatusKitClient<T> {
 
     pub async fn send_manage_request<ReqMsg: Message, ResMsg: Message + Default>(&self, request: ReqMsg, command: u8) -> Result<ResMsg, PushError> {
         debug!("Sending channel manage request {command}, {request:?}");
-        let msg_id = rand::thread_rng().next_u32();
+        let msg_id = new_aps_id();
         let req = ManageRequest {
             request: request.encode_to_vec().into(),
             command,
@@ -431,14 +431,14 @@ impl<T: AnisetteProvider + Send + Sync + 'static> StatusKitClient<T> {
         };
 
         let recv = self.conn.subscribe().await;
-        self.conn.send_message("com.apple.icloud.presence.channel.management", plist_to_bin(&req)?, Some(msg_id)).await?;
+        self.conn.send_message("com.apple.icloud.presence.channel.management", req, Some(msg_id)).await?;
 
         Ok(ResMsg::decode(Cursor::new(self.conn.wait_for_timeout(recv, get_message(|loaded| {
             debug!("Got message {:?}", loaded);
             #[derive(Deserialize)]
             struct Res {
                 c: u8,
-                i: u32,
+                i: i32,
                 #[serde(rename = "scRes")]
                 sc_res: Data,
             }
@@ -716,7 +716,7 @@ impl<T: AnisetteProvider + Send + Sync + 'static> StatusKitClient<T> {
     }
 
     pub async fn handle(&self, msg: APSMessage) -> Result<Option<StatusKitMessage>, PushError> {
-        let APSMessage::Notification { id: _, topic, token: _, payload, channel } = msg.clone() else { return Ok(None) };
+        let APSMessage::Notification { id: _, topic, token: _, payload: Value::Data(payload), channel } = msg.clone() else { return Ok(None) };
         if let Some(channel) = &channel {
             let mut state = self.state.write().await;
             if let Some(local_channel) = state.recent_channels.iter_mut().find(|c| c.identifier.id == channel.id && sha1(c.identifier.topic.as_bytes()) == topic) {

src/statuskit.rs

@@ -2598,3 +2598,45 @@ impl Into<String> for NSURL {
 }
 
 
+
+use std::io;
+
+pub trait BinaryReadExt: Read {
+    fn read_u8_exact(&mut self) -> io::Result<u8> {
+        let mut buf = [0u8; 1];
+        self.read_exact(&mut buf)?;
+        Ok(buf[0])
+    }
+
+    fn read_u16_le(&mut self) -> io::Result<u16> {
+        let mut buf = [0u8; 2];
+        self.read_exact(&mut buf)?;
+        Ok(u16::from_le_bytes(buf))
+    }
+
+    fn read_u16_be(&mut self) -> io::Result<u16> {
+        let mut buf = [0u8; 2];
+        self.read_exact(&mut buf)?;
+        Ok(u16::from_be_bytes(buf))
+    }
+
+    fn read_u32_le(&mut self) -> io::Result<u32> {
+        let mut buf = [0u8; 4];
+        self.read_exact(&mut buf)?;
+        Ok(u32::from_le_bytes(buf))
+    }
+
+    fn read_u32_be(&mut self) -> io::Result<u32> {
+        let mut buf = [0u8; 4];
+        self.read_exact(&mut buf)?;
+        Ok(u32::from_be_bytes(buf))
+    }
+
+    fn read_n(&mut self, n: usize) -> io::Result<Vec<u8>> {
+        let mut buf = vec![0u8; n];
+        self.read_exact(&mut buf)?;
+        Ok(buf)
+    }
+}
+
+impl<R: Read + ?Sized> BinaryReadExt for R {}