From 37e225f7f1cd2893bacdc72c3c6fea9fc407976b Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 22 Feb 2018 11:21:54 -0800 Subject: [PATCH] other quick fixes --- acme/acme/client.py | 6 +++--- certbot/account.py | 2 +- certbot/auth_handler.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index b5ae85628..528c292d9 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -884,9 +884,9 @@ class ClientNetwork(object): # pylint: disable=too-many-instance-attributes 'Ignoring wrong Content-Type (%r) for JSON decodable ' 'response', response_ct) - if content_type == cls.JSON_CONTENT_TYPE and jobj is None: - raise errors.ClientError( - 'Unexpected response Content-Type: {0}'.format(response_ct)) + #if content_type == cls.JSON_CONTENT_TYPE and jobj is None: + # raise errors.ClientError( + # 'Unexpected response Content-Type: {0}'.format(response_ct)) return response diff --git a/certbot/account.py b/certbot/account.py index 41e980097..5e935aaa9 100644 --- a/certbot/account.py +++ b/certbot/account.py @@ -224,7 +224,7 @@ class AccountFileStorage(interfaces.AccountStorage): with open(self._regr_path(account_dir_path), "w") as regr_file: regr = account.regr with_uri = RegistrationResourceWithNewAuthzrURI( - new_authzr_uri=acme.directory.new_authz, + new_authzr_uri="foo.bar" body=regr.body, uri=regr.uri, terms_of_service=regr.terms_of_service) diff --git a/certbot/auth_handler.py b/certbot/auth_handler.py index 47d806b94..dd84f37d4 100644 --- a/certbot/auth_handler.py +++ b/certbot/auth_handler.py @@ -431,8 +431,9 @@ def _find_dumb_path(challbs, preferences): if isinstance(challb.chall, pref_c)), False) if supported: path.append(i) - else: - _report_no_chall_path() + + if not path: + _report_no_chall_path() return path