upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-04 14:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove empty lines from certbot certificates when (#8723)

Browse source 
.. envoked with `--cert-name` or `-d`.
This commit is contained in:
osirisinferi 2021-03-21 22:42:23 +01:00 committed by GitHub
parent 6bc8b3d2ba
commit ae2247163e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
certbot/CHANGELOG.md
View file

@ -17,7 +17,8 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
### Fixed
*
* Don't output an empty line for a hidden certificate when `certbot certificates` is being used
in combination with `--cert-name` or `-d`.
More details about these changes can be found on our GitHub repo.

8
certbot/certbot/_internal/cert_manager.py
View file

@ -266,9 +266,9 @@ def human_readable_cert_info(config, cert, skip_filter_checks=False):
checker = ocsp.RevocationChecker()
if config.certname and cert.lineagename != config.certname and not skip_filter_checks:
return ""
return None
if config.domains and not set(config.domains).issubset(cert.names()):
return ""
return None
now = pytz.UTC.fromutc(datetime.datetime.utcnow())
reasons = []
@ -358,7 +358,9 @@ def _report_human_readable(config, parsed_certs):
"""Format a results report for a parsed cert"""
certinfo = []
for cert in parsed_certs:
certinfo.append(human_readable_cert_info(config, cert))
cert_info = human_readable_cert_info(config, cert)
if cert_info is not None:
certinfo.append(cert_info)
return "\n".join(certinfo)