From 224658af0d68c98aac3f9eb5b0d393cdb8565e25 Mon Sep 17 00:00:00 2001
From: ndx1905-github <64833823+ndx1905-github@users.noreply.github.com>
Date: Tue, 20 Aug 2024 15:51:59 +0200
Subject: [PATCH] Update icloud_to_nextcloud.py
Suppression serveur web
Modif nom iphone
---
icloud_to_nextcloud.py | 104 +++++------------------------------------
1 file changed, 12 insertions(+), 92 deletions(-)
diff --git a/icloud_to_nextcloud.py b/icloud_to_nextcloud.py
index 4ea94cf..ac7eb4b 100644
--- a/icloud_to_nextcloud.py
+++ b/icloud_to_nextcloud.py
@@ -4,78 +4,12 @@ import logging
import sys
import urllib.parse
-import bottle
import requests
from pyicloud import PyiCloudService
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 """
-
-
-
-
- iCloud 2FA protection
-
-
-
-
-"""
-
-
-@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 #
###############
@@ -95,23 +29,16 @@ def get_icloud_location(config):
"""
Fetch latest iPhone location from iCloud
"""
- global server
- global code_2fa
email = config['apple']['email']
password = config['apple']['password']
+ code_2fa = config['apple']['code_2fa']
+
api = PyiCloudService(email, password=password, cookie_directory=config['apple']['cookie_directory'])
if api.requires_2fa:
- print(
- "Two-factor authentication required. "
- f"Head over to http://{config['webserver']['host']}:{config['webserver']['port']} and fill-in the 2FA code."
- )
- server = StoppableCherootServer(
- host=config['webserver']['host'],
- port=int(config['webserver']['port'])
- )
- app.run(server=server)
- result = api.validate_2fa_code(code_2fa)
+ print("Two-factor authentication required.")
+ code = code_2fa
+ result = api.validate_2fa_code(code)
print("Code validation result: %s" % result)
if not result:
@@ -124,11 +51,7 @@ def get_icloud_location(config):
print("Session trust result %s" % result)
if not result:
- print(
- "Failed to request trust. "
- "You will likely be prompted for the code again "
- "in the coming weeks"
- )
+ print("Failed to request trust. You will likely be prompted for the code again in the coming weeks")
elif api.requires_2sa:
import click
print("Two-step authentication required. Your trusted devices are:")
@@ -136,11 +59,8 @@ def get_icloud_location(config):
devices = api.trusted_devices
for i, device in enumerate(devices):
print(
- " %s: %s" % (
- i, device.get(
- 'deviceName', "SMS to %s" % device.get('phoneNumber')
- )
- )
+ " %s: %s" % (i, device.get('deviceName',
+ "SMS to %s" % device.get('phoneNumber')))
)
device = click.prompt('Which device would you like to use?', default=0)
@@ -155,10 +75,10 @@ def get_icloud_location(config):
sys.exit(1)
iphone = next(
- device
- for device in api.devices
- if 'iPhone' in device.status()['name']
- )
+ device
+ for device in api.devices
+ if config['apple']['iPhone_name'] in device.status()['name']
+ )
iphone_location = iphone.location()
iphone_status = iphone.status()