summaryrefslogtreecommitdiff
path: root/macaroonbakery/httpbakery/_client.py
diff options
context:
space:
mode:
Diffstat (limited to 'macaroonbakery/httpbakery/_client.py')
-rw-r--r--macaroonbakery/httpbakery/_client.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/macaroonbakery/httpbakery/_client.py b/macaroonbakery/httpbakery/_client.py
index d877140..4fe0ab1 100644
--- a/macaroonbakery/httpbakery/_client.py
+++ b/macaroonbakery/httpbakery/_client.py
@@ -320,8 +320,11 @@ def extract_macaroons(headers_or_request):
mss = []
def add_macaroon(data):
- data = utils.b64decode(data)
- data_as_objs = json.loads(data.decode('utf-8'))
+ try:
+ data = utils.b64decode(data)
+ data_as_objs = json.loads(data.decode('utf-8'))
+ except ValueError:
+ return
ms = [utils.macaroon_from_dict(x) for x in data_as_objs]
mss.append(ms)