Skip to content

Allow manual OAuth URL entry without waiting full callback timeout #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cook1e0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow manual OAuth URL entry without waiting full callback timeout #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 37 additions & 18 deletions fordlogger/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import time
import logging
import threading
import queue
from http.server import HTTPServer, BaseHTTPRequestHandler
from urllib.parse import urlparse, parse_qs, urlencode
from pathlib import Path
Expand Down Expand Up @@ -63,29 +64,47 @@ def do_auth_flow(cfg: dict):
_CallbackHandler.auth_code = None
server = HTTPServer(("localhost", 8080), _CallbackHandler)
threading.Thread(target=server.serve_forever, daemon=True).start()
log.info("Waiting for OAuth callback (max. 120s) ...")
print("If the automatic callback does not work, copy the full URL from your")
print("browser's address bar after login and paste it below.\n")

for _ in range(240):
# Let stdin fallback run in parallel so remote users can paste the callback URL immediately.
manual_q = queue.Queue()

def _read_manual():
print("Paste the full callback URL at any time and press Enter.")
print("Or just wait for the automatic callback.\n")
try:
value = input("> ").strip()
if value:
manual_q.put(value)
except EOFError:
pass

threading.Thread(target=_read_manual, daemon=True).start()

log.info("Waiting for OAuth callback or manual URL (max. 120s) ...")
code = None
deadline = time.time() + 120
while time.time() < deadline:
if _CallbackHandler.auth_code:
code = _CallbackHandler.auth_code
log.info("Auth code received via callback: %s...", code[:10])
break
try:
url = manual_q.get_nowait()
except queue.Empty:
url = None
if url:
params = parse_qs(urlparse(url).query)
if "code" not in params:
server.shutdown()
raise ValueError("No 'code' parameter found in the pasted URL")
code = params["code"][0]
log.info("Auth code received via manual URL: %s...", code[:10])
break
time.sleep(0.5)
time.sleep(0.2)

server.shutdown()

if _CallbackHandler.auth_code:
code = _CallbackHandler.auth_code
log.info("Auth code received via callback: %s...", code[:10])
else:
print("\nNo automatic callback received.")
print("Paste the full callback URL from your browser and press Enter:")
url = input("> ").strip()
params = parse_qs(urlparse(url).query)
if "code" not in params:
raise ValueError("No 'code' parameter found in the pasted URL")
code = params["code"][0]
log.info("Auth code received via manual URL: %s...", code[:10])
if not code:
raise RuntimeError("No OAuth callback received and no manual URL pasted within 120s")

scope = f"{cfg['client_id']} offline_access openid"
resp = requests.post(cfg["token_url"], data={
Expand Down