Sneed-Group/pypush-plus-plus
1
0
Fork 0
mirror of https://github.com/Sneed-Group/pypush-plus-plus synced 2024-12-23 11:22:42 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix sms 2fa

Browse source
This commit is contained in:
JJTech0130 2023-08-06 13:21:46 -04:00
parent 132cd3849c
commit 213f90af51
No known key found for this signature in database
GPG key ID: 23C92EBCCF8F93D6
1 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ids/profile.py
View file

@ -23,17 +23,18 @@ logger = logging.getLogger("ids")
def _auth_token_request(username: str, password: str) -> any: def _auth_token_request(username: str, password: str) -> any:
# Turn the PET into an auth token # Turn the PET into an auth token
data = { data = {
"apple-id": username, "username": username,
"client-id": str(uuid.uuid4()), #"client-id": str(uuid.uuid4()),
"delegates": {"com.apple.private.ids": {"protocol-version": "4"}}, #"delegates": {"com.apple.private.ids": {"protocol-version": "4"}},
"password": password, "password": password,
} }
data = plistlib.dumps(data) data = plistlib.dumps(data)
r = requests.post( r = requests.post(
# TODO: Figure out which URL bag we can get this from # TODO: Figure out which URL bag we can get this from
"https://setup.icloud.com/setup/prefpane/loginDelegates", "https://profile.ess.apple.com/WebObjects/VCProfileService.woa/wa/authenticateUser",
auth=(username, password), #"https://setup.icloud.com/setup/prefpane/loginDelegates",
#auth=(username, password),
data=data, data=data,
verify=False, verify=False,
) )
@ -62,24 +63,38 @@ def get_auth_token(
if use_gsa: if use_gsa:
logger.debug("Using GrandSlam to authenticate (native Anisette)") logger.debug("Using GrandSlam to authenticate (native Anisette)")
g = gsa.authenticate(username, password, gsa.Anisette()) g = gsa.authenticate(username, password, gsa.Anisette())
pet = g["t"]["com.apple.gs.idms.pet"]["token"] password = g["t"]["com.apple.gs.idms.pet"]["token"]
else:
logger.debug("Using old-style authentication") result = _auth_token_request(username, password)
# Make the request without the 2FA code to make the prompt appear if result["status"] != 0:
_auth_token_request(username, password) if result["status"] == 5000:
# TODO: Make sure we actually need the second request, some rare accounts don't have 2FA if factor_gen is None:
# Now make the request with the 2FA code password = password + input("Enter 2FA code: ")
if factor_gen is None: else:
pet = password + input("Enter 2FA code: ") password = password + factor_gen()
else: result = _auth_token_request(username, password)
pet = password + factor_gen() if result["status"] != 0:
r = _auth_token_request(username, pet) raise Exception(f"Error: {result}")
# print(r)
if "description" in r: auth_token = result["auth-token"]
raise Exception(f"Error: {r['description']}") realm_user_id = result["profile-id"]
service_data = r["delegates"]["com.apple.private.ids"]["service-data"] # else:
realm_user_id = service_data["realm-user-id"] # logger.debug("Using old-style authentication")
auth_token = service_data["auth-token"] # # Make the request without the 2FA code to make the prompt appear
# _auth_token_request(username, password)
# # TODO: Make sure we actually need the second request, some rare accounts don't have 2FA
# # Now make the request with the 2FA code
# if factor_gen is None:
# pet = password + input("Enter 2FA code: ")
# else:
# pet = password + factor_gen()
# r = _auth_token_request(username, pet)
# # print(r)
# if "description" in r:
# raise Exception(f"Error: {r['description']}")
# service_data = r["delegates"]["com.apple.private.ids"]["service-data"]
# realm_user_id = service_data["realm-user-id"]
# auth_token = service_data["auth-token"]
# print(f"Auth token for {realm_user_id}: {auth_token}") # print(f"Auth token for {realm_user_id}: {auth_token}")
logger.debug(f"Got auth token for IDS: {auth_token}") logger.debug(f"Got auth token for IDS: {auth_token}")
return realm_user_id, auth_token return realm_user_id, auth_token