Fix plugin imports on Linux pt4

nabla-c0d3 · Sep 21, 2014 · e018797 · e018797
1 parent 34b011b
commit e018797
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/plugins/PluginChromeSha1Deprecation.py b/plugins/PluginChromeSha1Deprecation.py
@@ -32,9 +32,8 @@
 from utils.SSLyzeSSLConnection import create_sslyze_connection
 from nassl.SslClient import ClientCertificateRequested
 
-# We have to import it this way or PluginCertInfo gets detected twice by SSLyze on Linux
-import plugins.PluginCertInfo
-from plugins.PluginCertInfo import MOZILLA_STORE_PATH
+
+from plugins.PluginCertInfo import MOZILLA_STORE_PATH, PluginCertInfo
 
 ROOT_CERTS = []
 

diff --git a/plugins/__init__.py b/plugins/__init__.py
@@ -57,6 +57,10 @@ def __init__(self):
             # Check every declaration in that module
             for name in dir(module):
                 obj = getattr(module, name)
+                if name not in module.__name__:
+                    # Plugins have to have the same class name as their module name
+                    # This prevents Plugin B from being detected twice when there is a Plugin A that imports Plugin B
+                    continue
 
                 if inspect.isclass(obj):
                     # A class declaration was found in that module