vrr/DockFlare
2
0
Fork 0
mirror of https://github.com/ChrispyBacon-dev/DockFlare.git synced 2026-04-28 11:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix ISsue 83 - API Token function
Some checks failed
Docker Image Build and Push / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
ChrispyBacon-dev 2025-06-09 12:38:22 +02:00
parent e412bf3f97
commit dffae285de
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dockflare/app/core/cloudflare_api.py
View file

@ -232,16 +232,25 @@ def get_tunnel_token_via_api(tunnel_id):
logging.info(f"Getting token for tunnel ID '{tunnel_id}' on account {config.CF_ACCOUNT_ID}")
endpoint = f"/accounts/{config.CF_ACCOUNT_ID}/cfd_tunnel/{tunnel_id}/token"
url = f"{config.CF_API_BASE_URL}{endpoint}"
token = None
try:
logging.info(f"API Request: GET {url} (for token, raw request)")
response = requests.request("GET", url, headers={"Authorization": f"Bearer {config.CF_API_TOKEN}"}, timeout=30)
response.raise_for_status()
token = response.text.strip()
try:
token = response.json().get("result")
logging.info("Successfully parsed tunnel token from JSON response.")
except json.JSONDecodeError:
# If JSON parsing fails, it's the legacy raw text response. Bugfix for Issue 83
logging.info("Could not parse response as JSON, falling back to raw text for token.")
token = response.text.strip()
if not token or len(token) < 50:
logging.error(f"Retrieved token for tunnel {tunnel_id} appears invalid (too short or empty).")
raise ValueError("Invalid token format received from API")
logging.info(f"Successfully retrieved token for tunnel {tunnel_id}")
logging.error(f"Retrieved token for tunnel {tunnel_id} appears invalid (too short or empty). Value: '{token}'")
raise ValueError("Invalid token format or content received from API")
logging.info(f"Successfully retrieved and validated token for tunnel {tunnel_id}")
return token
except requests.exceptions.RequestException as e:
error_msg = f"API Error getting token for tunnel {tunnel_id}: {e}"
if e.response is not None: