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

General cleanup to PEP-8 standards

Browse source
This commit is contained in:
Steven Burnham 2023-12-02 15:09:31 -05:00
parent ba25d4e379
commit 6aea1fbbfb
No known key found for this signature in database
GPG key ID: D765679712A2FC3D
1 changed files with 65 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
demo.py
View file

@ -1,23 +1,18 @@
import json import json
import logging import logging
import os import argparse
import threading import datetime
import time
import traceback
from base64 import b64decode, b64encode from base64 import b64decode, b64encode
from getpass import getpass from getpass import getpass
from cryptography import x509 from cryptography import x509
import datetime
from rich.logging import RichHandler from rich.logging import RichHandler
import trio
import apns import apns
import ids import ids
import imessage import imessage
import trio
import argparse
from exceptions import * from exceptions import *
logging.basicConfig( logging.basicConfig(
@ -45,27 +40,33 @@ try:
except FileNotFoundError: except FileNotFoundError:
CONFIG = {} CONFIG = {}
def safe_b64decode(s): def safe_b64decode(s):
try: try:
return b64decode(s) return b64decode(s)
except: except (ValueError, TypeError) as e:
print(f"Error decoding b64: {e}")
return None return None
def safe_config(): def safe_config():
with open("config.json", "w") as f: with open("config.json", "w", encoding="utf-8") as f:
json.dump(CONFIG, f, indent=4) json.dump(CONFIG, f, indent=4)
def get_not_valid_after_timestamp(cert_data): def get_not_valid_after_timestamp(cert_data):
try: try:
cert = x509.load_pem_x509_certificate(cert_data.encode('utf-8')) cert = x509.load_pem_x509_certificate(cert_data.encode('utf-8'))
return cert.not_valid_after return cert.not_valid_after
except Exception as e: except (ValueError, TypeError, AttributeError) as e:
print(f"Error determining certificate expiration date: {e}")
return None # Return None in case of an error return None # Return None in case of an error
expiration = None expiration = None
async def main(args: argparse.Namespace):
async def main(args: argparse.Namespace):
global expiration global expiration
# Load any existing push credentials # Load any existing push credentials
@ -85,12 +86,14 @@ async def main(args: argparse.Namespace):
def expiration_identifier(users: list[ids.IDSUser]) -> datetime.datetime | None: def expiration_identifier(users: list[ids.IDSUser]) -> datetime.datetime | None:
expiration = None expiration = None
# Format time as HH:MM:SS PM/AM EST/EDT (X minutes from now) # Format time as HH:MM:SS PM/AM EST/EDT (X minutes from now)
expire_msg = lambda expiration: f"Number registration is valid until {str(expiration.astimezone().strftime('%x %I:%M:%S %p %Z'))} ({str(int((expiration - datetime.datetime.now(datetime.timezone.utc)).total_seconds()/60))} minutes from now)" expire_msg = lambda \
expiration: f"Number registration is valid until {str(expiration.astimezone().strftime('%x %I:%M:%S %p %Z'))} ({str(int((expiration - datetime.datetime.now(datetime.timezone.utc)).total_seconds() / 60))} minutes from now)"
for user in users: for user in users:
# If this is a phone number user, then it's got to be the one we just linked # If this is a phone number user, then it's got to be the one we just linked
# so pull out the expiration date from the certificate # so pull out the expiration date from the certificate
if "P:" in str(user.user_id): if "P:" in str(user.user_id):
# There is not really a good reason to try/catch here: If we couldn't reregister, just crash (very unlikely we can recover) # There is not really a good reason to try/catch here: If we couldn't reregister,
# just crash (very unlikely we can recover)
cert = x509.load_pem_x509_certificate(user.id_cert.encode('utf-8')) cert = x509.load_pem_x509_certificate(user.id_cert.encode('utf-8'))
expiration = cert.not_valid_after expiration = cert.not_valid_after
# Make it a UTC aware timezone, for reasons # Make it a UTC aware timezone, for reasons
@ -98,7 +101,6 @@ async def main(args: argparse.Namespace):
logging.info(expire_msg(expiration)) logging.info(expire_msg(expiration))
return expiration return expiration
async def reregister(conn: apns.APNSConnection, users: list[ids.IDSUser]) -> datetime.datetime: async def reregister(conn: apns.APNSConnection, users: list[ids.IDSUser]) -> datetime.datetime:
register(conn, users) register(conn, users)
@ -106,7 +108,8 @@ async def main(args: argparse.Namespace):
expiration = None expiration = None
# Format time as HH:MM:SS PM/AM EST/EDT (X minutes from now) # Format time as HH:MM:SS PM/AM EST/EDT (X minutes from now)
expire_msg = lambda expiration: f"Number registration is valid until {str(expiration.astimezone().strftime('%x %I:%M:%S %p %Z'))} ({str(int((expiration - datetime.datetime.now(datetime.timezone.utc)).total_seconds()/60))} minutes from now)" expire_msg = lambda \
expiration: f"Number registration is valid until {str(expiration.astimezone().strftime('%x %I:%M:%S %p %Z'))} ({str(int((expiration - datetime.datetime.now(datetime.timezone.utc)).total_seconds() / 60))} minutes from now)"
email_user = None email_user = None
email_addr = None # For HACK below email_addr = None # For HACK below
@ -169,14 +172,18 @@ async def main(args: argparse.Namespace):
if "id" in CONFIG: if "id" in CONFIG:
logging.debug("Restoring old-style identity...") logging.debug("Restoring old-style identity...")
users.append(ids.IDSAppleUser(conn, CONFIG["auth"]["user_id"], ids._helpers.KeyPair(CONFIG["auth"]["key"], CONFIG["auth"]["cert"]), users.append(ids.IDSAppleUser(conn, CONFIG["auth"]["user_id"],
ids.identity.IDSIdentity(CONFIG["encryption"]["ec_key"], CONFIG["encryption"]["rsa_key"]), CONFIG["id"]["cert"], ids._helpers.KeyPair(CONFIG["auth"]["key"], CONFIG["auth"]["cert"]),
ids.identity.IDSIdentity(CONFIG["encryption"]["ec_key"],
CONFIG["encryption"]["rsa_key"]),
CONFIG["id"]["cert"],
CONFIG["auth"]["handles"])) CONFIG["auth"]["handles"]))
if "users" in CONFIG: if "users" in CONFIG:
logging.debug("Restoring new-style identity...") logging.debug("Restoring new-style identity...")
for user in CONFIG["users"]: for user in CONFIG["users"]:
users.append(ids.IDSUser(conn, user["id"], ids._helpers.KeyPair(user["auth_key"], user["auth_cert"]), users.append(ids.IDSUser(conn, user["id"], ids._helpers.KeyPair(user["auth_key"], user["auth_cert"]),
ids.identity.IDSIdentity(user["signing_key"], user["encryption_key"]), user["id_cert"], ids.identity.IDSIdentity(user["signing_key"], user["encryption_key"]),
user["id_cert"],
user["handles"])) user["handles"]))
else: else:
@ -232,7 +239,8 @@ async def main(args: argparse.Namespace):
expiration = await reregister(conn, users) expiration = await reregister(conn, users)
while True: while True:
reregister_time = expiration - datetime.timedelta(minutes=wait_time_minutes) # wait_time_minutes before expiration reregister_time = expiration - datetime.timedelta(
minutes=wait_time_minutes) # wait_time_minutes before expiration
reregister_delta = (reregister_time - datetime.datetime.now(datetime.timezone.utc)).total_seconds() reregister_delta = (reregister_time - datetime.datetime.now(datetime.timezone.utc)).total_seconds()
logging.info(f"Reregistering in {int(reregister_delta / 60)} minutes...") logging.info(f"Reregistering in {int(reregister_delta / 60)} minutes...")
@ -256,7 +264,8 @@ async def main(args: argparse.Namespace):
reregister_time = reregister_time.astimezone(datetime.timezone.utc) reregister_time = reregister_time.astimezone(datetime.timezone.utc)
logging.info(f'Reregistration will occur at: {reregister_time}') logging.info(f'Reregistration will occur at: {reregister_time}')
reregister_delta = (reregister_time - datetime.datetime.now(datetime.timezone.utc)).total_seconds() reregister_delta = (reregister_time - datetime.datetime.now(datetime.timezone.utc)).total_seconds()
logging.info(f'The time between now and reregistration time is: {(reregister_delta / 3600):.2f} hours or {(reregister_delta / 86400):.2f} days') logging.info(
f'The time between now and reregistration time is: {(reregister_delta / 3600):.2f} hours or {(reregister_delta / 86400):.2f} days')
if reregister_delta > 3600: if reregister_delta > 3600:
logging.info('Certificates expiration is greater than 60 minutes, quiting') logging.info('Certificates expiration is greater than 60 minutes, quiting')
else: else:
@ -274,12 +283,14 @@ async def main(args: argparse.Namespace):
while True: while True:
await trio.sleep(20) await trio.sleep(20)
async def input_task(im: imessage.iMessageUser): async def input_task(im: imessage.iMessageUser):
while True: while True:
cmd = await trio.to_thread.run_sync(input, "> ", cancellable=True) cmd = await trio.to_thread.run_sync(input, "> ", cancellable=True)
if cmd != "": if cmd != "":
await im.send(imessage.iMessage.create(im, cmd, ["tel:+16106632676"])) await im.send(imessage.iMessage.create(im, cmd, ["tel:+16106632676"]))
async def output_task(im: imessage.iMessageUser): async def output_task(im: imessage.iMessageUser):
while True: while True:
msg = await im.receive() msg = await im.receive()
@ -291,13 +302,15 @@ if __name__ == "__main__":
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("--reg-notify", action="store_true", help="Get iMessage after each registration") parser.add_argument("--reg-notify", action="store_true", help="Get iMessage after each registration")
parser.add_argument("--alive", action="store_true", help="Keep the connection alive") parser.add_argument("--alive", action="store_true", help="Keep the connection alive")
parser.add_argument("--client-data", action="store_true", help="Publish client data (only necessary for actually sending/receiving messages)") parser.add_argument("--client-data", action="store_true",
help="Publish client data (only necessary for actually sending/receiving messages)")
parser.add_argument("--trigger-pdu", action="store_true", help="Trigger a REG-REQ") parser.add_argument("--trigger-pdu", action="store_true", help="Trigger a REG-REQ")
# String arg to override pdu # String arg to override pdu
parser.add_argument("--pdu", type=str, help="Override the PDU REG-RESP") parser.add_argument("--pdu", type=str, help="Override the PDU REG-RESP")
parser.add_argument("--phone", type=str, help="Override the phone IP") parser.add_argument("--phone", type=str, help="Override the phone IP")
parser.add_argument("--gateway", type=str, help="Override the gateway phone number") parser.add_argument("--gateway", type=str, help="Override the gateway phone number")
parser.add_argument("--daemon", action="store_true", help="Continuously reregister 5 minutes before the certificate expires") parser.add_argument("--daemon", action="store_true",
help="Continuously reregister 5 minutes before the certificate expires")
parser.add_argument("--cronreg", action="store_true", help="Reregister if less than 60 minutes from expiration") parser.add_argument("--cronreg", action="store_true", help="Reregister if less than 60 minutes from expiration")
args = parser.parse_args() args = parser.parse_args()