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

make publishing client_data optional

Browse source
This commit is contained in:
JJTech0130 2023-08-28 08:01:41 -04:00
parent 3500879256
commit 56e0c6098c
No known key found for this signature in database
GPG key ID: 23C92EBCCF8F93D6
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
demo.py
View file

@ -58,6 +58,13 @@ async def main(args: argparse.Namespace):
push_creds = apns.PushCredentials( push_creds = apns.PushCredentials(
CONFIG.get("push", {}).get("key", ""), CONFIG.get("push", {}).get("cert", ""), token) CONFIG.get("push", {}).get("key", ""), CONFIG.get("push", {}).get("cert", ""), token)
def register(conn, users):
import emulated.nac
vd = emulated.nac.generate_validation_data()
vd = b64encode(vd).decode()
users = ids.register(conn, users, vd, args.client_data)
return users
async with apns.APNSConnection.start(push_creds) as conn: async with apns.APNSConnection.start(push_creds) as conn:
# Save the push credentials to the config # Save the push credentials to the config
CONFIG["push"] = { CONFIG["push"] = {
@ -112,12 +119,7 @@ async def main(args: argparse.Namespace):
users.append(ids.IDSAppleUser.authenticate(conn, username, password)) users.append(ids.IDSAppleUser.authenticate(conn, username, password))
import emulated.nac users = register(conn, users)
vd = emulated.nac.generate_validation_data()
vd = b64encode(vd).decode()
users = ids.register(conn, users, vd)
CONFIG["users"] = [] CONFIG["users"] = []
for user in users: for user in users:
@ -134,10 +136,7 @@ async def main(args: argparse.Namespace):
if args.reregister: if args.reregister:
print("Re-registering...") print("Re-registering...")
import emulated.nac users = register(conn, users)
vd = emulated.nac.generate_validation_data()
vd = b64encode(vd).decode()
users = ids.register(conn, users, vd)
# You CANNOT turn around and re-register like this: # You CANNOT turn around and re-register like this:
@ -271,5 +270,6 @@ async def output_task(im: imessage.iMessageUser):
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--reregister", action="store_true", help="Force re-registration") parser.add_argument("--reregister", action="store_true", help="Force re-registration")
parser.add_argument("--client-data", action="store_true", help="Publish client data (only necessary for actually sending/receiving messages)")
args = parser.parse_args() args = parser.parse_args()
trio.run(main, args) trio.run(main, args)

4
ids/__init__.py
View file

@ -106,7 +106,7 @@ DEFAULT_CLIENT_DATA = {
import uuid import uuid
def register(push_connection: apns.APNSConnection, users: list[IDSUser], validation_data: str): def register(push_connection: apns.APNSConnection, users: list[IDSUser], validation_data: str, publish_client_data: bool = True):
signing_users = [(user.user_id, user.auth_keypair) for user in users] signing_users = [(user.user_id, user.auth_keypair) for user in users]
# Create new encryption identity for each user # Create new encryption identity for each user
@ -125,7 +125,7 @@ def register(push_connection: apns.APNSConnection, users: list[IDSUser], validat
else: else:
special_data = DEFAULT_CLIENT_DATA special_data = DEFAULT_CLIENT_DATA
user_payloads.append({ user_payloads.append({
"client-data": special_data, "client-data": special_data if publish_client_data else None,
"tag": "SIM" if user.user_id.startswith("P:") else None, "tag": "SIM" if user.user_id.startswith("P:") else None,
"uris": [{"uri": handle} for handle in user.handles], "uris": [{"uri": handle} for handle in user.handles],
"user-id": user.user_id, "user-id": user.user_id,