Merge pull request #822 from jettero/4.0-pr815-fixes

Minor fixes relating to PR815

Author: jettero

hubblestack/utils/signing.py

@@ -185,7 +185,9 @@ def read_certs(*fnames):
     """
     for fname in fnames:
         if fname.strip().startswith('--') and '\x0a' in fname:
-            for i in split_certs(cStringIO.StringIO(fname)):
+            siofh = cStringIO.StringIO(fname)
+            siofh.name = '<a string>'
+            for i in split_certs(siofh):
                 yield i
         elif os.path.isfile(fname):
             try:
@@ -201,9 +203,10 @@ def read_certs(*fnames):
 
 def stringify_cert_files(cert):
     """this function returns a string version of cert(s) for returner"""
-    if type(cert) is list and len(cert) >= 1:
+    if isinstance(cert, (tuple,list)) and cert:
         return ', '.join([str(c) for c in cert])
-    elif type(cert) is file:
+    elif hasattr(cert, 'name'):
+        # probably a file handle
         return cert.name
     return str(cert)
 
@@ -343,6 +346,7 @@ def __init__(self, public_crt, ca_crt):
                         log_level = log.critical
                     elif status == STATUS.UNKNOWN:
                         log_level = log.error
+                str_public = stringify_cert_files(public_crt)
                 log_level('public cert | file: "%s" | status: %s | digest: "%s" | X509 error code: %s | depth: %s | message: "%s"',
                         str_public, status, digest, code, depth, message)