upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 07:12:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Less generic exception catching in send()

Browse source
This commit is contained in:
Jakub Warmuz 2014-11-23 21:16:42 +01:00
parent 725d05e8ac
commit c22d243728
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
letsencrypt/client/client.py
View file

@ -470,23 +470,32 @@ class Client(object):
return True
def send(self, json_obj):
json_encoded = json.dumps(json_obj)
acme.acme_object_validate(json_encoded)
try:
json_encoded = json.dumps(json_obj)
acme.acme_object_validate(json_encoded)
response = requests.post(
self.server_url,
data=json_encoded,
headers={"Content-Type": "application/json"},
)
body = response.content
acme.acme_object_validate(body)
return response.json()
except Exception as e:
except requests.exceptions.RequestException as e:
logger.fatal("Send() failed... may have lost connection to server")
logger.fatal(" ** ERROR **")
logger.fatal(e)
sys.exit(8)
try:
acme.acme_object_validate(response.content)
except ValueError:
logger.fatal('Server did not send JSON serializable message')
sys.exit(8)
except jsonschema.ValidationError as error:
logger.fatal('Server did not send valid ACME message')
logger.fatal(error)
sys.exit(8)
return response.json()
def store_revocation_token(self, token):
return