diff --git a/sal/version.plist b/sal/version.plist index 924b76b5..00030480 100644 --- a/sal/version.plist +++ b/sal/version.plist @@ -3,6 +3,6 @@ version - 3.2.0.948 + 3.2.0.949 diff --git a/server/plugins/cryptstatus/cryptstatus.py b/server/plugins/cryptstatus/cryptstatus.py index 7c80c5fd..ddca3fb9 100644 --- a/server/plugins/cryptstatus/cryptstatus.py +++ b/server/plugins/cryptstatus/cryptstatus.py @@ -29,22 +29,25 @@ def widget_content(self, page, machines=None, theid=None): crypt_url = crypt_url.rstrip('/') except: crypt_url = None - + serial = machines.serial output = {} date_escrowed = None escrowed = None request_url = crypt_url + '/verify/'+ serial + '/recovery_key/' if crypt_url: - r = requests.get(request_url) - if r.status_code == requests.codes.ok: - output = r.json() + try: + r = requests.get(request_url) + if r.status_code == requests.codes.ok: + output = r.json() + except: + pass if output != {}: escrowed = output['escrowed'] if output['escrowed'] == True: date_escrowed = parse_datetime(output['date_escrowed']) - + c = Context({ 'title': 'FileVault Escrow', 'date_escrowed': date_escrowed,