Attachment 590843 Details for Bug 830679 – Make rhui.common.cert_utils.entitlements_in_cert catching X509.X509Error, etc.

[patch] Make rhui.common.cert_utils.entitlements_in_cert catching X509.X509Error, etc.

0001-Make-entitlements_in_cert-catching-X509.X509Error-et.patch (text/plain), 1.02 KB, created by Satoru SATOH on 2012-06-11 08:17:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2012-06-11 08:17:26 UTC

Size: 1.02 KB

patch

obsolete

>From a739dda340e733e4eaf8c59651fa5aa3fb1f8851 Mon Sep 17 00:00:00 2001
>From: Satoru SATOH <ssato@redhat.com>
>Date: Mon, 11 Jun 2012 16:52:57 +0900
>Subject: [PATCH 1/3] Make entitlements_in_cert catching X509.X509Error, etc.
> during reading given X509 certificate
>
>---
> src/rhui/common/cert_utils.py |    9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/src/rhui/common/cert_utils.py b/src/rhui/common/cert_utils.py
>index 981adc0..f74ca9c 100644
>--- a/src/rhui/common/cert_utils.py
>+++ b/src/rhui/common/cert_utils.py
>@@ -47,7 +47,14 @@ def entitlements_in_cert(cert_filename):
>     '''
> 
>     cert = Certificate()
>-    cert.read(cert_filename)
>+
>+    try:
>+        cert.read(cert_filename)
>+    except Exception, e:
>+        # TBD: handle some specific exceptions such as X509.X509Error here.
>+        LOG.warning("Could not load entitlements data from " + cert_filename)
>+        return []
>+
>     extensions = cert.extensions()
> 
>     # Stores a mapping of product number to entitlement object since multiple
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 830679: 590843 | 590844 | 590845 | 590852