Rework plugins with classes

plugins/post_analysis/reverse_dns.py

@@ -1,30 +1,20 @@
-import socket
 from iwla import IWLA
+from iplugin import IPlugin
 
-PLUGIN_CLASS = 'HTTP'
-API_VERSION = 1
+class IWLAPostAnalysisReverseDNS(IPlugin):
+    def __init__(self, iwla):
+        super(IWLAPostAnalysisReverseDNS, self).__init__(iwla)
+        self.API_VERSION = 1
 
-def get_plugins_infos():
-    infos = {
-        'class' : PLUGIN_CLASS,
-        'min_version' : API_VERSION,
-        'max_version' : -1
-    }
-    return infos
-
-def load():
-    socket.setdefaulttimeout(0.5)
-    return True
-
-def hook(iwla):
-    hits = iwla.getValidVisitors()
-    for (k, hit) in hits.items():
-        if hit.get('dns_analysed', False): continue
-        try:
-            name, _, _ = socket.gethostbyaddr(k)
-            hit['remote_addr'] = name
-        except:
-            pass
-        finally:
-            hit['dns_analysed'] = True
+    def hook(self, iwla):
+        hits = iwla.getValidVisitors()
+        for (k, hit) in hits.items():
+            if hit.get('dns_analysed', False): continue
+            try:
+                name, _, _ = socket.gethostbyaddr(k)
+                hit['remote_addr'] = name
+            except:
+                pass
+            finally:
+                hit['dns_analysed'] = True
 

plugins/post_analysis/top_visitors.py

@@ -1,23 +1,15 @@
 from iwla import IWLA
+from iplugin import IPlugin
 
-PLUGIN_CLASS = 'HTTP'
-API_VERSION = 1
+class IWLAPostAnalysisTopVisitors(IPlugin):
+    def __init__(self, iwla):
+        super(IWLAPostAnalysisTopVisitors, self).__init__(iwla)
+        self.API_VERSION = 1
 
-def get_plugins_infos():
-    infos = {
-        'class' : PLUGIN_CLASS,
-        'min_version' : API_VERSION,
-        'max_version' : -1
-    }
-    return infos
-
-def load():
-    return True
-
-def hook(iwla):
-    hits = iwla.getValidVisitors()
-    stats = iwla.getMonthStats()
-    top_bandwidth = [(k,hits[k]['bandwidth']) for (k,v) in hits.items()]
-    top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True)
-    stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]]
+    def hook(self, iwla):
+        hits = iwla.getValidVisitors()
+        stats = iwla.getMonthStats()
+        top_bandwidth = [(k,hits[k]['bandwidth']) for (k,v) in hits.items()]
+        top_bandwidth = sorted(top_bandwidth, key=lambda t: t[1], reverse=True)
+        stats['top_visitors'] = [hits[h[0]] for h in top_bandwidth[:10]]