starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove check for 'fake' in issuer name when renewing certs (#8685)

Browse Source 
Fixes #8680.

We seem to have no existing testing code anywhere in this vicinity, so figured I'd get this up quickly then work on that. Manual tests (renew staging certificate, should allow it; renew non-staging cert as staging, should error) passed.

* Remove check for 'fake' in issuer name when renewing certs

* Change fake issuer name to make sure we're not relying on it anywhere
This commit is contained in:
ohemorange
2021-02-24 14:51:57 -08:00
committed by GitHub
parent c3d6fca3eb
commit ae3ed200c0
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/certbot/_internal/renewal.py
+1 -4
View File
@@ -312,12 +312,9 @@ def _avoid_invalidating_lineage(config, lineage, original_server):
contents = the_file.read() contents = the_file.read()
latest_cert = OpenSSL.crypto.load_certificate( latest_cert = OpenSSL.crypto.load_certificate(
OpenSSL.crypto.FILETYPE_PEM, contents) OpenSSL.crypto.FILETYPE_PEM, contents)
# all our test certificates are from happy hacker fake CA, though maybe one day
# we should test more methodically
now_valid = "fake" not in repr(latest_cert.get_issuer()).lower()
if util.is_staging(config.server): if util.is_staging(config.server):
if not util.is_staging(original_server) or now_valid: if not util.is_staging(original_server):
if not config.break_my_certs: if not config.break_my_certs:
names = ", ".join(lineage.names()) names = ", ".join(lineage.names())
raise errors.Error( raise errors.Error(
certbot/tests/main_test.py
+1 -1
View File
@@ -1053,7 +1053,7 @@ class MainTest(test_util.ConfigTestCase):
mock_get_utility().notification.side_effect = write_msg mock_get_utility().notification.side_effect = write_msg
with mock.patch('certbot._internal.main.renewal.OpenSSL') as mock_ssl: with mock.patch('certbot._internal.main.renewal.OpenSSL') as mock_ssl:
mock_latest = mock.MagicMock() mock_latest = mock.MagicMock()
mock_latest.get_issuer.return_value = "Fake fake" mock_latest.get_issuer.return_value = "Artificial pretend"
mock_ssl.crypto.load_certificate.return_value = mock_latest mock_ssl.crypto.load_certificate.return_value = mock_latest
with mock.patch('certbot._internal.main.renewal.crypto_util') \ with mock.patch('certbot._internal.main.renewal.crypto_util') \
as mock_crypto_util: as mock_crypto_util: