Improve robustness of JSON decoding

If JSON decoding fails, if a field is missing, or if there are no fields, a ConsulException is returned.
criteo · Jan 9, 2025 · 269e497 · 269e497
1 parent bdd8253
commit 269e497
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/consul/callback.py b/consul/callback.py
@@ -72,18 +72,23 @@ def cb(response):
             if response.code == 404:
                 data = None
             else:
-                data = json.loads(response.body)
-                if decode:
-                    for item in data:
-                        if item.get(decode) is not None:
-                            item[decode] = base64.b64decode(item[decode])
-                if is_id:
-                    data = data["ID"]
-                if one and isinstance(data, list):
-                    data = data[0] if data else None
-                if postprocess:
-                    data = postprocess(data)
+                try:
+                    data = json.loads(response.body)
+                    if decode:
+                        for item in data:
+                            if item.get(decode) is not None:
+                                item[decode] = base64.b64decode(item[decode])
+                    if is_id:
+                        data = data["ID"]
+                    if one and isinstance(data, list):
+                        data = data[0] if data else None
+                    if postprocess:
+                        data = postprocess(data)
+                except (json.JSONDecodeError, TypeError, KeyError) as e:
+                    raise ConsulException(f"Failed to decode JSON: {response.body} {e}") from e
             if index:
+                if "X-Consul-Index" not in response.headers:
+                    raise ConsulException(f"Missing index header: {response.headers}")
                 return response.headers["X-Consul-Index"], data
             return data