From cdd0f91dfbf07597af5b7044efe3171bf57e93eb Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 18 Jun 2021 12:53:25 +0100 Subject: [PATCH] Additional debug information on getJson --- pgp.py | 3 ++- session.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pgp.py b/pgp.py index c84596dec..f8cb96970 100644 --- a/pgp.py +++ b/pgp.py @@ -478,7 +478,8 @@ def pgpPublicKeyUpload(baseDir: str, session, if debug: print('Getting actor for ' + handle) - actorJson, asHeader = getActorJson(handle, False, False, debug, True) + actorJson, asHeader = \ + getActorJson(domain, handle, False, False, debug, True) if not actorJson: if debug: print('No actor returned for ' + handle) diff --git a/session.py b/session.py index 99dedddc7..0ade43feb 100644 --- a/session.py +++ b/session.py @@ -13,6 +13,7 @@ from utils import urlPermitted import json from socket import error as SocketError import errno +from http.client import HTTPConnection baseDirectory = None @@ -104,9 +105,24 @@ def getJson(session, url: str, headers: {}, params: {}, debug: bool, if not quiet: print('WARN: getJson failed, no session specified for getJson') return None + + if debug: + HTTPConnection.debuglevel = 1 + try: result = session.get(url, headers=sessionHeaders, params=sessionParams, timeout=timeoutSec) + if result.status_code != 200: + if result.status_code == 401: + print('WARN: getJson Unauthorized url: ' + url) + elif result.status_code == 403: + print('WARN: getJson Forbidden url: ' + url) + elif result.status_code == 404: + print('WARN: getJson Not Found url: ' + url) + elif result.status_code != 200: + print('WARN: getJson url: ' + url + + ' failed with error code ' + + str(result.status_code)) return result.json() except requests.exceptions.RequestException as e: sessionHeaders2 = sessionHeaders.copy()