From 1d45939cab3ccf5a4849e9cdde50c329a8042cd6 Mon Sep 17 00:00:00 2001 From: osirisinferi Date: Thu, 24 Mar 2022 23:42:47 +0100 Subject: Skip ToS agreement question if ToS value is None (#9245) * Skip ToS agreement question if ToS value is None * Add changelog entry * Typo in CHANGELOG Co-authored-by: ohemorange * Typo in CHANGELOG Co-authored-by: ohemorange Co-authored-by: ohemorange --- acme/acme/client.py | 3 ++- certbot/CHANGELOG.md | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index 2e86ce549..f5cfa30c6 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -906,7 +906,8 @@ class BackwardsCompatibleClientV2: return regr_res else: client_v2 = cast(ClientV2, self.client) - if "terms_of_service" in client_v2.directory.meta: + if ("terms_of_service" in client_v2.directory.meta and + client_v2.directory.meta.terms_of_service is not None): _assess_tos(client_v2.directory.meta.terms_of_service) regr = regr.update(terms_of_service_agreed=True) return client_v2.new_account(regr) diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index d90eaacd9..3dd1a9e26 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -17,6 +17,11 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). * Certbot for Windows has been upgraded to use Python 3.9.11, in response to https://www.openssl.org/news/secadv/20220315.txt. +* Previously, when Certbot was in the process of registering a new ACME account + and the ACME server did not present any Terms of Service, the user was asked to + agree with a non-existent Terms of Service ("None"). This bug is now fixed, so + that if an ACME server does not provide any Terms of Service to agree with, the + user is not asked to agree to a non-existent Terms of Service any longer. More details about these changes can be found on our GitHub repo. -- cgit v1.2.3