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

Whatever domains we picked should make it to the renewal conf

Browse Source
This commit is contained in:
Peter Eckersley
2016-01-28 15:54:28 -08:00
parent 63851bfa52
commit aac52e755a
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+8 -7
View File
@@ -112,11 +112,12 @@ def usage_strings(plugins):
return USAGE % (apache_doc, nginx_doc), SHORT_USAGE return USAGE % (apache_doc, nginx_doc), SHORT_USAGE
def _find_domains(args, installer): def _find_domains(config, installer):
if not args.domains: if not config.domains:
domains = display_ops.choose_names(installer) # set args.domains so that it's written to the renewal conf file
domains = config.domains = display_ops.choose_names(installer)
else: else:
domains = args.domains domains = config.domains
if not domains: if not domains:
raise errors.Error("Please specify --domains, or --installer that " raise errors.Error("Please specify --domains, or --installer that "
@@ -590,7 +591,7 @@ def run(args, config, plugins): # pylint: disable=too-many-branches,too-many-lo
except errors.PluginSelectionError, e: except errors.PluginSelectionError, e:
return e.message return e.message
domains = _find_domains(args, installer) domains = _find_domains(config, installer)
# TODO: Handle errors from _init_le_client? # TODO: Handle errors from _init_le_client?
le_client = _init_le_client(args, config, authenticator, installer) le_client = _init_le_client(args, config, authenticator, installer)
@@ -636,7 +637,7 @@ def obtain_cert(args, config, plugins):
certr, chain, args.cert_path, args.chain_path, args.fullchain_path) certr, chain, args.cert_path, args.chain_path, args.fullchain_path)
_report_new_cert(cert_path, cert_fullchain) _report_new_cert(cert_path, cert_fullchain)
else: else:
domains = _find_domains(args, installer) domains = _find_domains(config, installer)
_auth_from_domains(le_client, config, domains) _auth_from_domains(le_client, config, domains)
_suggest_donate() _suggest_donate()
@@ -654,7 +655,7 @@ def install(args, config, plugins):
except errors.PluginSelectionError, e: except errors.PluginSelectionError, e:
return e.message return e.message
domains = _find_domains(args, installer) domains = _find_domains(config, installer)
le_client = _init_le_client( le_client = _init_le_client(
args, config, authenticator=None, installer=installer) args, config, authenticator=None, installer=installer)
assert args.cert_path is not None # required=True in the subparser assert args.cert_path is not None # required=True in the subparser
letsencrypt/tests/cli_test.py
+11 -1
View File
@@ -400,9 +400,19 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods
webroot_map_args = ['--webroot-map', '{"eg.com" : "/tmp"}'] webroot_map_args = ['--webroot-map', '{"eg.com" : "/tmp"}']
namespace = cli.prepare_and_parse_args(plugins, webroot_map_args) namespace = cli.prepare_and_parse_args(plugins, webroot_map_args)
domains = cli._find_domains(namespace, mock.MagicMock()) domains = cli._find_domains(namespace, mock.MagicMock())
self.assertEqual(namespace.webroot_map, {u"eg.com": u"/tmp"}) expected_map = {u"eg.com": u"/tmp"}
self.assertEqual(namespace.webroot_map, expected_map)
self.assertEqual(domains, ["eg.com"]) self.assertEqual(domains, ["eg.com"])
# test merging webroot maps from the cli and a webroot map
webroot_map_args.extend(["-w", "/tmp2", "-d", "eg2.com,eg.com"])
namespace = cli.prepare_and_parse_args(plugins, webroot_map_args)
domains = cli._find_domains(namespace, mock.MagicMock())
# for eg.com, --webroot-map should take precedence over -w / -d
expected_map[u"eg2.com"] = u"/tmp2"
self.assertEqual(namespace.webroot_map, expected_map)
self.assertEqual(set(domains), set(["eg.com", "eg2.com"]))
@mock.patch('letsencrypt.cli._suggest_donate') @mock.patch('letsencrypt.cli._suggest_donate')
@mock.patch('letsencrypt.crypto_util.notAfter') @mock.patch('letsencrypt.crypto_util.notAfter')
@mock.patch('letsencrypt.cli.zope.component.getUtility') @mock.patch('letsencrypt.cli.zope.component.getUtility')