Fixes #286: Changed misp client certificate validation config check

TheHive-Project · Jun 11, 2018 · 08c59b6 · 08c59b6
1 parent 9880c86
commit 08c59b6
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/analyzers/MISP/mispclient.py b/analyzers/MISP/mispclient.py
@@ -49,24 +49,25 @@ def __init__(self, url, key, ssl=True, name='Unnamed', proxies=None):
                     elif isinstance(ssl[idx], bool):
                         verify = ssl[idx]
                     else:
-                        raise TypeError('SSL parameter is a not expected type.')
+                        raise TypeError('SSL parameter is a not expected type: {}'.format(type(ssl[idx])))
                 # Do the same checks again, for the non-list type
                 elif isinstance(ssl, str):
                     if os.path.isfile(ssl):
                         verify = ssl
                 elif isinstance(ssl, bool):
                     verify = ssl
                 else:
-                    raise TypeError('SSL parameter is a not expected type.')
+                    raise TypeError('SSL parameter is a not expected type: {}'.format(type(ssl)))
                 self.misp_connections.append(pymisp.PyMISP(url=server,
                                                            key=key[idx],
                                                            ssl=verify,
                                                            proxies=proxies))
         else:
             verify = True
-            if isinstance(ssl, str):
-                if os.path.isfile(ssl):
-                    verify = ssl
+            if isinstance(ssl, str) and os.path.isfile(ssl):
+                verify = ssl
+            elif isinstance(ssl, str):
+                raise CertificateNotFoundError('Certificate not found under {}.'.format(ssl))
             elif isinstance(ssl, bool):
                 verify = ssl
             self.misp_connections.append(pymisp.PyMISP(url=url,