mirror of
https://github.com/certbot/certbot.git
synced 2026-06-13 10:40:10 -04:00
Streamline and reorganize Certbot's CLI output.
This change is a substantial command-line UX overhaul,
based on previous user research. The main goal was to streamline
and clarify output. To see more verbose output, use the -v or -vv flags.
---
* nginx,apache: CLI logging changes
- Add "Successfully deployed ..." message using display_util
- Remove IReporter usage and replace with display_util
- Standardize "... could not find a VirtualHost ..." error
This changes also bumps the version of certbot required by certbot-nginx
and certbot-apache to take use of the new display_util function.
* fix certbot_compatibility_test
since the http plugins now require IDisplay, we need to inject it
* fix dependency version on certbot
* use better asserts
* try fix oldest deps
because certbot 1.10.0 depends on acme>=1.8.0, we need to use
acme==1.8.0 in the -oldest tests
* cli: redesign output of new certificate reporting
Changes the output of run, certonly and certonly --csr. No longer uses
IReporter.
* cli: redesign output of failed authz reporting
* fix problem sorting to be stable between py2 & 3
* add some catch-all error text
* cli: dont use IReporter for EFF donation prompt
* add per-authenticator hints
* pass achalls to auth_hint, write some tests
* exclude static auth hints from coverage
* dont call auth_hint unless derived from .Plugin
* dns fallback hint: dont assume --dns-blah works
--dns-blah won't work for third-party plugins, they need to be specified
using --authenticator dns-blah.
* add code comments about the auth_hint interface
* renew: don't restart the installer for dry-runs
Prevents Certbot from superfluously invoking the installer restart
during dry-run renewals. (This does not affect authenticator restarts).
Additionally removes some CLI output that was reporting the fullchain
path of the renewed certificate.
* update CHANGELOG.md
* cli: redesign output when cert installation failed
- Display a message when certificate installation begins.
- Don't use IReporter, just log errors immediately if restart/rollback
fails.
- Prompt the user with a command to retry the installation process once
they have fixed any underlying problems.
* vary by preconfigured_renewal
and move expiry date to be above the renewal advice
* update code comment
Co-authored-by: ohemorange <ebportnoy@gmail.com>
* update code comment
Co-authored-by: ohemorange <ebportnoy@gmail.com>
* fix lint
* derve cert name from cert_path, if possible
* fix type annotation
* text change in nginx hint
Co-authored-by: ohemorange <ebportnoy@gmail.com>
* print message when restarting server after renewal
* log: print "advice" when exiting with an error
When running in non-quiet mode.
* try fix -oldest lock_test.py
* fix docstring
* s/Restarting/Reloading/ when notifying the user
* fix test name
Co-authored-by: ohemorange <ebportnoy@gmail.com>
* type annotations
* s/using the {} plugin/installer: {}/
* copy: avoid "plugin" where possible
* link to user guide#automated-renewals
when not running with --preconfigured-renewal
* cli: reduce default logging verbosity
* fix lock_test: -vv is needed to see logger.debug
* Change comment in log.py to match the change to default verbosity
* Audit and adjust logging levels in apache module
* Audit and adjust logging levels in nginx module
* Audit, adjust logging levels, and improve logging calls in certbot module
* Fix tests to mock correct methods and classes
* typo in non-preconfigured-renewal message
Co-authored-by: ohemorange <ebportnoy@gmail.com>
* fix test
* revert acme version bump
* catch up to python3 changes
* Revert "revert acme version bump"
This reverts commit fa83d6a51c.
* Change ocsp check error to warning since it's non-fatal
* Update storage_test in parallel with last change
* get rid of leading newline on "Deploying [...]"
* shrink renewal and installation success messages
* print logfile rather than logdir in exit handler
* Decrease logging level to info for idempotent operation where enhancement is already set
* Display cert not yet due for renewal message when renewing and no other action will be taken, and change cert to certificate
* also write to logger so it goes in the log file
* Don't double write to log file; fix main test
* cli: remove trailing newline on new cert reporting
* ignore type error
* revert accidental changes to dependencies
* Pass tests in any timezone by using utcfromtimestamp
* Add changelog entry
* fix nits
* Improve wording of try again message
* minor wording change to changelog
* hooks: send hook stdout to CLI stdout
includes both --manual and --{pre,post,renew} hooks
* update docstrings and remove TODO
* add a pending deprecation on execute_command
* add test coverage for both
* update deprecation text
Co-authored-by: ohemorange <ebportnoy@gmail.com>
Co-authored-by: Alex Zorin <alex@zorin.id.au>
Co-authored-by: alexzorin <alex@zor.io>
178 lines
6.7 KiB
Python
178 lines
6.7 KiB
Python
"""Tests for certbot_dns_digitalocean._internal.dns_digitalocean."""
|
|
|
|
import unittest
|
|
|
|
import digitalocean
|
|
try:
|
|
import mock
|
|
except ImportError: # pragma: no cover
|
|
from unittest import mock # type: ignore
|
|
|
|
from certbot import errors
|
|
from certbot.compat import os
|
|
from certbot.plugins import dns_test_common
|
|
from certbot.plugins.dns_test_common import DOMAIN
|
|
from certbot.tests import util as test_util
|
|
|
|
API_ERROR = digitalocean.DataReadError()
|
|
TOKEN = 'a-token'
|
|
|
|
|
|
class AuthenticatorTest(test_util.TempDirTestCase, dns_test_common.BaseAuthenticatorTest):
|
|
|
|
def setUp(self):
|
|
from certbot_dns_digitalocean._internal.dns_digitalocean import Authenticator
|
|
|
|
super().setUp()
|
|
|
|
path = os.path.join(self.tempdir, 'file.ini')
|
|
dns_test_common.write({"digitalocean_token": TOKEN}, path)
|
|
|
|
self.config = mock.MagicMock(digitalocean_credentials=path,
|
|
digitalocean_propagation_seconds=0) # don't wait during tests
|
|
|
|
self.auth = Authenticator(self.config, "digitalocean")
|
|
|
|
self.mock_client = mock.MagicMock()
|
|
# _get_digitalocean_client | pylint: disable=protected-access
|
|
self.auth._get_digitalocean_client = mock.MagicMock(return_value=self.mock_client)
|
|
|
|
@test_util.patch_get_utility()
|
|
def test_perform(self, unused_mock_get_utility):
|
|
self.auth.perform([self.achall])
|
|
|
|
expected = [mock.call.add_txt_record(DOMAIN, '_acme-challenge.'+DOMAIN, mock.ANY, 30)]
|
|
self.assertEqual(expected, self.mock_client.mock_calls)
|
|
|
|
def test_cleanup(self):
|
|
# _attempt_cleanup | pylint: disable=protected-access
|
|
self.auth._attempt_cleanup = True
|
|
self.auth.cleanup([self.achall])
|
|
|
|
expected = [mock.call.del_txt_record(DOMAIN, '_acme-challenge.'+DOMAIN, mock.ANY)]
|
|
self.assertEqual(expected, self.mock_client.mock_calls)
|
|
|
|
|
|
class DigitalOceanClientTest(unittest.TestCase):
|
|
|
|
id_num = 1
|
|
record_prefix = "_acme-challenge"
|
|
record_name = record_prefix + "." + DOMAIN
|
|
record_content = "bar"
|
|
record_ttl = 60
|
|
|
|
def setUp(self):
|
|
from certbot_dns_digitalocean._internal.dns_digitalocean import _DigitalOceanClient
|
|
|
|
self.digitalocean_client = _DigitalOceanClient(TOKEN)
|
|
|
|
self.manager = mock.MagicMock()
|
|
self.digitalocean_client.manager = self.manager
|
|
|
|
def test_add_txt_record(self):
|
|
wrong_domain_mock = mock.MagicMock()
|
|
wrong_domain_mock.name = "other.invalid"
|
|
wrong_domain_mock.create_new_domain_record.side_effect = AssertionError('Wrong Domain')
|
|
|
|
domain_mock = mock.MagicMock()
|
|
domain_mock.name = DOMAIN
|
|
domain_mock.create_new_domain_record.return_value = {'domain_record': {'id': self.id_num}}
|
|
|
|
self.manager.get_all_domains.return_value = [wrong_domain_mock, domain_mock]
|
|
|
|
self.digitalocean_client.add_txt_record(DOMAIN, self.record_name, self.record_content,
|
|
self.record_ttl)
|
|
|
|
domain_mock.create_new_domain_record.assert_called_with(type='TXT',
|
|
name=self.record_prefix,
|
|
data=self.record_content,
|
|
ttl=self.record_ttl)
|
|
|
|
def test_add_txt_record_fail_to_find_domain(self):
|
|
self.manager.get_all_domains.return_value = []
|
|
|
|
self.assertRaises(errors.PluginError,
|
|
self.digitalocean_client.add_txt_record,
|
|
DOMAIN, self.record_name, self.record_content, self.record_ttl)
|
|
|
|
def test_add_txt_record_error_finding_domain(self):
|
|
self.manager.get_all_domains.side_effect = API_ERROR
|
|
|
|
self.assertRaises(errors.PluginError,
|
|
self.digitalocean_client.add_txt_record,
|
|
DOMAIN, self.record_name, self.record_content, self.record_ttl)
|
|
|
|
def test_add_txt_record_error_creating_record(self):
|
|
domain_mock = mock.MagicMock()
|
|
domain_mock.name = DOMAIN
|
|
domain_mock.create_new_domain_record.side_effect = API_ERROR
|
|
|
|
self.manager.get_all_domains.return_value = [domain_mock]
|
|
|
|
self.assertRaises(errors.PluginError,
|
|
self.digitalocean_client.add_txt_record,
|
|
DOMAIN, self.record_name, self.record_content, self.record_ttl)
|
|
|
|
def test_del_txt_record(self):
|
|
first_record_mock = mock.MagicMock()
|
|
first_record_mock.type = 'TXT'
|
|
first_record_mock.name = "DIFFERENT"
|
|
first_record_mock.data = self.record_content
|
|
|
|
correct_record_mock = mock.MagicMock()
|
|
correct_record_mock.type = 'TXT'
|
|
correct_record_mock.name = self.record_prefix
|
|
correct_record_mock.data = self.record_content
|
|
|
|
last_record_mock = mock.MagicMock()
|
|
last_record_mock.type = 'TXT'
|
|
last_record_mock.name = self.record_prefix
|
|
last_record_mock.data = "DIFFERENT"
|
|
|
|
domain_mock = mock.MagicMock()
|
|
domain_mock.name = DOMAIN
|
|
domain_mock.get_records.return_value = [first_record_mock,
|
|
correct_record_mock,
|
|
last_record_mock]
|
|
|
|
self.manager.get_all_domains.return_value = [domain_mock]
|
|
|
|
self.digitalocean_client.del_txt_record(DOMAIN, self.record_name, self.record_content)
|
|
|
|
self.assertTrue(correct_record_mock.destroy.called)
|
|
|
|
self.assertFalse(first_record_mock.destroy.call_args_list)
|
|
self.assertFalse(last_record_mock.destroy.call_args_list)
|
|
|
|
def test_del_txt_record_error_finding_domain(self):
|
|
self.manager.get_all_domains.side_effect = API_ERROR
|
|
|
|
self.digitalocean_client.del_txt_record(DOMAIN, self.record_name, self.record_content)
|
|
|
|
def test_del_txt_record_error_finding_record(self):
|
|
domain_mock = mock.MagicMock()
|
|
domain_mock.name = DOMAIN
|
|
domain_mock.get_records.side_effect = API_ERROR
|
|
|
|
self.manager.get_all_domains.return_value = [domain_mock]
|
|
|
|
self.digitalocean_client.del_txt_record(DOMAIN, self.record_name, self.record_content)
|
|
|
|
def test_del_txt_record_error_deleting_record(self):
|
|
record_mock = mock.MagicMock()
|
|
record_mock.type = 'TXT'
|
|
record_mock.name = self.record_prefix
|
|
record_mock.data = self.record_content
|
|
record_mock.destroy.side_effect = API_ERROR
|
|
|
|
domain_mock = mock.MagicMock()
|
|
domain_mock.name = DOMAIN
|
|
domain_mock.get_records.return_value = [record_mock]
|
|
|
|
self.manager.get_all_domains.return_value = [domain_mock]
|
|
|
|
self.digitalocean_client.del_txt_record(DOMAIN, self.record_name, self.record_content)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main() # pragma: no cover
|