From ac98bf182b480c4d6c5f493550421dae51dec9c4 Mon Sep 17 00:00:00 2001
From: Matteo Bertucci <matteobertucci2004@gmail.com>
Date: Wed, 20 Jan 2021 11:27:36 +0100
Subject: [PATCH] Add proper status code handling

---
 cloudflare_ddns/app.py   | 27 ++++++++++++++++++++-------
 cloudflare_ddns/utils.py | 24 +++++++++++++++++++++---
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/cloudflare_ddns/app.py b/cloudflare_ddns/app.py
index f04a3b0..a2890e2 100644
--- a/cloudflare_ddns/app.py
+++ b/cloudflare_ddns/app.py
@@ -1,11 +1,13 @@
 import logging
 import threading
 from dataclasses import dataclass
-from typing import Dict, List, Tuple
+from typing import List, Tuple
 
 import requests
+from requests import HTTPError
+
 from cloudflare_ddns.constants import ACCEPTED_RECORDS, LIST_DNS, LIST_ZONES, VERIFY_TOKEN, PATCH_DNS
-from cloudflare_ddns.utils import BearerAuth, parse_duration, get_ip
+from cloudflare_ddns.utils import BearerAuth, parse_duration, get_ip, check_status, CloudflareHTTPError
 
 log = logging.getLogger("ddns")
 
@@ -46,6 +48,15 @@ class ApplicationJob(threading.Thread):
         log.info(f"Starting app. Records will be updated every {self.delay} seconds.")
         try:
             self.update_records()
+
+        except HTTPError as e:
+            log.error(
+                f"HTTP error {'from Cloudflare' if isinstance(e, CloudflareHTTPError) else ''} "
+                f"while updating records for the first time, aborting."
+            )
+            log.error(e)
+            log.info("Exiting with code 70.")
+
         except Exception:
             log.exception("Error while updating records for the first time, aborting.")
             log.info("Exiting with code 70.")
@@ -61,21 +72,23 @@ class ApplicationJob(threading.Thread):
         log.info("Starting record update.")
         for record in self.domains:
             log.debug(f"Updating record for {record.domain}.")
-            requests.patch(
+
+            check_status(requests.patch(
                 PATCH_DNS.format(zone_identifier=record.zone, identifier=record.id),
                 json={"content": get_ip(record.record_type == 'AAAA')},
                 auth=self.auth
-            ).raise_for_status()
+            ))
+
         log.info("Successfully updated records.")
 
     def parse_domains(self) -> None:
         found_domains = {}
 
-        for zone_json in requests.get(LIST_ZONES, auth=self.auth).json()["result"]:
-            for record_json in requests.get(
+        for zone_json in check_status(requests.get(LIST_ZONES, auth=self.auth)).json()["result"]:
+            for record_json in check_status(requests.get(
                     LIST_DNS.format(zone_identifier=zone_json["id"]),
                     auth=self.auth
-            ).json()["result"]:
+            )).json()["result"]:
                 if record_json["type"] in ACCEPTED_RECORDS:
                     domain = Domain(
                         record_json["name"],
diff --git a/cloudflare_ddns/utils.py b/cloudflare_ddns/utils.py
index 4e25fd3..b72900a 100644
--- a/cloudflare_ddns/utils.py
+++ b/cloudflare_ddns/utils.py
@@ -1,10 +1,10 @@
 import re
 
 import requests
-from requests import Request
+from requests import Request, Response, codes, HTTPError
 from requests.auth import AuthBase
 
-from cloudflare_ddns.constants import IP_API_URL_IPV4, IP_API_URL_IPV6
+from cloudflare_ddns.constants import IP_API_URL_IPV4, IP_API_URL_IPV6, BASE_ENDPOINT
 
 DURATION_REGEX = re.compile(
     r"((?P<days>\d+?) ?(days|day|D|d) ?)?"
@@ -57,5 +57,23 @@ class BearerAuth(AuthBase):
 
 def get_ip(ipv6: bool) -> str:
     """Return the host public IP as detected by ipify.org."""
-    r = requests.get(IP_API_URL_IPV4 if not ipv6 else IP_API_URL_IPV6)
+    r = check_status(requests.get(IP_API_URL_IPV4 if not ipv6 else IP_API_URL_IPV6))
     return r.text
+
+
+class CloudflareHTTPError(HTTPError):
+    """HTTPError coming from a Cloudflare endpoint."""
+    pass
+
+
+def check_status(r: Response) -> Response:
+    """Check the status code of a response and return it."""
+    if not r.status_code == codes.ok:
+        if r.url.startswith(BASE_ENDPOINT) and not r.json()["success"]:
+            errors = "\n".join(f"{err['code']}: {err['message']}" for err in r.json()["errors"])
+
+            raise CloudflareHTTPError(f"{r.status_code} {r.reason} while querying {r.url}: {errors}")
+        else:
+            r.raise_for_status()
+
+    return r