Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move from BackwardsCompatibleClientV2 to ClientV2 #48

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move from BackwardsCompatibleClientV2 to ClientV2 #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions acmebot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,14 +1853,16 @@ class AcmeManager(object):
try:
network = client.ClientNetwork(self.client_key, account=registration, user_agent=self._user_agent(),
verify_ssl=self._setting('acme_directory_verify_ssl'))
self.acme_client = client.BackwardsCompatibleClientV2(network, self.client_key, self._setting('acme_directory_url'))
directory = messages.Directory.from_json(network.get(self._setting('acme_directory_url')).json())
self.acme_client = client.ClientV2(directory, net=network)
except Exception as error:
self._fatal("Can't connect to ACME service.\n", error, '\n')
else:
self._detail('Registering client\n')
try:
network = client.ClientNetwork(self.client_key, user_agent=self._user_agent(), verify_ssl=self._setting('acme_directory_verify_ssl'))
self.acme_client = client.BackwardsCompatibleClientV2(network, self.client_key, self._setting('acme_directory_url'))
directory = messages.Directory.from_json(network.get(self._setting('acme_directory_url')).json())
self.acme_client = client.ClientV2(directory, net=network)
except Exception as error:
self._fatal("Can't connect to ACME service.\n", error, '\n')

Expand All @@ -1873,10 +1875,13 @@ class AcmeManager(object):
self._detail('Terms of service accepted.\n')
else:
self._status('Auto-accepting TOS: ', tos, '\n')
return True

try:
reg = messages.NewRegistration.from_data(email=self._account('email'))
registration = self.acme_client.new_account_and_tos(reg, _accept_tos)
reg = messages.NewRegistration.from_data(email=self._account('email'),
terms_of_service_agreed=_accept_tos(self.acme_client.directory.meta.terms_of_service))
registration = self.acme_client.new_account(reg)

except Exception as error:
self._fatal("Can't register with ACME service.\n", error, '\n')

Expand Down Expand Up @@ -2178,17 +2183,7 @@ class AcmeManager(object):
order.update(authorizations=[authorization_resource for authorization_resource in authorization_resources.values()])

def _create_auth_order(self, domain_names):
if (1 == self.acme_client.acme_version):
authorizations = []
for domain_name in domain_names:
try:
authorizations.append(self.acme_client.client.request_domain_challenges(domain_name))
except Exception as error:
self._error('Unable to request authorization for ', domain_name, '\n', self._indent(error), '\n')
continue
if (authorizations):
return messages.OrderResource(authorizations=authorizations)
else:
if (2 == self.acme_client.acme_version):
identifiers = []

for domain_name in domain_names:
Expand All @@ -2197,15 +2192,15 @@ class AcmeManager(object):
if (identifiers):
order = messages.NewOrder(identifiers=identifiers)
try:
response = self.acme_client.client._post(self.acme_client.client.directory['newOrder'], order)
response = self.acme_client._post(self.acme_client.directory['newOrder'], order)
except Exception as error:
self._error('Unable to create authorization order\n', self._indent(error), '\n')
return None
body = messages.Order.from_json(response.json())
authorizations = []
for url in body.authorizations:
try:
authorizations.append(self.acme_client.client._authzr_from_response(self.acme_client.client._post_as_get(url), uri=url))
authorizations.append(self.acme_client._authzr_from_response(self.acme_client._post_as_get(url), uri=url))
except Exception as error:
self._error('Unable to request authorization for ', domain_name, '\n', self._indent(error), '\n')
continue
Expand Down