diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-16 16:14:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 16:14:15 +0100 |
| commit | 65df99de6bcaabdfb24e1a8fb0af9aacfdbc0b14 (patch) | |
| tree | b78bd82f1e539ec75d18b58df805ef89cb4971c0 /src/op_mode/pki.py | |
| parent | 71823db0fceee36f631484d3ff6767569e1ca825 (diff) | |
| parent | 2d02c347a848275b75ae8784575d64e4d5c27bea (diff) | |
| download | vyos-1x-65df99de6bcaabdfb24e1a8fb0af9aacfdbc0b14.tar.gz vyos-1x-65df99de6bcaabdfb24e1a8fb0af9aacfdbc0b14.zip | |
Merge pull request #2497 from vyos/mergify/bp/sagitta/pr-2495
T3983: show pki certificate Doesnt show x509 certificates (backport #2495)
Diffstat (limited to 'src/op_mode/pki.py')
| -rwxr-xr-x | src/op_mode/pki.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py index 35c7ce0e2..6c854afb5 100755 --- a/src/op_mode/pki.py +++ b/src/op_mode/pki.py @@ -896,11 +896,15 @@ def show_certificate(name=None, pem=False): cert_subject_cn = cert.subject.rfc4514_string().split(",")[0] cert_issuer_cn = cert.issuer.rfc4514_string().split(",")[0] cert_type = 'Unknown' - ext = cert.extensions.get_extension_for_class(x509.ExtendedKeyUsage) - if ext and ExtendedKeyUsageOID.SERVER_AUTH in ext.value: - cert_type = 'Server' - elif ext and ExtendedKeyUsageOID.CLIENT_AUTH in ext.value: - cert_type = 'Client' + + try: + ext = cert.extensions.get_extension_for_class(x509.ExtendedKeyUsage) + if ext and ExtendedKeyUsageOID.SERVER_AUTH in ext.value: + cert_type = 'Server' + elif ext and ExtendedKeyUsageOID.CLIENT_AUTH in ext.value: + cert_type = 'Client' + except: + pass revoked = 'Yes' if 'revoke' in cert_dict else 'No' have_private = 'Yes' if 'private' in cert_dict and 'key' in cert_dict['private'] else 'No' |