Merge remote-tracking branch 'ndef/patch-3' into ndef
This commit is contained in:
commit
ea8729bbaa
@ -4,78 +4,12 @@ import logging
|
|||||||
import sys
|
import sys
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
|
||||||
import bottle
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from pyicloud import PyiCloudService
|
from pyicloud import PyiCloudService
|
||||||
from requests.auth import HTTPBasicAuth
|
from requests.auth import HTTPBasicAuth
|
||||||
|
|
||||||
|
|
||||||
class StoppableCherootServer(bottle.ServerAdapter):
|
|
||||||
"""
|
|
||||||
We need a stoppable HTTP server, which can be stopped from within a route.
|
|
||||||
|
|
||||||
This is not doable out of the box in bottle and is quite hacky using plain
|
|
||||||
WSGIRef. This is easier and cleaner with Cheroot (formally CherryPy)
|
|
||||||
backend.
|
|
||||||
"""
|
|
||||||
def run(self, handler): # pragma: no cover
|
|
||||||
from cheroot import wsgi
|
|
||||||
self.options['bind_addr'] = (self.host, self.port)
|
|
||||||
self.options['wsgi_app'] = handler
|
|
||||||
self.server = wsgi.Server(**self.options)
|
|
||||||
try:
|
|
||||||
self.server.start()
|
|
||||||
finally:
|
|
||||||
self.server.stop()
|
|
||||||
|
|
||||||
|
|
||||||
############################################
|
|
||||||
# Web app to fetch 2FA code from the user. #
|
|
||||||
############################################
|
|
||||||
|
|
||||||
code_2fa = None # Global for passing 2FA code from web app to main script
|
|
||||||
app = bottle.Bottle()
|
|
||||||
server = None
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/')
|
|
||||||
def get_2fa():
|
|
||||||
"""
|
|
||||||
Main HTTP route, display an HTML form to fetch 2FA code from user.
|
|
||||||
"""
|
|
||||||
return """
|
|
||||||
<!doctype html>
|
|
||||||
<html lang="fr">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>iCloud 2FA protection</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<form method="post" action="/2fa">
|
|
||||||
<p>
|
|
||||||
<label for="2FA">2FA password?</label>
|
|
||||||
<input type="text" id="2FA" name="2FA"/>
|
|
||||||
</p>
|
|
||||||
<input type="submit"/>
|
|
||||||
</form>
|
|
||||||
</body>
|
|
||||||
</html>"""
|
|
||||||
|
|
||||||
|
|
||||||
@app.post('/2fa')
|
|
||||||
def set_2fa():
|
|
||||||
"""
|
|
||||||
Handle form submission and store 2FA code to pass along the rest of the
|
|
||||||
code.
|
|
||||||
"""
|
|
||||||
global code_2fa
|
|
||||||
global server
|
|
||||||
code_2fa = bottle.request.forms.get('2FA')
|
|
||||||
server.server.stop()
|
|
||||||
return "OK"
|
|
||||||
|
|
||||||
|
|
||||||
###############
|
###############
|
||||||
# Main script #
|
# Main script #
|
||||||
###############
|
###############
|
||||||
@ -95,23 +29,16 @@ def get_icloud_location(config):
|
|||||||
"""
|
"""
|
||||||
Fetch latest iPhone location from iCloud
|
Fetch latest iPhone location from iCloud
|
||||||
"""
|
"""
|
||||||
global server
|
|
||||||
global code_2fa
|
|
||||||
email = config['apple']['email']
|
email = config['apple']['email']
|
||||||
password = config['apple']['password']
|
password = config['apple']['password']
|
||||||
|
code_2fa = config['apple']['code_2fa']
|
||||||
|
|
||||||
api = PyiCloudService(email, password=password, cookie_directory=config['apple']['cookie_directory'])
|
api = PyiCloudService(email, password=password, cookie_directory=config['apple']['cookie_directory'])
|
||||||
|
|
||||||
if api.requires_2fa:
|
if api.requires_2fa:
|
||||||
print(
|
print("Two-factor authentication required.")
|
||||||
"Two-factor authentication required. "
|
code = code_2fa
|
||||||
f"Head over to http://{config['webserver']['host']}:{config['webserver']['port']} and fill-in the 2FA code."
|
result = api.validate_2fa_code(code)
|
||||||
)
|
|
||||||
server = StoppableCherootServer(
|
|
||||||
host=config['webserver']['host'],
|
|
||||||
port=int(config['webserver']['port'])
|
|
||||||
)
|
|
||||||
app.run(server=server)
|
|
||||||
result = api.validate_2fa_code(code_2fa)
|
|
||||||
print("Code validation result: %s" % result)
|
print("Code validation result: %s" % result)
|
||||||
|
|
||||||
if not result:
|
if not result:
|
||||||
@ -124,11 +51,7 @@ def get_icloud_location(config):
|
|||||||
print("Session trust result %s" % result)
|
print("Session trust result %s" % result)
|
||||||
|
|
||||||
if not result:
|
if not result:
|
||||||
print(
|
print("Failed to request trust. You will likely be prompted for the code again in the coming weeks")
|
||||||
"Failed to request trust. "
|
|
||||||
"You will likely be prompted for the code again "
|
|
||||||
"in the coming weeks"
|
|
||||||
)
|
|
||||||
elif api.requires_2sa:
|
elif api.requires_2sa:
|
||||||
import click
|
import click
|
||||||
print("Two-step authentication required. Your trusted devices are:")
|
print("Two-step authentication required. Your trusted devices are:")
|
||||||
@ -136,11 +59,8 @@ def get_icloud_location(config):
|
|||||||
devices = api.trusted_devices
|
devices = api.trusted_devices
|
||||||
for i, device in enumerate(devices):
|
for i, device in enumerate(devices):
|
||||||
print(
|
print(
|
||||||
" %s: %s" % (
|
" %s: %s" % (i, device.get('deviceName',
|
||||||
i, device.get(
|
"SMS to %s" % device.get('phoneNumber')))
|
||||||
'deviceName', "SMS to %s" % device.get('phoneNumber')
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
device = click.prompt('Which device would you like to use?', default=0)
|
device = click.prompt('Which device would you like to use?', default=0)
|
||||||
@ -157,7 +77,7 @@ def get_icloud_location(config):
|
|||||||
iphone = next(
|
iphone = next(
|
||||||
device
|
device
|
||||||
for device in api.devices
|
for device in api.devices
|
||||||
if 'iPhone' in device.status()['name']
|
if config['apple']['iPhone_name'] in device.status()['name']
|
||||||
)
|
)
|
||||||
iphone_location = iphone.location()
|
iphone_location = iphone.location()
|
||||||
iphone_status = iphone.status()
|
iphone_status = iphone.status()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user