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

Use actual CSR path

Browse Source
This commit is contained in:
Brad Warren
2015-10-17 16:30:54 -07:00
parent 975ffc5103
commit e2e7acf4c4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+2 -2
View File
@@ -377,9 +377,9 @@ def auth(args, config, plugins):
if args.csr is not None: if args.csr is not None:
certr, chain = le_client.obtain_certificate_from_csr(le_util.CSR( certr, chain = le_client.obtain_certificate_from_csr(le_util.CSR(
file=args.csr[0], data=args.csr[1], form="der")) file=args.csr[0], data=args.csr[1], form="der"))
le_client.save_certificate( cert_path, _ = le_client.save_certificate(
certr, chain, args.cert_path, args.chain_path) certr, chain, args.cert_path, args.chain_path)
_report_new_cert(args.cert_path) _report_new_cert(cert_path)
else: else:
domains = _find_domains(args, installer) domains = _find_domains(args, installer)
_auth_from_domains(le_client, config, domains, plugins) _auth_from_domains(le_client, config, domains, plugins)
letsencrypt/tests/cli_test.py
+1
View File
@@ -187,6 +187,7 @@ class CLITest(unittest.TestCase):
mock_client = mock.MagicMock() mock_client = mock.MagicMock()
mock_client.obtain_certificate_from_csr.return_value = ('certr', mock_client.obtain_certificate_from_csr.return_value = ('certr',
'chain') 'chain')
mock_client.save_certificate.return_value = cert_path, None
mock_init.return_value = mock_client mock_init.return_value = mock_client
installer = 'installer' installer = 'installer'