From 887d72fd5d9b77d3cea914ffed23b9d62e93c5e7 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 2 Jan 2020 21:48:55 +0100 Subject: [PATCH] Remove POST-as-GET fallback to GET (#6994) --- acme/acme/client.py | 22 +++------------------- acme/tests/client_test.py | 13 ------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index aabcbe312..527430120 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -776,29 +776,13 @@ class ClientV2(ClientBase): def _post_as_get(self, *args, **kwargs): """ - Send GET request using the POST-as-GET protocol if needed. - The request will be first issued using POST-as-GET for ACME v2. If the ACME CA servers do - not support this yet and return an error, request will be retried using GET. - For ACME v1, only GET request will be tried, as POST-as-GET is not supported. + Send GET request using the POST-as-GET protocol. :param args: :param kwargs: :return: """ - if self.acme_version >= 2: - # We add an empty payload for POST-as-GET requests - new_args = args[:1] + (None,) + args[1:] - try: - return self._post(*new_args, **kwargs) - except messages.Error as error: - if error.code == 'malformed': - logger.debug('Error during a POST-as-GET request, ' - 'your ACME CA server may not support it:\n%s', error) - logger.debug('Retrying request with GET.') - else: # pragma: no cover - raise - - # If POST-as-GET is not supported yet, we use a GET instead. - return self.net.get(*args, **kwargs) + new_args = args[:1] + (None,) + args[1:] + return self._post(*new_args, **kwargs) class BackwardsCompatibleClientV2(object): diff --git a/acme/tests/client_test.py b/acme/tests/client_test.py index 192cd2949..a38fedbd6 100644 --- a/acme/tests/client_test.py +++ b/acme/tests/client_test.py @@ -885,19 +885,6 @@ class ClientV2Test(ClientTestBase): new_nonce_url='https://www.letsencrypt-demo.org/acme/new-nonce') self.client.net.get.assert_not_called() - class FakeError(messages.Error): - """Fake error to reproduce a malformed request ACME error""" - def __init__(self): # pylint: disable=super-init-not-called - pass - @property - def code(self): - return 'malformed' - self.client.net.post.side_effect = FakeError() - - self.client.poll(self.authzr2) # pylint: disable=protected-access - - self.client.net.get.assert_called_once_with(self.authzr2.uri) - class MockJSONDeSerializable(jose.JSONDeSerializable): # pylint: disable=missing-docstring