upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add tos fields and pass through to v1 for partial updates

Browse source
This commit is contained in:
Erica Portnoy 2018-02-13 17:28:41 -08:00
parent 3d662e99ad
commit 9646d37a85
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
acme/acme/client.py
View file

@ -562,7 +562,7 @@ class BackwardsCompatibleClientV2(object):
def __init__(self, net, key, server):
self.directory = messages.Directory.from_json(net.get(server).json())
self.acme_version = self._acme_version_from_directory(directory)
self.acme_version = self._acme_version_from_directory(self.directory)
if self.acme_version == 1:
self.client = Client(directory, key=key, net=net)
else:
@ -571,6 +571,9 @@ class BackwardsCompatibleClientV2(object):
def __getattr__(self, name):
if name in dir(ClientBase):
return getattr(self.client, name)
# temporary, for breaking changes into smaller pieces
elif name in dir(Client):
return getattr(self.client, name)
else:
raise AttributeError

3
acme/acme/messages.py
View file

@ -172,6 +172,7 @@ class Directory(jose.JSONDeSerializable):
class Meta(jose.JSONObjectWithFields):
"""Directory Meta."""
terms_of_service = jose.Field('terms-of-service', omitempty=True)
terms_of_service_v2 = jose.Field('termsOfService', omitempty=True)
website = jose.Field('website', omitempty=True)
caa_identities = jose.Field('caa-identities', omitempty=True)
@ -251,7 +252,7 @@ class Registration(ResourceBody):
contact = jose.Field('contact', omitempty=True, default=())
agreement = jose.Field('agreement', omitempty=True)
status = jose.Field('status', omitempty=True)
terms_of_service_agreed = jose.Field('terms-of-service-agreed', omitempty=True)
terms_of_service_agreed = jose.Field('termsOfServiceAgreed', omitempty=True)
phone_prefix = 'tel:'
email_prefix = 'mailto:'