starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

network2: JSON_ERROR_CONTENT_TYPE

Browse Source
This commit is contained in:
Jakub Warmuz
2015-03-26 15:03:12 +00:00
parent d304f53895
commit 3caa0f8453
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/client/network2.py
+18 -9
View File
@@ -33,6 +33,7 @@ class Network(object):
DER_CONTENT_TYPE = 'application/plix-cert' DER_CONTENT_TYPE = 'application/plix-cert'
JSON_CONTENT_TYPE = 'application/json' JSON_CONTENT_TYPE = 'application/json'
JSON_ERROR_CONTENT_TYPE = 'application/problem+json'
def __init__(self, new_reg_uri, key, alg=jose.RS256): def __init__(self, new_reg_uri, key, alg=jose.RS256):
self.new_reg_uri = new_reg_uri self.new_reg_uri = new_reg_uri
@@ -64,13 +65,13 @@ class Network(object):
except ValueError as error: except ValueError as error:
jobj = None jobj = None
if jobj is not None and response_ct != cls.JSON_CONTENT_TYPE:
logging.debug(
'Decoded JSON response, but wrong Content-Type (%s).',
response_ct)
if not response.ok: if not response.ok:
if jobj is not None: if jobj is not None:
if response_ct != cls.JSON_ERROR_CONTENT_TYPE:
logging.debug(
'Ignoring wrong Content-Type (%r) for JSON Error',
response_ct)
try: try:
raise messages2.Error.from_json(jobj) raise messages2.Error.from_json(jobj)
except jose.DeserializationError as error: except jose.DeserializationError as error:
@@ -79,10 +80,18 @@ class Network(object):
else: else:
# response is not JSON object # response is not JSON object
raise errors.NetworkError(response) raise errors.NetworkError(response)
elif (content_type is not None and response_ct != content_type else:
and content_type != cls.JSON_CONTENT_TYPE): if jobj is not None and (
raise errors.NetworkError( response_ct != cls.JSON_CONTENT_TYPE or
'Unexpected response Content-Type: {0}'.format(response_ct)) response_ct != cls.JSON_ERROR_CONTENT_TYPE):
logging.debug(
'Ignoring wrong Content-Type (%r) for JSON decodable '
'response', response_ct)
if (content_type is not None and response_ct != content_type
and content_type != cls.JSON_CONTENT_TYPE):
raise errors.NetworkError(
'Unexpected response Content-Type: {0}'.format(response_ct))
def _get(self, uri, content_type=JSON_CONTENT_TYPE, **kwargs): def _get(self, uri, content_type=JSON_CONTENT_TYPE, **kwargs):
"""Send GET request. """Send GET request.