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

trying to fix query after refactor

Browse source
This commit is contained in:
JJTech0130 2023-05-09 18:01:32 -04:00
parent c99826d60e
commit 7158532c66
No known key found for this signature in database
GPG key ID: 23C92EBCCF8F93D6
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demo.py
View file

@ -51,6 +51,8 @@ else:
vd = input_multiline("Enter validation data: ") vd = input_multiline("Enter validation data: ")
user.register(vd) user.register(vd)
print(user.lookup(["mailto:textgpt@icloud.com"]))
# Write config.json # Write config.json
CONFIG["id"] = { CONFIG["id"] = {
"key": user._id_keypair.key, "key": user._id_keypair.key,

6
ids/__init__.py
View file

@ -2,7 +2,7 @@ from base64 import b64encode
import apns import apns
from . import _helpers, identity, profile from . import _helpers, identity, profile, query
class IDSUser: class IDSUser:
@ -66,3 +66,7 @@ class IDSUser:
def restore_identity(self, id_keypair: _helpers.KeyPair): def restore_identity(self, id_keypair: _helpers.KeyPair):
self._id_keypair = id_keypair self._id_keypair = id_keypair
def lookup(self, uris: list[str], topic: str = "com.apple.madrid") -> any:
return query.lookup(self.push_connection, self.handles[0], self._id_keypair, topic, uris)

13
ids/query.py
View file

@ -6,7 +6,8 @@ from base64 import b64encode
import apns import apns
import bags import bags
from . import USER_AGENT, KeyPair, signing from ._helpers import USER_AGENT, KeyPair
from . import signing
def _send_request( def _send_request(
@ -15,7 +16,7 @@ def _send_request(
topic: str, topic: str,
body: bytes, body: bytes,
keypair: KeyPair, keypair: KeyPair,
username: str, self_uri: str,
) -> bytes: ) -> bytes:
body = gzip.compress(body, mtime=0) body = gzip.compress(body, mtime=0)
@ -25,10 +26,11 @@ def _send_request(
# signature, nonce = _sign_payload(keypair.key, bag_key, "", push_token, body) # signature, nonce = _sign_payload(keypair.key, bag_key, "", push_token, body)
headers = { headers = {
"x-id-self-uri": "mailto:" + username, "x-id-self-uri": self_uri,
"User-Agent": USER_AGENT, "User-Agent": USER_AGENT,
"x-protocol-version": "1630", "x-protocol-version": "1630",
} }
print(headers)
signing.add_id_signature(headers, body, bag_key, keypair, push_token) signing.add_id_signature(headers, body, bag_key, keypair, push_token)
# print(headers) # print(headers)
@ -46,6 +48,7 @@ def _send_request(
"b": body, "b": body,
} }
print(req)
conn.send_message(topic, plistlib.dumps(req, fmt=plistlib.FMT_BINARY)) conn.send_message(topic, plistlib.dumps(req, fmt=plistlib.FMT_BINARY))
# resp = conn.wait_for_packet(0x0A) # resp = conn.wait_for_packet(0x0A)
@ -73,11 +76,11 @@ def _send_request(
# topic: the IDS topic to query # topic: the IDS topic to query
# query: a list of URIs to query # query: a list of URIs to query
def lookup( def lookup(
conn: apns.APNSConnection, self: str, keypair: KeyPair, topic: str, query: list[str] conn: apns.APNSConnection, self_uri: str, id_keypair: KeyPair, topic: str, query: list[str]
) -> any: ) -> any:
conn.filter([topic]) conn.filter([topic])
query = {"uris": query} query = {"uris": query}
resp = _send_request(conn, "id-query", topic, plistlib.dumps(query), keypair, self) resp = _send_request(conn, "id-query", topic, plistlib.dumps(query), id_keypair, self_uri)
# resp = plistlib.loads(resp) # resp = plistlib.loads(resp)
# print(resp) # print(resp)
resp = gzip.decompress(resp["b"]) resp = gzip.decompress(resp["b"])