Make missing SSL key/cert files non-fatal, set test to UNKNOWN instead

marineam · Dec 12, 2011 · d3ef95f · d3ef95f
1 parent aef72cc
commit d3ef95f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/python/nagcat/query.py b/python/nagcat/query.py
@@ -88,6 +88,9 @@ def __init__(self, nagcat, conf):
         # extra pieces of metadata such as Request ID/URL.
         self.saved = {}
 
+        # Semi-fatal init errors, forces query to UNKNOWN
+        self.init_errors = []
+
         # All queries should handle timeouts
         try:
             interval = util.Interval(
@@ -102,7 +105,11 @@ def __init__(self, nagcat, conf):
 
     def _start_self(self):
         self.saved.clear()
-        return super(Query, self)._start_self()
+        if self.init_errors:
+            msg = '\n'.join(self.init_errors)
+            return defer.fail(errors.Failure(errors.TestUnknown(msg)))
+        else:
+            return super(Query, self)._start_self()
 
     @errors.callback
     def _failure_tcp(self, result):
@@ -171,10 +178,8 @@ def __init__(self, nagcat, conf):
             self.conf['ssl_%s_type'%opt] = key_type
 
         def maybe_read(key, private=False):
-            # Only support PEM for now
-            filetype = crypto.FILETYPE_PEM
-            path = self.conf[key]
             filetype = self.conf[key+'_type']
+            path = self.conf[key]
             if not path:
                 return None
 
@@ -187,8 +192,9 @@ def maybe_read(key, private=False):
                 finally:
                     fd.close()
             except IOError, ex:
-                raise errors.InitError("Failed to read %s file %s: %s" %
-                                       (path, key, ex.strerror))
+                self.init_errors.append("Failed to read %s file %s: %s" %
+                                        (key, path, ex.strerror))
+                return None
 
             log.trace("Loaded %s:\n%s", key, data)
 

diff --git a/python/nagcat/unittests/queries/test_tcp.py b/python/nagcat/unittests/queries/test_tcp.py
@@ -96,3 +96,20 @@ def testVerifyServerGood(self):
 
     def tearDown(self):
         return self.server.loseConnection()
+
+class MissingSSLTestCase(QueryTestCase):
+
+    def testMissingFiles(self):
+        config = {'type': "ssl",
+                  'host': "localhost",
+                  'port': 9,
+                  'ssl_cacert': "xyzfnothere"}
+
+        def check(result):
+            self.assertIsInstance(result, errors.Failure)
+            self.assertIsInstance(result.value, errors.TestUnknown)
+            self.assertIn("xyzfnothere", str(result.value))
+
+        d = self.startQuery(config)
+        d.addBoth(check)
+        return d