diff --git a/acme/acme/client.py b/acme/acme/client.py index 5f462bf18..cbe543f91 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -989,7 +989,7 @@ class ClientNetwork(object): """ if isinstance(obj, VersionedLEACMEMixin): - obj.le_auto_version = acme_version + obj.le_acme_version = acme_version jobj = obj.json_dumps(indent=2).encode() if obj else b'' logger.debug('JWS payload:\n%s', jobj) kwargs = { diff --git a/acme/acme/mixins.py b/acme/acme/mixins.py index 91e832e38..1f3b0f473 100644 --- a/acme/acme/mixins.py +++ b/acme/acme/mixins.py @@ -4,19 +4,19 @@ class VersionedLEACMEMixin(object): """This mixin allows to store the current ACME version as a property""" @property - def le_auto_version(self): + def le_acme_version(self): """Define the version of ACME protocol to use""" - return getattr(self, '_le_auto_version', 1) + return getattr(self, '_le_acme_version', 1) - @le_auto_version.setter - def le_auto_version(self, version): + @le_acme_version.setter + def le_acme_version(self, version): # We need to use object.__setattr__ to not depend on the specific implementation of # __setattr__ in current class (eg. jose.TypedJSONObjectWithFields raises AttributeError # for any attempt to set an attribute to make objects immutable). - object.__setattr__(self, '_le_auto_version', version) + object.__setattr__(self, '_le_acme_version', version) def __setattr__(self, key, value): - if key == 'le_auto_version': + if key == 'le_acme_version': # Required for @property to operate properly. See comment above. object.__setattr__(self, key, value) else: @@ -32,7 +32,7 @@ class ResourceMixin(VersionedLEACMEMixin): """See josepy.JSONDeserializable.to_partial_json()""" if hasattr(super(ResourceMixin, self), 'to_partial_json'): jobj = super(ResourceMixin, self).to_partial_json() # type: ignore - if self.le_auto_version == 2: + if self.le_acme_version == 2: jobj.pop('resource', None) return jobj @@ -48,7 +48,7 @@ class TypeMixin(VersionedLEACMEMixin): """See josepy.JSONDeserializable.to_partial_json()""" if hasattr(super(TypeMixin, self), 'to_partial_json'): jobj = super(TypeMixin, self).to_partial_json() # type: ignore - if self.le_auto_version == 2: + if self.le_acme_version == 2: jobj.pop('type', None) return jobj diff --git a/acme/tests/jws_test.py b/acme/tests/jws_test.py index 8ca130fa7..a447e5f21 100644 --- a/acme/tests/jws_test.py +++ b/acme/tests/jws_test.py @@ -70,7 +70,7 @@ class JWSPayloadRFC8555Compliant(unittest.TestCase): from acme.challenges import HTTP01Response challenge_body = HTTP01Response() - challenge_body.le_auto_version = 2 + challenge_body.le_acme_version = 2 jobj = challenge_body.json_dumps(indent=2).encode() # RFC8555 states that challenge requests must have an empty payload. @@ -85,7 +85,7 @@ class JWSPayloadRFC8555Compliant(unittest.TestCase): resource = fields.Resource(resource_type) resource_body = _MockResourceResponse() - resource_body.le_auto_version = 2 + resource_body.le_acme_version = 2 jobj = resource_body.json_dumps(indent=2).encode() # Having a resource field in JWS payloads for resources is not compliant with RFC8555.