Attachment 590852 Details for Bug 830679 – Ensure valid certificates contain entitlements copied w/ '.pem' extension is added and not skipped during certs reload

[patch] Ensure valid certificates contain entitlements copied w/ '.pem' extension is added and not skipped during certs reload

0003-Ensure-valid-certificates-contain-entitlements-copie.patch (text/plain), 2.31 KB, created by Satoru SATOH on 2012-06-11 08:25:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2012-06-11 08:25:43 UTC

Size: 2.31 KB

patch

obsolete

>From a8d2a834e9011bb4f92e1f56bdeba28598f5a009 Mon Sep 17 00:00:00 2001
>From: Satoru SATOH <ssato@redhat.com>
>Date: Mon, 11 Jun 2012 16:57:38 +0900
>Subject: [PATCH 3/3] Ensure valid certificates contain entitlements copied w/
> '.pem' extension is added and not skipped during certs
> reload
>
>---
> src/rhui/tools/cert_manager.py |   39 +++++++++++++++++++++++++++++++++++++--
> 1 file changed, 37 insertions(+), 2 deletions(-)
>
>diff --git a/src/rhui/tools/cert_manager.py b/src/rhui/tools/cert_manager.py
>index 2516e1b..da59d1c 100644
>--- a/src/rhui/tools/cert_manager.py
>+++ b/src/rhui/tools/cert_manager.py
>@@ -18,6 +18,7 @@ concatenated into the same file) are managable through this API.
> import datetime
> import logging
> import os
>+import os.path
> import shutil
> 
> from rhui.common import cert_utils
>@@ -262,12 +263,16 @@ class CertificateManager:
>         # for use in the RHUI
>         entitlements = cert_utils.entitlements_in_cert(cert_filename)
> 
>+        if not entitlements:  # It indicates this certificate is not valid.
>+           return
>+
>         for e in entitlements:
>             if not _is_valid_download_url(e.download_url):
>                 raise InvalidEntitlement()
>-        
>+
>         # Copy the cert and its key to this instance's certificate dir
>-        shutil.copy(cert_filename, self.cert_dir)
>+        dest = os.path.join(self.cert_dir, os.path.basename(_normalize_ext(cert_filename)))
>+        shutil.copy(cert_filename, dest)
> 
>         # Do a full reload to normalize entitlements and the proper certificate
>         # that should provide them
>@@ -292,3 +297,33 @@ def _is_valid_download_url(download_url):
>             return True
> 
>     return False
>+
>+
>+def _normalize_ext(path, ext=CERT_EXTENSION):
>+    """
>+    Returns path w/ its extension was replaced to $ext.
>+
>+    @param path: filename path
>+    @type  path: str
>+
>+    @param ext: file extension such like ".pem"
>+    @type  ext: str
>+
>+    @return: Modified path
>+    @rtype:  str
>+
>+    >>> _normalize_ext("/a/b/c.crt")
>+    '/a/b/c.pem'
>+    >>> _normalize_ext("/a/b/c.crt", ".cert")
>+    '/a/b/c.cert'
>+    >>> _normalize_ext("/a/b/c.pem", ".pem")
>+    '/a/b/c.pem'
>+    >>> _normalize_ext("/a/b/c/d")
>+    '/a/b/c/d.pem'
>+    """
>+    if path.endswith(ext):
>+        return path
>+
>+    (path0, _oext) = os.path.splitext(path)
>+    return path0 + ext
>+
>-- 
>1.7.10.2
>

Actions: View | Diff

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