Sneed-Group/pypush-plus-plus
1
0
Fork 0
mirror of https://github.com/Sneed-Group/pypush-plus-plus synced 2024-12-24 20:02:31 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

forgot

Browse source
This commit is contained in:
JJTech0130 2023-08-17 21:17:13 -04:00
parent 60459cf1bc
commit 931bb00caa
No known key found for this signature in database
GPG key ID: 23C92EBCCF8F93D6
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ids/query.py
View file

@ -5,12 +5,13 @@ from base64 import b64encode
import apns import apns
import bags import bags
import logging
from ._helpers import KeyPair, PROTOCOL_VERSION from ._helpers import KeyPair, PROTOCOL_VERSION
from . import signing from . import signing
def lookup( async def lookup(
conn: apns.APNSConnection, conn: apns.APNSConnection,
self_uri: str, self_uri: str,
id_keypair: KeyPair, id_keypair: KeyPair,
@ -19,12 +20,12 @@ def lookup(
) -> bytes: ) -> bytes:
BAG_KEY = "id-query" BAG_KEY = "id-query"
conn.filter([topic]) await conn.filter([topic])
body = plistlib.dumps({"uris": query}) body = plistlib.dumps({"uris": query})
body = gzip.compress(body, mtime=0) body = gzip.compress(body, mtime=0)
push_token = b64encode(conn.token).decode() push_token = b64encode(conn.credentials.token).decode()
headers = { headers = {
"x-id-self-uri": self_uri, "x-id-self-uri": self_uri,
@ -47,25 +48,22 @@ def lookup(
"b": body, "b": body,
} }
conn.send_message(topic, plistlib.dumps(req, fmt=plistlib.FMT_BINARY)) await conn.send_notification(topic, plistlib.dumps(req, fmt=plistlib.FMT_BINARY))
def check_response(x): def check(payload: apns.APNSPayload):
if x[0] != 0x0A: body = payload.fields_with_id(3)[0].value
if body is None:
return False return False
resp_body = apns._get_field(x[1], 3) body = plistlib.loads(body)
if resp_body is None: logging.warning(body.get('U'))
return False return body.get('U') == msg_id
resp_body = plistlib.loads(resp_body)
return resp_body.get('U') == msg_id
# Lambda to check if the response is the one we want payload = await conn.expect_notification(topic, check)
payload = conn.incoming_queue.wait_pop_find(check_response)
resp = apns._get_field(payload[1], 3) resp = payload.fields_with_id(3)[0].value
resp = plistlib.loads(resp) resp = plistlib.loads(resp)
resp = gzip.decompress(resp["b"]) resp = gzip.decompress(resp["b"])
resp = plistlib.loads(resp) resp = plistlib.loads(resp)
# Acknowledge the message
#conn._send_ack(apns._get_field(payload[1], 4))
if resp['status'] != 0: if resp['status'] != 0:
raise Exception(f'Query failed: {resp}') raise Exception(f'Query failed: {resp}')

4
ids/signing.py
View file

@ -12,8 +12,8 @@ from ._helpers import KeyPair, dearmour
# TODO: Move this helper somewhere else # TODO: Move this helper somewhere else
def armour_cert(cert: bytes) -> str: def armour_cert(c: bytes) -> str:
cert = x509.load_der_x509_certificate(cert) cert = x509.load_der_x509_certificate(c)
return cert.public_bytes(serialization.Encoding.PEM).decode("utf-8").strip() return cert.public_bytes(serialization.Encoding.PEM).decode("utf-8").strip()