upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Generalize and move check inside handle_csr

Browse source
This commit is contained in:
Seth Schoen 2016-02-18 18:35:45 -08:00
parent 1de66b3d7d
commit 5eba011f8e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
letsencrypt/cli.py
View file

@ -649,11 +649,6 @@ def record_chosen_plugins(config, plugins, auth, inst):
# Possible difficulties: config.csr was hacked into auth
def run(config, plugins): # pylint: disable=too-many-branches,too-many-locals
"""Obtain a certificate and install."""
if config.csr is not None:
raise errors.Error("Currently, the default 'run' verb cannot be used "
"when specifying a CSR file. Please try the "
"certonly command instead.")
try:
installer, authenticator = choose_configurator_plugins(config, plugins, "run")
except errors.PluginSelectionError as e:
@ -988,10 +983,6 @@ def renew(config, unused_plugins):
"renew specific certificates, use the certonly "
"command. The renew verb may provide other options "
"for selecting certificates to renew in the future.")
if config.csr is not None:
raise errors.Error("Currently, the renew verb cannot be used when "
"specifying a CSR file. Please try the certonly "
"command instead.")
renewer_config = configuration.RenewerConfiguration(config)
renew_successes = []
renew_failures = []
@ -1249,6 +1240,12 @@ class HelpfulArgumentParser(object):
Process a --csr flag. This needs to happen early enough that the
webroot plugin can know about the calls to _process_domain
"""
if parsed_args.verb != "certonly":
raise errors.Error("Currently, a CSR file may only be specified "
"when obtaining a new or replacement "
"via the certonly command. Please try the "
"certonly command instead.")
try:
csr = le_util.CSR(file=parsed_args.csr[0], data=parsed_args.csr[1], form="der")
typ = OpenSSL.crypto.FILETYPE_ASN1

3
letsencrypt/tests/client_test.py
View file

@ -125,6 +125,9 @@ class ClientTest(unittest.TestCase):
from letsencrypt import cli
test_csr = le_util.CSR(form="der", file=None, data=CSR_SAN)
mock_parsed_args = mock.MagicMock()
# The CLI should believe that this is a certonly request, because
# a CSR would not be allowed with other kinds of requests!
mock_parsed_args.verb = "certonly"
with mock.patch("letsencrypt.client.le_util.CSR") as mock_CSR:
mock_CSR.return_value = test_csr
mock_parsed_args.domains = self.eg_domains[:]