Sneed-Group/pypush-plus-plus
2
0
Fork 0
mirror of https://github.com/Sneed-Group/pypush-plus-plus synced 2025-01-09 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging and sms decoding

Browse source
This commit is contained in:
JJTech0130 2023-08-12 07:41:41 -04:00
parent dfc6302b3d
commit 0ea957b536
No known key found for this signature in database
GPG key ID: 23C92EBCCF8F93D6
1 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
imessage.py
View file

@ -80,44 +80,48 @@ class Attachment:
versions: list[AttachmentFile] versions: list[AttachmentFile]
def __init__(self, message_raw_content: dict, xml_element: ElementTree.Element): def __init__(self, message_raw_content: dict, xml_element: ElementTree.Element):
attrs = xml_element.attrib attrib = xml_element.attrib
self.name = attrs["name"] if "name" in attrs else None self.name = attrib["name"] if "name" in attrib else None
self.mime_type = attrs["mime-type"] if "mime-type" in attrs else None self.mime_type = attrib["mime-type"] if "mime-type" in attrib else None
if "inline-attachment" in attrs: if "inline-attachment" in attrib:
# just grab the inline attachment ! # just grab the inline attachment !
self.versions = [InlineFile(message_raw_content[attrs["inline-attachment"]])] self.versions = [InlineFile(message_raw_content[attrib["inline-attachment"]])]
else: else:
# suffer # suffer
versions = []
for attribute in attrs:
if attribute.startswith("mmcs") or \
attribute.startswith("decryption-key") or \
attribute.startswith("file-size"):
segments = attribute.split('-')
if segments[-1].isnumeric():
index = int(segments[-1])
attribute_name = segments[:-1]
else:
index = 0
attribute_name = attribute
while index >= len(versions):
versions.append(MMCSFile())
val = attrs[attribute_name] versions = [InlineFile(b"")]
match attribute_name:
case "mmcs-url": print(attrib)
versions[index].url = val # for attribute in attrs:
case "mmcs-owner": # if attribute.startswith("mmcs") or \
versions[index].owner = val # attribute.startswith("decryption-key") or \
case "mmcs-signature-hex": # attribute.startswith("file-size"):
versions[index].signature = base64.b16decode(val) # segments = attribute.split('-')
case "file-size": # if segments[-1].isnumeric():
versions[index].size = int(val) # index = int(segments[-1])
case "decryption-key": # attribute_name = segments[:-1]
versions[index].decryption_key = base64.b16decode(val)[1:] # else:
# index = 0
# attribute_name = attribute
# while index >= len(versions):
# versions.append(MMCSFile())
# val = attrs[attribute_name]
# match attribute_name:
# case "mmcs-url":
# versions[index].url = val
# case "mmcs-owner":
# versions[index].owner = val
# case "mmcs-signature-hex":
# versions[index].signature = base64.b16decode(val)
# case "file-size":
# versions[index].size = int(val)
# case "decryption-key":
# versions[index].decryption_key = base64.b16decode(val)[1:]
self.versions = versions self.versions = versions
@ -194,6 +198,8 @@ class iMessage:
message = plistlib.loads(message) message = plistlib.loads(message)
logger.debug(f"Decompressed message : {message}")
return iMessage( return iMessage(
text=message.get("t", ""), text=message.get("t", ""),
xml=message.get("x"), xml=message.get("x"),
@ -260,7 +266,7 @@ class iMessageUser:
def check_response(x): def check_response(x):
if x[0] != 0x0A: if x[0] != 0x0A:
return False return False
if apns._get_field(x[1], 2) != sha1("com.apple.madrid".encode()).digest(): if apns._get_field(x[1], 2) != sha1("com.apple.madrid".encode()).digest() and apns._get_field(x[1], 2) != sha1("com.apple.private.alloy.sms".encode()).digest():
return False return False
resp_body = apns._get_field(x[1], 3) resp_body = apns._get_field(x[1], 3)
if resp_body is None: if resp_body is None:
@ -435,8 +441,12 @@ class iMessageUser:
if not self._verify_payload(payload, body['sP'], body["t"]): if not self._verify_payload(payload, body['sP'], body["t"]):
raise Exception("Failed to verify payload") raise Exception("Failed to verify payload")
logger.debug(f"Encrypted body : {body}")
decrypted = self._decrypt_payload(payload) decrypted = self._decrypt_payload(payload)
#logger.debug(f"Decrypted payload : {plistlib.loads(decrypted)}")
return iMessage.from_raw(decrypted, body['sP']) return iMessage.from_raw(decrypted, body['sP'])
KEY_CACHE_HANDLE: str = "" KEY_CACHE_HANDLE: str = ""