SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.
Python attacksurfacecticybersecurityfootprintinghackinginformation-gatheringinformation-securityinfosecintelligence-gatheringosintosint-frameworkosint-reconnaissanceosint-toolpentestingpythonreconsecurity-toolsthreat-intelligencethreatintel
isort
Brendan Coles3bb8017710a9
diff --git a/modules/sfp__stor_stdout.py b/modules/sfp__stor_stdout.pyindex 4f93d487..7d2029f0 100644--- a/modules/sfp__stor_stdout.py+++ b/modules/sfp__stor_stdout.py@@ -10,9 +10,10 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPluginimport json+from sflib import SpiderFootPlugin+class sfp__stor_stdout(SpiderFootPlugin):diff --git a/modules/sfp_abusech.py b/modules/sfp_abusech.pyindex fee0fe03..be0376d1 100644--- a/modules/sfp_abusech.py+++ b/modules/sfp_abusech.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'abuse.ch Feodo Tracker (IP)': {diff --git a/modules/sfp_abuseipdb.py b/modules/sfp_abuseipdb.pyindex 8b36c22f..c1d33b7e 100644--- a/modules/sfp_abuseipdb.py+++ b/modules/sfp_abuseipdb.py@@ -11,8 +11,10 @@# -------------------------------------------------------------------------------import re+from netaddr import IPAddress, IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'AbuseIPDB': {diff --git a/modules/sfp_accounts.py b/modules/sfp_accounts.pyindex f59903a5..7e3bbd70 100644--- a/modules/sfp_accounts.py+++ b/modules/sfp_accounts.py@@ -11,12 +11,15 @@# Licence: GPL# --------------------------------------------------------------------------------import time-import threading-from queue import Queue, Empty as QueueEmptyimport jsonimport random-from sflib import SpiderFootPlugin, SpiderFootEvent+import threading+import time+from queue import Empty as QueueEmpty+from queue import Queue++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_accounts(SpiderFootPlugin):diff --git a/modules/sfp_adblock.py b/modules/sfp_adblock.pyindex eab7a2aa..889a99f2 100644--- a/modules/sfp_adblock.py+++ b/modules/sfp_adblock.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import adblockparser-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_adblock(SpiderFootPlugin):diff --git a/modules/sfp_ahmia.py b/modules/sfp_ahmia.pyindex aea95049..9cd1d6dc 100644--- a/modules/sfp_ahmia.py+++ b/modules/sfp_ahmia.py@@ -11,9 +11,10 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEventimport re+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_ahmia(SpiderFootPlugin):diff --git a/modules/sfp_alienvault.py b/modules/sfp_alienvault.pyindex 5c3ccb27..06f536b1 100644--- a/modules/sfp_alienvault.py+++ b/modules/sfp_alienvault.py@@ -11,10 +11,13 @@# -------------------------------------------------------------------------------import json-from datetime import datetimeimport time+from datetime import datetime+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_alienvault(SpiderFootPlugin):diff --git a/modules/sfp_alienvaultiprep.py b/modules/sfp_alienvaultiprep.pyindex a6195d70..e090a8bb 100644--- a/modules/sfp_alienvaultiprep.py+++ b/modules/sfp_alienvaultiprep.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'AlienVault IP Reputation Database': {diff --git a/modules/sfp_api_recon_dev.py b/modules/sfp_api_recon_dev.pyindex f80f3ffd..5bd6866f 100644--- a/modules/sfp_api_recon_dev.py+++ b/modules/sfp_api_recon_dev.py@@ -13,7 +13,9 @@import jsonimport timeimport urllib-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_api_recon_dev(SpiderFootPlugin):diff --git a/modules/sfp_apility.py b/modules/sfp_apility.pyindex 8dd7b87a..8652484f 100644--- a/modules/sfp_apility.py+++ b/modules/sfp_apility.py@@ -13,7 +13,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_apility(SpiderFootPlugin):diff --git a/modules/sfp_archiveorg.py b/modules/sfp_archiveorg.pyindex f7c6ce89..24679b75 100644--- a/modules/sfp_archiveorg.py+++ b/modules/sfp_archiveorg.py@@ -13,7 +13,8 @@import datetimeimport json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_archiveorg(SpiderFootPlugin):diff --git a/modules/sfp_arin.py b/modules/sfp_arin.pyindex 7addd1e0..d3f8bd17 100644--- a/modules/sfp_arin.py+++ b/modules/sfp_arin.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_arin(SpiderFootPlugin):diff --git a/modules/sfp_azureblobstorage.py b/modules/sfp_azureblobstorage.pyindex d552b7f1..0486026f 100644--- a/modules/sfp_azureblobstorage.py+++ b/modules/sfp_azureblobstorage.py@@ -13,7 +13,9 @@import threadingimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_azureblobstorage(SpiderFootPlugin):diff --git a/modules/sfp_badipscom.py b/modules/sfp_badipscom.pyindex 82f4b566..38a5f8fb 100644--- a/modules/sfp_badipscom.py+++ b/modules/sfp_badipscom.py@@ -10,7 +10,8 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_badipscom(SpiderFootPlugin):diff --git a/modules/sfp_badpackets.py b/modules/sfp_badpackets.pyindex a6fcfe9a..18ca20f6 100644--- a/modules/sfp_badpackets.py+++ b/modules/sfp_badpackets.py@@ -11,10 +11,15 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent-from netaddr import IPNetwork-import urllib.request, urllib.parse, urllib.errorimport json+import urllib.error+import urllib.parse+import urllib.request++from netaddr import IPNetwork++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_badpackets(SpiderFootPlugin):diff --git a/modules/sfp_bambenek.py b/modules/sfp_bambenek.pyindex 6befe520..dd15e41c 100644--- a/modules/sfp_bambenek.py+++ b/modules/sfp_bambenek.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'Bambenek C&C IP List': {diff --git a/modules/sfp_base64.py b/modules/sfp_base64.pyindex 3700aefa..9ea8ab5b 100644--- a/modules/sfp_base64.py+++ b/modules/sfp_base64.py@@ -12,7 +12,7 @@import base64import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_base64(SpiderFootPlugin):diff --git a/modules/sfp_bgpview.py b/modules/sfp_bgpview.pyindex f85bdf3a..4e65d6a0 100644--- a/modules/sfp_bgpview.py+++ b/modules/sfp_bgpview.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_bgpview(SpiderFootPlugin):diff --git a/modules/sfp_binaryedge.py b/modules/sfp_binaryedge.pyindex 7267c235..387aa366 100644--- a/modules/sfp_binaryedge.py+++ b/modules/sfp_binaryedge.py@@ -12,8 +12,11 @@import jsonimport time+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_binaryedge(SpiderFootPlugin):diff --git a/modules/sfp_bingsearch.py b/modules/sfp_bingsearch.pyindex 9051cfcc..ed523b11 100644--- a/modules/sfp_bingsearch.py+++ b/modules/sfp_bingsearch.py@@ -9,7 +9,7 @@# Copyright: (c) Steve Micallef 2013# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_bingsearch(SpiderFootPlugin):diff --git a/modules/sfp_bingsharedip.py b/modules/sfp_bingsharedip.pyindex 6eb44faf..0e3b52bd 100644--- a/modules/sfp_bingsharedip.py+++ b/modules/sfp_bingsharedip.py@@ -11,7 +11,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_bingsharedip(SpiderFootPlugin):diff --git a/modules/sfp_binstring.py b/modules/sfp_binstring.pyindex 2ce89a58..478bebff 100644--- a/modules/sfp_binstring.py+++ b/modules/sfp_binstring.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------import string-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_binstring(SpiderFootPlugin):diff --git a/modules/sfp_bitcoin.py b/modules/sfp_bitcoin.pyindex d1372875..ea6d3c0a 100644--- a/modules/sfp_bitcoin.py+++ b/modules/sfp_bitcoin.py@@ -11,10 +11,12 @@# Licence: GPL# --------------------------------------------------------------------------------import reimport codecs+import refrom hashlib import sha256-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_bitcoin(SpiderFootPlugin):diff --git a/modules/sfp_blockchain.py b/modules/sfp_blockchain.pyindex 334f427a..e961e3f8 100644--- a/modules/sfp_blockchain.py+++ b/modules/sfp_blockchain.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_blockchain(SpiderFootPlugin):diff --git a/modules/sfp_blocklistde.py b/modules/sfp_blocklistde.pyindex fb566458..ac7fa638 100644--- a/modules/sfp_blocklistde.py+++ b/modules/sfp_blocklistde.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'blocklist.de List': {diff --git a/modules/sfp_botscout.py b/modules/sfp_botscout.pyindex 229bff94..8c629f4e 100644--- a/modules/sfp_botscout.py+++ b/modules/sfp_botscout.py@@ -11,7 +11,7 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_botscout(SpiderFootPlugin):diff --git a/modules/sfp_botvrij.py b/modules/sfp_botvrij.pyindex 7c25d616..5e7569d0 100644--- a/modules/sfp_botvrij.py+++ b/modules/sfp_botvrij.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'botvrij.eu Domain Blocklist': {diff --git a/modules/sfp_builtwith.py b/modules/sfp_builtwith.pyindex cb4956bc..f388dc3b 100644--- a/modules/sfp_builtwith.py+++ b/modules/sfp_builtwith.py@@ -12,7 +12,8 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_builtwith(SpiderFootPlugin):diff --git a/modules/sfp_callername.py b/modules/sfp_callername.pyindex a13a8fe6..dc2a05d0 100644--- a/modules/sfp_callername.py+++ b/modules/sfp_callername.py@@ -11,9 +11,10 @@#-------------------------------------------------------------------------------import re-import time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_callername(SpiderFootPlugin):diff --git a/modules/sfp_censys.py b/modules/sfp_censys.pyindex 2559ab5b..bc5b2fed 100644--- a/modules/sfp_censys.py+++ b/modules/sfp_censys.py@@ -10,12 +10,15 @@# Licence: GPL# --------------------------------------------------------------------------------import jsonimport base64-from datetime import datetime+import jsonimport time+from datetime import datetime+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_censys(SpiderFootPlugin):diff --git a/modules/sfp_cinsscore.py b/modules/sfp_cinsscore.pyindex 5723e072..17834ae4 100644--- a/modules/sfp_cinsscore.py+++ b/modules/sfp_cinsscore.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------from netaddr import IPAddress, IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_cinsscore(SpiderFootPlugin):diff --git a/modules/sfp_circllu.py b/modules/sfp_circllu.pyindex af85f8fb..ff328b43 100644--- a/modules/sfp_circllu.py+++ b/modules/sfp_circllu.py@@ -10,12 +10,13 @@# Licence: GPL# --------------------------------------------------------------------------------import jsonimport base64+import jsonimport re-import time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_circllu(SpiderFootPlugin):diff --git a/modules/sfp_citadel.py b/modules/sfp_citadel.pyindex 3ca0ebae..d99fd401 100644--- a/modules/sfp_citadel.py+++ b/modules/sfp_citadel.py@@ -11,8 +11,12 @@# -------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_citadel(SpiderFootPlugin):diff --git a/modules/sfp_cleanbrowsing.py b/modules/sfp_cleanbrowsing.pyindex ff6c0071..96693d49 100644--- a/modules/sfp_cleanbrowsing.py+++ b/modules/sfp_cleanbrowsing.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_cleanbrowsing(SpiderFootPlugin):diff --git a/modules/sfp_cleantalk.py b/modules/sfp_cleantalk.pyindex 47f26904..54d98137 100644--- a/modules/sfp_cleantalk.py+++ b/modules/sfp_cleantalk.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------from netaddr import IPAddress, IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_cleantalk(SpiderFootPlugin):diff --git a/modules/sfp_clearbit.py b/modules/sfp_clearbit.pyindex c25efcad..0476cbda 100644--- a/modules/sfp_clearbit.py+++ b/modules/sfp_clearbit.py@@ -9,9 +9,11 @@# Licence: GPL#--------------------------------------------------------------------------------import jsonimport base64-from sflib import SpiderFootPlugin, SpiderFootEvent+import json++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_clearbit(SpiderFootPlugin):diff --git a/modules/sfp_cloudflaredns.py b/modules/sfp_cloudflaredns.pyindex 9dcf13e6..ace1cee0 100644--- a/modules/sfp_cloudflaredns.py+++ b/modules/sfp_cloudflaredns.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_cloudflaredns(SpiderFootPlugin):diff --git a/modules/sfp_coinblocker.py b/modules/sfp_coinblocker.pyindex e75a1e6e..a474ebda 100644--- a/modules/sfp_coinblocker.py+++ b/modules/sfp_coinblocker.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'CoinBlocker IP List': {diff --git a/modules/sfp_commoncrawl.py b/modules/sfp_commoncrawl.pyindex 2705b467..e371e50c 100644--- a/modules/sfp_commoncrawl.py+++ b/modules/sfp_commoncrawl.py@@ -11,10 +11,10 @@# Licence: GPL# -------------------------------------------------------------------------------+import jsonimport re-import json-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_commoncrawl(SpiderFootPlugin):diff --git a/modules/sfp_comodo.py b/modules/sfp_comodo.pyindex 3eee978d..bbe55cbe 100644--- a/modules/sfp_comodo.py+++ b/modules/sfp_comodo.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_comodo(SpiderFootPlugin):diff --git a/modules/sfp_company.py b/modules/sfp_company.pyindex a9fded71..8c91feed 100644--- a/modules/sfp_company.py+++ b/modules/sfp_company.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import re-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_company(SpiderFootPlugin):diff --git a/modules/sfp_cookie.py b/modules/sfp_cookie.pyindex 88eda050..d0bd4424 100644--- a/modules/sfp_cookie.py+++ b/modules/sfp_cookie.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_cookie(SpiderFootPlugin):diff --git a/modules/sfp_countryname.py b/modules/sfp_countryname.pyindex efbb1742..44a7990d 100644--- a/modules/sfp_countryname.py+++ b/modules/sfp_countryname.py@@ -12,10 +12,13 @@# -------------------------------------------------------------------------------import re-from sflib import SpiderFootPlugin, SpiderFootEvent+import phonenumbersfrom phonenumbers.phonenumberutil import region_code_for_country_code+from sflib import SpiderFootEvent, SpiderFootPlugin++class sfp_countryname(SpiderFootPlugin):meta = {diff --git a/modules/sfp_creditcard.py b/modules/sfp_creditcard.pyindex 3c41222d..280869d5 100644--- a/modules/sfp_creditcard.py+++ b/modules/sfp_creditcard.py@@ -11,7 +11,8 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_creditcard(SpiderFootPlugin):diff --git a/modules/sfp_crobat_api.py b/modules/sfp_crobat_api.pyindex 9163751b..b51a7239 100644--- a/modules/sfp_crobat_api.py+++ b/modules/sfp_crobat_api.py@@ -15,7 +15,9 @@import jsonimport timeimport urllib-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_crobat_api(SpiderFootPlugin):diff --git a/modules/sfp_crossref.py b/modules/sfp_crossref.pyindex 3a1f48fd..190afcda 100644--- a/modules/sfp_crossref.py+++ b/modules/sfp_crossref.py@@ -15,7 +15,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_crossref(SpiderFootPlugin):diff --git a/modules/sfp_crt.py b/modules/sfp_crt.pyindex 766a1eda..d38e34d5 100644--- a/modules/sfp_crt.py+++ b/modules/sfp_crt.py@@ -13,7 +13,8 @@import jsonimport urllib.parse-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_crt(SpiderFootPlugin):diff --git a/modules/sfp_customfeed.py b/modules/sfp_customfeed.pyindex b9d90bfa..9d1fd64f 100644--- a/modules/sfp_customfeed.py+++ b/modules/sfp_customfeed.py@@ -11,10 +11,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'Custom Threat Data': {diff --git a/modules/sfp_cybercrimetracker.py b/modules/sfp_cybercrimetracker.pyindex 06e8fb8d..90c1966c 100644--- a/modules/sfp_cybercrimetracker.py+++ b/modules/sfp_cybercrimetracker.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'cybercrime-tracker.net Malicious Submissions': {diff --git a/modules/sfp_darksearch.py b/modules/sfp_darksearch.pyindex 39993e52..b6de07e9 100644--- a/modules/sfp_darksearch.py+++ b/modules/sfp_darksearch.py@@ -13,8 +13,12 @@import jsonimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_darksearch(SpiderFootPlugin):diff --git a/modules/sfp_digitaloceanspace.py b/modules/sfp_digitaloceanspace.pyindex 602c9bdd..430d08f0 100644--- a/modules/sfp_digitaloceanspace.py+++ b/modules/sfp_digitaloceanspace.py@@ -13,7 +13,9 @@import threadingimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_digitaloceanspace(SpiderFootPlugin):diff --git a/modules/sfp_dnsbrute.py b/modules/sfp_dnsbrute.pyindex cf0e3ad4..d7318d67 100644--- a/modules/sfp_dnsbrute.py+++ b/modules/sfp_dnsbrute.py@@ -14,7 +14,9 @@import randomimport threadingimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_dnsbrute(SpiderFootPlugin):diff --git a/modules/sfp_dnscommonsrv.py b/modules/sfp_dnscommonsrv.pyindex 62b212b9..67d9607c 100644--- a/modules/sfp_dnscommonsrv.py+++ b/modules/sfp_dnscommonsrv.py@@ -12,7 +12,9 @@# -----------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_dnscommonsrv(SpiderFootPlugin):diff --git a/modules/sfp_dnsgrep.py b/modules/sfp_dnsgrep.pyindex af0af23e..5085a534 100644--- a/modules/sfp_dnsgrep.py+++ b/modules/sfp_dnsgrep.py@@ -15,8 +15,12 @@# -------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_dnsgrep(SpiderFootPlugin):diff --git a/modules/sfp_dnsneighbor.py b/modules/sfp_dnsneighbor.pyindex 202528f6..b34a4fba 100644--- a/modules/sfp_dnsneighbor.py+++ b/modules/sfp_dnsneighbor.py@@ -12,7 +12,9 @@# -------------------------------------------------------------------------------from netaddr import IPAddress-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_dnsneighbor(SpiderFootPlugin):diff --git a/modules/sfp_dnsraw.py b/modules/sfp_dnsraw.pyindex 413746d6..e81105c1 100644--- a/modules/sfp_dnsraw.py+++ b/modules/sfp_dnsraw.py@@ -13,10 +13,12 @@import re-import dns.resolverimport dns.queryimport dns.rdatatype-from sflib import SpiderFootPlugin, SpiderFootEvent+import dns.resolver++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_dnsraw(SpiderFootPlugin):diff --git a/modules/sfp_dnsresolve.py b/modules/sfp_dnsresolve.pyindex 01ee8fa4..23a610ac 100644--- a/modules/sfp_dnsresolve.py+++ b/modules/sfp_dnsresolve.py@@ -13,8 +13,10 @@import reimport urllib+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_dnsresolve(SpiderFootPlugin):diff --git a/modules/sfp_dnszonexfer.py b/modules/sfp_dnszonexfer.pyindex 59c98721..dd0a1e49 100644--- a/modules/sfp_dnszonexfer.py+++ b/modules/sfp_dnszonexfer.py@@ -14,7 +14,9 @@ import reimport dns.queryimport dns.zone-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_dnszonexfer(SpiderFootPlugin):diff --git a/modules/sfp_dronebl.py b/modules/sfp_dronebl.pyindex 3f47f340..83219ceb 100644--- a/modules/sfp_dronebl.py+++ b/modules/sfp_dronebl.py@@ -13,7 +13,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_dronebl(SpiderFootPlugin):diff --git a/modules/sfp_duckduckgo.py b/modules/sfp_duckduckgo.pyindex 0095d965..bddd7cfa 100644--- a/modules/sfp_duckduckgo.py+++ b/modules/sfp_duckduckgo.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_duckduckgo(SpiderFootPlugin):diff --git a/modules/sfp_email.py b/modules/sfp_email.pyindex 926d0dd6..8a28abc2 100644--- a/modules/sfp_email.py+++ b/modules/sfp_email.py@@ -11,7 +11,8 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_email(SpiderFootPlugin):diff --git a/modules/sfp_emailcrawlr.py b/modules/sfp_emailcrawlr.pyindex addb165c..69a2e2cf 100644--- a/modules/sfp_emailcrawlr.py+++ b/modules/sfp_emailcrawlr.py@@ -13,8 +13,12 @@import jsonimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_emailcrawlr(SpiderFootPlugin):diff --git a/modules/sfp_emailformat.py b/modules/sfp_emailformat.pyindex 52d86b1c..bd3b3299 100644--- a/modules/sfp_emailformat.py+++ b/modules/sfp_emailformat.py@@ -13,7 +13,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_emailformat(SpiderFootPlugin):diff --git a/modules/sfp_emailrep.py b/modules/sfp_emailrep.pyindex efbc2ca9..5c4c267c 100644--- a/modules/sfp_emailrep.py+++ b/modules/sfp_emailrep.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_emailrep(SpiderFootPlugin):diff --git a/modules/sfp_emergingthreats.py b/modules/sfp_emergingthreats.pyindex a93986b6..04bcbad9 100644--- a/modules/sfp_emergingthreats.py+++ b/modules/sfp_emergingthreats.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------from netaddr import IPAddress, IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_emergingthreats(SpiderFootPlugin):diff --git a/modules/sfp_errors.py b/modules/sfp_errors.pyindex 36fec6ef..bc324662 100644--- a/modules/sfp_errors.py+++ b/modules/sfp_errors.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin# Taken from Google Dorks on exploit-db.comregexps = dict({diff --git a/modules/sfp_ethereum.py b/modules/sfp_ethereum.pyindex 43d55e70..5a478e06 100644--- a/modules/sfp_ethereum.py+++ b/modules/sfp_ethereum.py@@ -13,7 +13,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_ethereum(SpiderFootPlugin):diff --git a/modules/sfp_filemeta.py b/modules/sfp_filemeta.pyindex ef91fe3b..8b70ae30 100644--- a/modules/sfp_filemeta.py+++ b/modules/sfp_filemeta.py@@ -11,13 +11,15 @@# Licence: GPL# -------------------------------------------------------------------------------+import ioimport mimetypes-import PyPDF2+import docx-import pptximport exifread-import io-from sflib import SpiderFootPlugin, SpiderFootEvent+import pptx+import PyPDF2++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_filemeta(SpiderFootPlugin):diff --git a/modules/sfp_flickr.py b/modules/sfp_flickr.pyindex f5f7ba6a..f6192fd8 100644--- a/modules/sfp_flickr.py+++ b/modules/sfp_flickr.py@@ -14,10 +14,11 @@import jsonimport reimport time-import urllib.request-import urllib.parseimport urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_flickr(SpiderFootPlugin):diff --git a/modules/sfp_fortinet.py b/modules/sfp_fortinet.pyindex f372cc31..19747ab5 100644--- a/modules/sfp_fortinet.py+++ b/modules/sfp_fortinet.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'Fortiguard Threat Lookup': {diff --git a/modules/sfp_fraudguard.py b/modules/sfp_fraudguard.pyindex 684fac9b..26a82a4e 100644--- a/modules/sfp_fraudguard.py+++ b/modules/sfp_fraudguard.py@@ -10,12 +10,15 @@# Licence: GPL# --------------------------------------------------------------------------------import jsonimport base64-from datetime import datetime+import jsonimport time+from datetime import datetime+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_fraudguard(SpiderFootPlugin):diff --git a/modules/sfp_fringeproject.py b/modules/sfp_fringeproject.pyindex d7522b81..4ca3c77d 100644--- a/modules/sfp_fringeproject.py+++ b/modules/sfp_fringeproject.py@@ -12,10 +12,13 @@import jsonimport re-import time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_fringeproject(SpiderFootPlugin):diff --git a/modules/sfp_fsecure_riddler.py b/modules/sfp_fsecure_riddler.pyindex 02be9c4d..7ba17b1a 100644--- a/modules/sfp_fsecure_riddler.py+++ b/modules/sfp_fsecure_riddler.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_fsecure_riddler(SpiderFootPlugin):diff --git a/modules/sfp_fullcontact.py b/modules/sfp_fullcontact.pyindex f8687160..807adc01 100644--- a/modules/sfp_fullcontact.py+++ b/modules/sfp_fullcontact.py@@ -12,7 +12,9 @@import jsonimport timefrom datetime import datetime-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_fullcontact(SpiderFootPlugin):diff --git a/modules/sfp_github.py b/modules/sfp_github.pyindex ab036d1a..3f1035d8 100644--- a/modules/sfp_github.py+++ b/modules/sfp_github.py@@ -12,7 +12,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_github(SpiderFootPlugin):diff --git a/modules/sfp_googlemaps.py b/modules/sfp_googlemaps.pyindex 8f40065d..fec7ca01 100644--- a/modules/sfp_googlemaps.py+++ b/modules/sfp_googlemaps.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_googlemaps(SpiderFootPlugin):diff --git a/modules/sfp_googleobjectstorage.py b/modules/sfp_googleobjectstorage.pyindex 866f5a31..a6756dad 100644--- a/modules/sfp_googleobjectstorage.py+++ b/modules/sfp_googleobjectstorage.py@@ -13,7 +13,9 @@import threadingimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_googleobjectstorage(SpiderFootPlugin):diff --git a/modules/sfp_googlesafebrowsing.py b/modules/sfp_googlesafebrowsing.pyindex 17cbb712..7c044835 100644--- a/modules/sfp_googlesafebrowsing.py+++ b/modules/sfp_googlesafebrowsing.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_googlesafebrowsing(SpiderFootPlugin):diff --git a/modules/sfp_googlesearch.py b/modules/sfp_googlesearch.pyindex 67c3c996..9e979da8 100644--- a/modules/sfp_googlesearch.py+++ b/modules/sfp_googlesearch.py@@ -10,7 +10,7 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_googlesearch(SpiderFootPlugin):diff --git a/modules/sfp_gravatar.py b/modules/sfp_gravatar.pyindex f6fadf04..d1a9fd79 100644--- a/modules/sfp_gravatar.py+++ b/modules/sfp_gravatar.py@@ -11,10 +11,12 @@# Licence: GPL#--------------------------------------------------------------------------------import jsonimport hashlib+import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_gravatar(SpiderFootPlugin):diff --git a/modules/sfp_greensnow.py b/modules/sfp_greensnow.pyindex acef6bd4..400608f4 100644--- a/modules/sfp_greensnow.py+++ b/modules/sfp_greensnow.py@@ -12,7 +12,8 @@from netaddr import IPAddress, IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_greensnow(SpiderFootPlugin):diff --git a/modules/sfp_grep_app.py b/modules/sfp_grep_app.pyindex 8ffcd5e3..4bc35bff 100644--- a/modules/sfp_grep_app.py+++ b/modules/sfp_grep_app.py@@ -14,8 +14,12 @@import jsonimport mathimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_grep_app(SpiderFootPlugin):diff --git a/modules/sfp_greynoise.py b/modules/sfp_greynoise.pyindex 2f11c0e2..f6a4627a 100644--- a/modules/sfp_greynoise.py+++ b/modules/sfp_greynoise.py@@ -11,10 +11,13 @@# -------------------------------------------------------------------------------import json-from datetime import datetimeimport time+from datetime import datetime+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_greynoise(SpiderFootPlugin):diff --git a/modules/sfp_h1nobbdde.py b/modules/sfp_h1nobbdde.pyindex a24b22e0..f8ed7ff2 100644--- a/modules/sfp_h1nobbdde.py+++ b/modules/sfp_h1nobbdde.py@@ -11,7 +11,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_h1nobbdde(SpiderFootPlugin):diff --git a/modules/sfp_hackertarget.py b/modules/sfp_hackertarget.pyindex cf9873dd..dd32762b 100644--- a/modules/sfp_hackertarget.py+++ b/modules/sfp_hackertarget.py@@ -12,11 +12,12 @@# Licence: GPL# --------------------------------------------------------------------------------import reimport json+import refrom netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_hackertarget(SpiderFootPlugin):diff --git a/modules/sfp_hashes.py b/modules/sfp_hashes.pyindex e914f511..4ff6e354 100644--- a/modules/sfp_hashes.py+++ b/modules/sfp_hashes.py@@ -11,7 +11,8 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_hashes(SpiderFootPlugin):diff --git a/modules/sfp_haveibeenpwned.py b/modules/sfp_haveibeenpwned.pyindex 3dd19eb9..1ebeb7d5 100644--- a/modules/sfp_haveibeenpwned.py+++ b/modules/sfp_haveibeenpwned.py@@ -11,7 +11,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_haveibeenpwned(SpiderFootPlugin):diff --git a/modules/sfp_honeypot.py b/modules/sfp_honeypot.pyindex cf057e98..341c7fb2 100644--- a/modules/sfp_honeypot.py+++ b/modules/sfp_honeypot.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_honeypot(SpiderFootPlugin):diff --git a/modules/sfp_hosting.py b/modules/sfp_hosting.pyindex 52e17103..269ae61a 100644--- a/modules/sfp_hosting.py+++ b/modules/sfp_hosting.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------from netaddr import IPAddress-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_hosting(SpiderFootPlugin):diff --git a/modules/sfp_hostio.py b/modules/sfp_hostio.pyindex 17537de0..06e7223a 100644--- a/modules/sfp_hostio.py+++ b/modules/sfp_hostio.py@@ -11,7 +11,7 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_hostio(SpiderFootPlugin):diff --git a/modules/sfp_hunter.py b/modules/sfp_hunter.pyindex 1cc274eb..3ad2ca70 100644--- a/modules/sfp_hunter.py+++ b/modules/sfp_hunter.py@@ -10,8 +10,12 @@#-------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_hunter(SpiderFootPlugin):diff --git a/modules/sfp_hybrid_analysis.py b/modules/sfp_hybrid_analysis.pyindex d7e2837c..18843556 100644--- a/modules/sfp_hybrid_analysis.py+++ b/modules/sfp_hybrid_analysis.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_hybrid_analysis(SpiderFootPlugin):diff --git a/modules/sfp_iban.py b/modules/sfp_iban.pyindex 485d6f6f..11ed8b6a 100644--- a/modules/sfp_iban.py+++ b/modules/sfp_iban.py@@ -11,7 +11,8 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_iban(SpiderFootPlugin):diff --git a/modules/sfp_iknowwhatyoudownload.py b/modules/sfp_iknowwhatyoudownload.pyindex 900dadfe..1e182c80 100644--- a/modules/sfp_iknowwhatyoudownload.py+++ b/modules/sfp_iknowwhatyoudownload.py@@ -10,7 +10,9 @@#-------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_iknowwhatyoudownload(SpiderFootPlugin):diff --git a/modules/sfp_instagram.py b/modules/sfp_instagram.pyindex 8f5b9002..ec5cc9f6 100644--- a/modules/sfp_instagram.py+++ b/modules/sfp_instagram.py@@ -12,7 +12,8 @@import jsonimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_instagram(SpiderFootPlugin):diff --git a/modules/sfp_intelx.py b/modules/sfp_intelx.pyindex b22aba89..308a832e 100644--- a/modules/sfp_intelx.py+++ b/modules/sfp_intelx.py@@ -11,10 +11,11 @@# Licence: GPL# -------------------------------------------------------------------------------+import datetimeimport jsonimport time-import datetime-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_intelx(SpiderFootPlugin):diff --git a/modules/sfp_intfiles.py b/modules/sfp_intfiles.pyindex d456ce68..afc4d150 100644--- a/modules/sfp_intfiles.py+++ b/modules/sfp_intfiles.py@@ -10,7 +10,7 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_intfiles(SpiderFootPlugin):diff --git a/modules/sfp_ipinfo.py b/modules/sfp_ipinfo.pyindex 7299805f..10f4146b 100644--- a/modules/sfp_ipinfo.py+++ b/modules/sfp_ipinfo.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_ipinfo(SpiderFootPlugin):diff --git a/modules/sfp_ipstack.py b/modules/sfp_ipstack.pyindex fd9e1478..2335d6b3 100644--- a/modules/sfp_ipstack.py+++ b/modules/sfp_ipstack.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_ipstack(SpiderFootPlugin):diff --git a/modules/sfp_isc.py b/modules/sfp_isc.pyindex d66b6e6f..dfd4c6ea 100644--- a/modules/sfp_isc.py+++ b/modules/sfp_isc.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'Internet Storm Center': {diff --git a/modules/sfp_jsonwhoiscom.py b/modules/sfp_jsonwhoiscom.pyindex 06363289..d009bab0 100644--- a/modules/sfp_jsonwhoiscom.py+++ b/modules/sfp_jsonwhoiscom.py@@ -12,8 +12,12 @@import jsonimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_jsonwhoiscom(SpiderFootPlugin):diff --git a/modules/sfp_junkfiles.py b/modules/sfp_junkfiles.pyindex 671899b2..218540ec 100644--- a/modules/sfp_junkfiles.py+++ b/modules/sfp_junkfiles.py@@ -10,9 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEventimport random+from sflib import SpiderFootEvent, SpiderFootPlugin++class sfp_junkfiles(SpiderFootPlugin):meta = {diff --git a/modules/sfp_keybase.py b/modules/sfp_keybase.pyindex 08184bab..35ccbe06 100644--- a/modules/sfp_keybase.py+++ b/modules/sfp_keybase.py@@ -11,10 +11,14 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent-import urllib.request, urllib.parse, urllib.errorimport jsonimport re+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_keybase(SpiderFootPlugin):diff --git a/modules/sfp_leakix.py b/modules/sfp_leakix.pyindex 49172e0e..8aa280a3 100644--- a/modules/sfp_leakix.py+++ b/modules/sfp_leakix.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_leakix(SpiderFootPlugin):diff --git a/modules/sfp_maltiverse.py b/modules/sfp_maltiverse.pyindex b55fbf5e..db7287c4 100644--- a/modules/sfp_maltiverse.py+++ b/modules/sfp_maltiverse.py@@ -11,11 +11,13 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent-from netaddr import IPNetworkimport jsonfrom datetime import datetime+from netaddr import IPNetwork++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_maltiverse(SpiderFootPlugin):diff --git a/modules/sfp_malwaredomainlist.py b/modules/sfp_malwaredomainlist.pyindex a527ab1c..b1dd9c32 100644--- a/modules/sfp_malwaredomainlist.py+++ b/modules/sfp_malwaredomainlist.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'malwaredomainlist.com IP List': {diff --git a/modules/sfp_malwaredomains.py b/modules/sfp_malwaredomains.pyindex ddaf46ad..a591d0b3 100644--- a/modules/sfp_malwaredomains.py+++ b/modules/sfp_malwaredomains.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'malwaredomains.com Domains': {diff --git a/modules/sfp_malwarepatrol.py b/modules/sfp_malwarepatrol.pyindex 76ade1fe..9a7836e2 100644--- a/modules/sfp_malwarepatrol.py+++ b/modules/sfp_malwarepatrol.py@@ -11,7 +11,7 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_malwarepatrol(SpiderFootPlugin):diff --git a/modules/sfp_metadefender.py b/modules/sfp_metadefender.pyindex 6a00da36..e5f45d4b 100644--- a/modules/sfp_metadefender.py+++ b/modules/sfp_metadefender.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_metadefender(SpiderFootPlugin):diff --git a/modules/sfp_mnemonic.py b/modules/sfp_mnemonic.pyindex f9aa4afa..6d8c48aa 100644--- a/modules/sfp_mnemonic.py+++ b/modules/sfp_mnemonic.py@@ -13,8 +13,12 @@import jsonimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_mnemonic(SpiderFootPlugin):diff --git a/modules/sfp_multiproxy.py b/modules/sfp_multiproxy.pyindex 56bab04c..dcc11569 100644--- a/modules/sfp_multiproxy.py+++ b/modules/sfp_multiproxy.py@@ -11,9 +11,10 @@# -------------------------------------------------------------------------------import re+from netaddr import IPAddress, IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'multiproxy.org Open Proxies': {diff --git a/modules/sfp_myspace.py b/modules/sfp_myspace.pyindex 634e2d83..198dc2bd 100644--- a/modules/sfp_myspace.py+++ b/modules/sfp_myspace.py@@ -11,7 +11,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_myspace(SpiderFootPlugin):diff --git a/modules/sfp_names.py b/modules/sfp_names.pyindex 44686eeb..640f6a82 100644--- a/modules/sfp_names.py+++ b/modules/sfp_names.py@@ -12,7 +12,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_names(SpiderFootPlugin):diff --git a/modules/sfp_networksdb.py b/modules/sfp_networksdb.pyindex 201ed0ba..ed31d99a 100644--- a/modules/sfp_networksdb.py+++ b/modules/sfp_networksdb.py@@ -13,8 +13,12 @@import jsonimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_networksdb(SpiderFootPlugin):diff --git a/modules/sfp_neutrinoapi.py b/modules/sfp_neutrinoapi.pyindex 11c73c33..a8fa9645 100644--- a/modules/sfp_neutrinoapi.py+++ b/modules/sfp_neutrinoapi.py@@ -12,7 +12,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_neutrinoapi(SpiderFootPlugin):diff --git a/modules/sfp_norton.py b/modules/sfp_norton.pyindex 75e6bd1e..8efc4c8a 100644--- a/modules/sfp_norton.py+++ b/modules/sfp_norton.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_norton(SpiderFootPlugin):diff --git a/modules/sfp_numverify.py b/modules/sfp_numverify.pyindex 8b0406f9..7ec67e30 100644--- a/modules/sfp_numverify.py+++ b/modules/sfp_numverify.py@@ -11,9 +11,13 @@#-------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.errorimport time-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_numverify(SpiderFootPlugin):diff --git a/modules/sfp_onioncity.py b/modules/sfp_onioncity.pyindex 3928b1fb..248f6e28 100644--- a/modules/sfp_onioncity.py+++ b/modules/sfp_onioncity.py@@ -11,9 +11,10 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEventimport re+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_onioncity(SpiderFootPlugin):diff --git a/modules/sfp_onionsearchengine.py b/modules/sfp_onionsearchengine.pyindex a3119708..e546c492 100644--- a/modules/sfp_onionsearchengine.py+++ b/modules/sfp_onionsearchengine.py@@ -12,9 +12,12 @@# -------------------------------------------------------------------------------import re+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEventclass sfp_onionsearchengine(SpiderFootPlugin):diff --git a/modules/sfp_onyphe.py b/modules/sfp_onyphe.pyindex 5a0b5a95..abcb99e7 100644--- a/modules/sfp_onyphe.py+++ b/modules/sfp_onyphe.py@@ -11,10 +11,11 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEventimport json-from datetime import datetimeimport time+from datetime import datetime++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_onyphe(SpiderFootPlugin):diff --git a/modules/sfp_open_passive_dns_database.py b/modules/sfp_open_passive_dns_database.pyindex f4124ec1..0755ad94 100644--- a/modules/sfp_open_passive_dns_database.py+++ b/modules/sfp_open_passive_dns_database.py@@ -13,8 +13,12 @@import reimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_open_passive_dns_database(SpiderFootPlugin):diff --git a/modules/sfp_openbugbounty.py b/modules/sfp_openbugbounty.pyindex 28f3fa27..f6ea3c77 100644--- a/modules/sfp_openbugbounty.py+++ b/modules/sfp_openbugbounty.py@@ -11,7 +11,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_openbugbounty(SpiderFootPlugin):diff --git a/modules/sfp_opencorporates.py b/modules/sfp_opencorporates.pyindex 46b421e6..4080e7e6 100644--- a/modules/sfp_opencorporates.py+++ b/modules/sfp_opencorporates.py@@ -12,7 +12,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_opencorporates(SpiderFootPlugin):diff --git a/modules/sfp_opendns.py b/modules/sfp_opendns.pyindex a18102f5..75d186ac 100644--- a/modules/sfp_opendns.py+++ b/modules/sfp_opendns.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_opendns(SpiderFootPlugin):diff --git a/modules/sfp_openphish.py b/modules/sfp_openphish.pyindex 7dfccd42..fb82b7fe 100644--- a/modules/sfp_openphish.py+++ b/modules/sfp_openphish.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'OpenPhish': {diff --git a/modules/sfp_openstreetmap.py b/modules/sfp_openstreetmap.pyindex d4796fb8..363f17de 100644--- a/modules/sfp_openstreetmap.py+++ b/modules/sfp_openstreetmap.py@@ -11,11 +11,15 @@# Licence: GPL# --------------------------------------------------------------------------------import reimport json+import reimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_openstreetmap(SpiderFootPlugin):diff --git a/modules/sfp_pageinfo.py b/modules/sfp_pageinfo.pyindex b7e14b0b..44bc83a5 100644--- a/modules/sfp_pageinfo.py+++ b/modules/sfp_pageinfo.py@@ -14,7 +14,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin# Indentify pages that use Javascript libs, handle passwords, have forms,# permit file uploads and more to come.diff --git a/modules/sfp_pastebin.py b/modules/sfp_pastebin.pyindex d9352645..80a16740 100644--- a/modules/sfp_pastebin.py+++ b/modules/sfp_pastebin.py@@ -13,7 +13,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_pastebin(SpiderFootPlugin):diff --git a/modules/sfp_pgp.py b/modules/sfp_pgp.pyindex 35002f95..d2e9402f 100644--- a/modules/sfp_pgp.py+++ b/modules/sfp_pgp.py@@ -13,7 +13,9 @@# -------------------------------------------------------------------------------import re-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_pgp(SpiderFootPlugin):diff --git a/modules/sfp_phishstats.py b/modules/sfp_phishstats.pyindex 7d78468a..b932f836 100644--- a/modules/sfp_phishstats.py+++ b/modules/sfp_phishstats.py@@ -11,10 +11,15 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent-from netaddr import IPNetwork-import urllib.request, urllib.parse, urllib.errorimport json+import urllib.error+import urllib.parse+import urllib.request++from netaddr import IPNetwork++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_phishstats(SpiderFootPlugin):diff --git a/modules/sfp_phishtank.py b/modules/sfp_phishtank.pyindex 4b1e10da..7566d0f7 100644--- a/modules/sfp_phishtank.py+++ b/modules/sfp_phishtank.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'PhishTank': {diff --git a/modules/sfp_phone.py b/modules/sfp_phone.pyindex cabb9ebd..a48c4bdb 100644--- a/modules/sfp_phone.py+++ b/modules/sfp_phone.py@@ -14,8 +14,10 @@import phonenumbersfrom phonenumbers import carrier+#from phonenumbers import geocoder-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_phone(SpiderFootPlugin):diff --git a/modules/sfp_portscan_tcp.py b/modules/sfp_portscan_tcp.pyindex 765307bb..0fdda669 100644--- a/modules/sfp_portscan_tcp.py+++ b/modules/sfp_portscan_tcp.py@@ -11,11 +11,13 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPNetworkimport randomimport threadingimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from netaddr import IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_portscan_tcp(SpiderFootPlugin):diff --git a/modules/sfp_psbdmp.py b/modules/sfp_psbdmp.pyindex 3a993783..193e1d48 100644--- a/modules/sfp_psbdmp.py+++ b/modules/sfp_psbdmp.py@@ -9,10 +9,11 @@# Licence: GPL#-------------------------------------------------------------------------------+import jsonimport re-import json-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_psbdmp(SpiderFootPlugin):diff --git a/modules/sfp_pulsedive.py b/modules/sfp_pulsedive.pyindex 73aec836..547bdfe4 100644--- a/modules/sfp_pulsedive.py+++ b/modules/sfp_pulsedive.py@@ -11,11 +11,16 @@# -------------------------------------------------------------------------------import json-from datetime import datetimeimport time+import urllib.error+import urllib.parse+import urllib.request+from datetime import datetime+from netaddr import IPNetwork-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_pulsedive(SpiderFootPlugin):diff --git a/modules/sfp_quad9.py b/modules/sfp_quad9.pyindex c17c463d..03828da5 100644--- a/modules/sfp_quad9.py+++ b/modules/sfp_quad9.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_quad9(SpiderFootPlugin):diff --git a/modules/sfp_ripe.py b/modules/sfp_ripe.pyindex 5317ec32..c1e1442f 100644--- a/modules/sfp_ripe.py+++ b/modules/sfp_ripe.py@@ -11,9 +11,10 @@# Licence: GPL# --------------------------------------------------------------------------------import reimport json-from sflib import SpiderFootPlugin, SpiderFootEvent+import re++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_ripe(SpiderFootPlugin):diff --git a/modules/sfp_riskiq.py b/modules/sfp_riskiq.pyindex 24009ed4..7b6cfdda 100644--- a/modules/sfp_riskiq.py+++ b/modules/sfp_riskiq.py@@ -10,9 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------import jsonimport base64-from sflib import SpiderFootPlugin, SpiderFootEvent+import json++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_riskiq(SpiderFootPlugin):diff --git a/modules/sfp_robtex.py b/modules/sfp_robtex.pyindex c633161e..eb93c273 100644--- a/modules/sfp_robtex.py+++ b/modules/sfp_robtex.py@@ -12,8 +12,10 @@import jsonimport time+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_robtex(SpiderFootPlugin):diff --git a/modules/sfp_s3bucket.py b/modules/sfp_s3bucket.pyindex 104e3f8f..a74fd530 100644--- a/modules/sfp_s3bucket.py+++ b/modules/sfp_s3bucket.py@@ -13,7 +13,9 @@import threadingimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_s3bucket(SpiderFootPlugin):diff --git a/modules/sfp_scylla.py b/modules/sfp_scylla.pyindex 75df463e..f4b461d9 100644--- a/modules/sfp_scylla.py+++ b/modules/sfp_scylla.py@@ -9,11 +9,15 @@# Licence: GPL#-------------------------------------------------------------------------------+import base64import jsonimport time-import base64-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_scylla(SpiderFootPlugin):diff --git a/modules/sfp_securitytrails.py b/modules/sfp_securitytrails.pyindex e9b1457e..99816beb 100644--- a/modules/sfp_securitytrails.py+++ b/modules/sfp_securitytrails.py@@ -12,7 +12,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_securitytrails(SpiderFootPlugin):diff --git a/modules/sfp_shodan.py b/modules/sfp_shodan.pyindex 3f6cc27e..731c3445 100644--- a/modules/sfp_shodan.py+++ b/modules/sfp_shodan.py@@ -11,10 +11,14 @@# -------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.errorimport time+import urllib.error+import urllib.parse+import urllib.request+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_shodan(SpiderFootPlugin):diff --git a/modules/sfp_similar.py b/modules/sfp_similar.pyindex c091f4fa..83a9feb2 100644--- a/modules/sfp_similar.py+++ b/modules/sfp_similar.py@@ -11,7 +11,7 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginnearchars = {'a': ['4', 's'],diff --git a/modules/sfp_skymem.py b/modules/sfp_skymem.pyindex 7a56a467..75aad3c5 100644--- a/modules/sfp_skymem.py+++ b/modules/sfp_skymem.py@@ -13,7 +13,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_skymem(SpiderFootPlugin):diff --git a/modules/sfp_slideshare.py b/modules/sfp_slideshare.pyindex 864b5cc9..fe2446e0 100644--- a/modules/sfp_slideshare.py+++ b/modules/sfp_slideshare.py@@ -11,7 +11,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_slideshare(SpiderFootPlugin):diff --git a/modules/sfp_snov.py b/modules/sfp_snov.pyindex 9fc7adc2..c3a269ea 100644--- a/modules/sfp_snov.py+++ b/modules/sfp_snov.py@@ -11,9 +11,13 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent-import urllib.request, urllib.parse, urllib.errorimport json+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_snov(SpiderFootPlugin):diff --git a/modules/sfp_social.py b/modules/sfp_social.pyindex b5e80ff0..b98a417b 100644--- a/modules/sfp_social.py+++ b/modules/sfp_social.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginregexps = dict({"LinkedIn (Individual)": list(['.*linkedin.com/in/([a-zA-Z0-9_]+$)']),diff --git a/modules/sfp_socialprofiles.py b/modules/sfp_socialprofiles.pyindex fa8754e9..4e2ff3f8 100644--- a/modules/sfp_socialprofiles.py+++ b/modules/sfp_socialprofiles.py@@ -11,9 +11,11 @@# -------------------------------------------------------------------------------import re+import urllib.error+import urllib.parse+import urllib.request-import urllib.request, urllib.error, urllib.parse-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginsites = {# Search string to use, domain name the profile will sit on withindiff --git a/modules/sfp_sorbs.py b/modules/sfp_sorbs.pyindex 0ae95fde..972246cd 100644--- a/modules/sfp_sorbs.py+++ b/modules/sfp_sorbs.py@@ -13,7 +13,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_sorbs(SpiderFootPlugin):diff --git a/modules/sfp_spamcop.py b/modules/sfp_spamcop.pyindex a659e375..6021a7fa 100644--- a/modules/sfp_spamcop.py+++ b/modules/sfp_spamcop.py@@ -13,7 +13,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_spamcop(SpiderFootPlugin):diff --git a/modules/sfp_spamhaus.py b/modules/sfp_spamhaus.pyindex ccecd10c..8688ca64 100644--- a/modules/sfp_spamhaus.py+++ b/modules/sfp_spamhaus.py@@ -13,7 +13,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_spamhaus(SpiderFootPlugin):diff --git a/modules/sfp_spider.py b/modules/sfp_spider.pyindex e185f885..717e1e48 100644--- a/modules/sfp_spider.py+++ b/modules/sfp_spider.py@@ -11,9 +11,11 @@# Licence: GPL# --------------------------------------------------------------------------------import timeimport json-from sflib import SpiderFootPlugin, SpiderFootEvent+import time++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_spider(SpiderFootPlugin):diff --git a/modules/sfp_spur.py b/modules/sfp_spur.pyindex 7ef10aec..a3914a40 100644--- a/modules/sfp_spur.py+++ b/modules/sfp_spur.py@@ -11,10 +11,13 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEvent-from netaddr import IPNetworkimport json+from netaddr import IPNetwork++from sflib import SpiderFootEvent, SpiderFootPlugin++class sfp_spur(SpiderFootPlugin):meta = {diff --git a/modules/sfp_spyonweb.py b/modules/sfp_spyonweb.pyindex 4fe094ff..a8d59cca 100644--- a/modules/sfp_spyonweb.py+++ b/modules/sfp_spyonweb.py@@ -14,7 +14,9 @@import datetimeimport jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_spyonweb(SpiderFootPlugin):diff --git a/modules/sfp_spyse.py b/modules/sfp_spyse.pyindex 4e82b806..f7575bb5 100644--- a/modules/sfp_spyse.py+++ b/modules/sfp_spyse.py@@ -14,8 +14,12 @@import jsonimport time-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_spyse(SpiderFootPlugin):diff --git a/modules/sfp_sslcert.py b/modules/sfp_sslcert.pyindex 2588709f..a5965e1d 100644--- a/modules/sfp_sslcert.py+++ b/modules/sfp_sslcert.py@@ -11,7 +11,8 @@# -------------------------------------------------------------------------------from urllib.parse import urlparse-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_sslcert(SpiderFootPlugin):diff --git a/modules/sfp_strangeheaders.py b/modules/sfp_strangeheaders.pyindex 41a2f3d7..1cc8da41 100644--- a/modules/sfp_strangeheaders.py+++ b/modules/sfp_strangeheaders.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin# Standard headers, taken from http://en.wikipedia.org/wiki/List_of_HTTP_header_fieldsheaders = ["access-control-allow-origin", "accept-ranges", "age", "allow", "cache-control",diff --git a/modules/sfp_subdomain_takeover.py b/modules/sfp_subdomain_takeover.pyindex 9ddfd651..1656cafe 100644--- a/modules/sfp_subdomain_takeover.py+++ b/modules/sfp_subdomain_takeover.py@@ -13,7 +13,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_subdomain_takeover(SpiderFootPlugin):diff --git a/modules/sfp_talosintel.py b/modules/sfp_talosintel.pyindex a3eb9f6d..2085faad 100644--- a/modules/sfp_talosintel.py+++ b/modules/sfp_talosintel.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'talosintelligence.com List': {diff --git a/modules/sfp_template.py b/modules/sfp_template.pyindex a7c6593e..e162a869 100644--- a/modules/sfp_template.py+++ b/modules/sfp_template.py@@ -11,8 +11,11 @@# -------------------------------------------------------------------------------import json+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_template(SpiderFootPlugin):# The module descriptor dictionary contains all the meta data about a module necessarydiff --git a/modules/sfp_threatcrowd.py b/modules/sfp_threatcrowd.pyindex f297d0b9..6faa56d8 100644--- a/modules/sfp_threatcrowd.py+++ b/modules/sfp_threatcrowd.py@@ -11,8 +11,10 @@# -------------------------------------------------------------------------------import json+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_threatcrowd(SpiderFootPlugin):diff --git a/modules/sfp_threatminer.py b/modules/sfp_threatminer.pyindex 91b7ceaa..9a9333ed 100644--- a/modules/sfp_threatminer.py+++ b/modules/sfp_threatminer.py@@ -11,10 +11,13 @@# -------------------------------------------------------------------------------import json-from datetime import datetimeimport time+from datetime import datetime+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_threatminer(SpiderFootPlugin):diff --git a/modules/sfp_tldsearch.py b/modules/sfp_tldsearch.pyindex cf8018d2..9bec439c 100644--- a/modules/sfp_tldsearch.py+++ b/modules/sfp_tldsearch.py@@ -14,8 +14,11 @@import randomimport threadingimport time+import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_tldsearch(SpiderFootPlugin):diff --git a/modules/sfp_tool_cmseek.py b/modules/sfp_tool_cmseek.pyindex f1fdb9c7..7bfb4efa 100644--- a/modules/sfp_tool_cmseek.py+++ b/modules/sfp_tool_cmseek.py@@ -11,11 +11,13 @@# Licence: GPL# --------------------------------------------------------------------------------from subprocess import Popen, PIPEimport ioimport jsonimport os.path-from sflib import SpiderFootPlugin, SpiderFootEvent+from subprocess import PIPE, Popen++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_tool_cmseek(SpiderFootPlugin):diff --git a/modules/sfp_tool_dnstwist.py b/modules/sfp_tool_dnstwist.pyindex 841cb554..5263ec5f 100644--- a/modules/sfp_tool_dnstwist.py+++ b/modules/sfp_tool_dnstwist.py@@ -11,10 +11,12 @@# Licence: GPL# --------------------------------------------------------------------------------from subprocess import Popen, PIPEimport jsonimport os.path-from sflib import SpiderFootPlugin, SpiderFootEvent+from subprocess import PIPE, Popen++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_tool_dnstwist(SpiderFootPlugin):diff --git a/modules/sfp_tool_nmap.py b/modules/sfp_tool_nmap.pyindex fc937ff2..6bcc6746 100644--- a/modules/sfp_tool_nmap.py+++ b/modules/sfp_tool_nmap.py@@ -10,10 +10,13 @@# Licence: GPL# --------------------------------------------------------------------------------from subprocess import Popen, PIPEimport os.path+from subprocess import PIPE, Popen+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_tool_nmap(SpiderFootPlugin):diff --git a/modules/sfp_tool_whatweb.py b/modules/sfp_tool_whatweb.pyindex 90ab31e9..40dac607 100644--- a/modules/sfp_tool_whatweb.py+++ b/modules/sfp_tool_whatweb.py@@ -11,10 +11,12 @@# Licence: GPL# --------------------------------------------------------------------------------from subprocess import Popen, PIPEimport jsonimport os.path-from sflib import SpiderFootPlugin, SpiderFootEvent+from subprocess import PIPE, Popen++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_tool_whatweb(SpiderFootPlugin):diff --git a/modules/sfp_torch.py b/modules/sfp_torch.pyindex 9b3a46eb..01f0571b 100644--- a/modules/sfp_torch.py+++ b/modules/sfp_torch.py@@ -11,9 +11,10 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEventimport re+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_torch(SpiderFootPlugin):diff --git a/modules/sfp_torexits.py b/modules/sfp_torexits.pyindex bea93056..c60ff788 100644--- a/modules/sfp_torexits.py+++ b/modules/sfp_torexits.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'TOR Exist List': {diff --git a/modules/sfp_totalhash.py b/modules/sfp_totalhash.pyindex 8f97e61c..212ca01d 100644--- a/modules/sfp_totalhash.py+++ b/modules/sfp_totalhash.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'TotalHash.com Database': {diff --git a/modules/sfp_twilio.py b/modules/sfp_twilio.pyindex 57df5cf9..9a690af7 100644--- a/modules/sfp_twilio.py+++ b/modules/sfp_twilio.py@@ -10,10 +10,12 @@# Licence: GPL# --------------------------------------------------------------------------------from sflib import SpiderFootPlugin, SpiderFootEventimport base64import json+from sflib import SpiderFootEvent, SpiderFootPlugin++class sfp_twilio(SpiderFootPlugin):meta = {diff --git a/modules/sfp_twitter.py b/modules/sfp_twitter.pyindex 9ad69a6b..6b1ce5f3 100644--- a/modules/sfp_twitter.py+++ b/modules/sfp_twitter.py@@ -11,7 +11,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_twitter(SpiderFootPlugin):diff --git a/modules/sfp_uceprotect.py b/modules/sfp_uceprotect.pyindex 5d620105..7c8cf8e3 100644--- a/modules/sfp_uceprotect.py+++ b/modules/sfp_uceprotect.py@@ -13,7 +13,8 @@# -------------------------------------------------------------------------------from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_uceprotect(SpiderFootPlugin):diff --git a/modules/sfp_urlscan.py b/modules/sfp_urlscan.pyindex a201def5..5bfb3bac 100644--- a/modules/sfp_urlscan.py+++ b/modules/sfp_urlscan.py@@ -11,8 +11,12 @@# -------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_urlscan(SpiderFootPlugin):diff --git a/modules/sfp_venmo.py b/modules/sfp_venmo.pyindex 1530a0fe..67d66027 100644--- a/modules/sfp_venmo.py+++ b/modules/sfp_venmo.py@@ -11,7 +11,9 @@import jsonimport time-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_venmo(SpiderFootPlugin):diff --git a/modules/sfp_viewdns.py b/modules/sfp_viewdns.pyindex e8f7f679..5e10ac25 100644--- a/modules/sfp_viewdns.py+++ b/modules/sfp_viewdns.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_viewdns(SpiderFootPlugin):diff --git a/modules/sfp_virustotal.py b/modules/sfp_virustotal.pyindex 667aa463..2588eeca 100644--- a/modules/sfp_virustotal.py+++ b/modules/sfp_virustotal.py@@ -12,8 +12,10 @@import jsonimport time+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_virustotal(SpiderFootPlugin):diff --git a/modules/sfp_voipbl.py b/modules/sfp_voipbl.pyindex 935ff5da..847781c4 100644--- a/modules/sfp_voipbl.py+++ b/modules/sfp_voipbl.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'VOIPBL Publicly Accessible PBX List': {diff --git a/modules/sfp_vxvault.py b/modules/sfp_vxvault.pyindex 6be350dd..70146756 100644--- a/modules/sfp_vxvault.py+++ b/modules/sfp_vxvault.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------from netaddr import IPAddress, IPNetworkimport re-from sflib import SpiderFootPlugin, SpiderFootEvent+from netaddr import IPAddress, IPNetwork++from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'VXVault Malicious URL List': {diff --git a/modules/sfp_watchguard.py b/modules/sfp_watchguard.pyindex 34d32a16..5c252554 100644--- a/modules/sfp_watchguard.py+++ b/modules/sfp_watchguard.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginmalchecks = {'Watchguard Reputation Authority Lookup': {diff --git a/modules/sfp_webanalytics.py b/modules/sfp_webanalytics.pyindex 46a4a41b..43855cb5 100644--- a/modules/sfp_webanalytics.py+++ b/modules/sfp_webanalytics.py@@ -13,7 +13,8 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_webanalytics(SpiderFootPlugin):diff --git a/modules/sfp_webframework.py b/modules/sfp_webframework.pyindex cdde892f..59e56f9a 100644--- a/modules/sfp_webframework.py+++ b/modules/sfp_webframework.py@@ -12,7 +12,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginregexps = dict({"jQuery": list(['jquery']), # unlikely false positivediff --git a/modules/sfp_webserver.py b/modules/sfp_webserver.pyindex bd59365d..2d1e262d 100644--- a/modules/sfp_webserver.py+++ b/modules/sfp_webserver.py@@ -12,7 +12,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_webserver(SpiderFootPlugin):diff --git a/modules/sfp_whatcms.py b/modules/sfp_whatcms.pyindex 404ce747..cd9f3542 100644--- a/modules/sfp_whatcms.py+++ b/modules/sfp_whatcms.py@@ -11,9 +11,13 @@#-------------------------------------------------------------------------------import json-import urllib.request, urllib.parse, urllib.errorimport time-from sflib import SpiderFootPlugin, SpiderFootEvent+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_whatcms(SpiderFootPlugin):diff --git a/modules/sfp_whois.py b/modules/sfp_whois.pyindex 5bc0594d..788ae227 100644--- a/modules/sfp_whois.py+++ b/modules/sfp_whois.py@@ -11,10 +11,12 @@# Licence: GPL# --------------------------------------------------------------------------------import whoisimport ipwhois+import whoisfrom netaddr import IPAddress-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_whois(SpiderFootPlugin):diff --git a/modules/sfp_whoisology.py b/modules/sfp_whoisology.pyindex d30e447f..7371e752 100644--- a/modules/sfp_whoisology.py+++ b/modules/sfp_whoisology.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_whoisology(SpiderFootPlugin):diff --git a/modules/sfp_whoxy.py b/modules/sfp_whoxy.pyindex b0ccead4..d29833a7 100644--- a/modules/sfp_whoxy.py+++ b/modules/sfp_whoxy.py@@ -11,7 +11,9 @@# -------------------------------------------------------------------------------import json-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_whoxy(SpiderFootPlugin):diff --git a/modules/sfp_wigle.py b/modules/sfp_wigle.pyindex e46fdce2..fdd30926 100644--- a/modules/sfp_wigle.py+++ b/modules/sfp_wigle.py@@ -9,10 +9,14 @@# Licence: GPL#--------------------------------------------------------------------------------import jsonimport datetime-import urllib.request, urllib.parse, urllib.error-from sflib import SpiderFootPlugin, SpiderFootEvent+import json+import urllib.error+import urllib.parse+import urllib.request++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_wigle(SpiderFootPlugin):diff --git a/modules/sfp_wikileaks.py b/modules/sfp_wikileaks.pyindex d1b5fd3c..855b3435 100644--- a/modules/sfp_wikileaks.py+++ b/modules/sfp_wikileaks.py@@ -11,7 +11,8 @@# -------------------------------------------------------------------------------import datetime-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_wikileaks(SpiderFootPlugin):diff --git a/modules/sfp_wikipediaedits.py b/modules/sfp_wikipediaedits.pyindex 5aed2689..2186999e 100644--- a/modules/sfp_wikipediaedits.py+++ b/modules/sfp_wikipediaedits.py@@ -12,9 +12,13 @@import datetimeimport re-import urllib.request, urllib.parse, urllib.error+import urllib.error+import urllib.parse+import urllib.requestfrom html.parser import HTMLParser-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_wikipediaedits(SpiderFootPlugin):diff --git a/modules/sfp_xforce.py b/modules/sfp_xforce.pyindex 68495ba7..240d1a49 100644--- a/modules/sfp_xforce.py+++ b/modules/sfp_xforce.py@@ -11,12 +11,15 @@# Licence: GPL# --------------------------------------------------------------------------------import jsonimport base64-from datetime import datetime+import jsonimport time+from datetime import datetime+from netaddr import IPNetwork-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPlugin+class sfp_xforce(SpiderFootPlugin):diff --git a/modules/sfp_yandexdns.py b/modules/sfp_yandexdns.pyindex e35f11d2..63d0c8d5 100644--- a/modules/sfp_yandexdns.py+++ b/modules/sfp_yandexdns.py@@ -12,7 +12,8 @@# -------------------------------------------------------------------------------import dns.resolver-from sflib import SpiderFootPlugin, SpiderFootEvent++from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_yandexdns(SpiderFootPlugin):diff --git a/modules/sfp_zoneh.py b/modules/sfp_zoneh.pyindex bd05cacb..754f5900 100644--- a/modules/sfp_zoneh.py+++ b/modules/sfp_zoneh.py@@ -13,7 +13,7 @@import re-from sflib import SpiderFootPlugin, SpiderFootEvent+from sflib import SpiderFootEvent, SpiderFootPluginclass sfp_zoneh(SpiderFootPlugin):diff --git a/sf.py b/sf.pyindex 457a2623..7f5c2489 100755--- a/sf.py+++ b/sf.py@@ -17,20 +17,22 @@ if sys.version_info < (3, 6):print("SpiderFoot 3.3+ requires Python 3.6 or higher.")sys.exit(-1)+import argparse+import multiprocessing as mpimport osimport os.path+import randomimport signalimport time-import argparsefrom copy import deepcopy+import cherrypy-import random-import multiprocessing as mpfrom cherrypy.lib import auth_digest-from sflib import SpiderFoot+from sfdb import SpiderFootDb-from sfwebui import SpiderFootWebUi+from sflib import SpiderFootfrom sfscan import SpiderFootScanner+from sfwebui import SpiderFootWebUi# 'Global' configuration options# These can be overriden on a per-module basis, and some willdiff --git a/sfcli.py b/sfcli.pyindex 212c821d..1deb317a 100755--- a/sfcli.py+++ b/sfcli.py@@ -11,18 +11,19 @@# Licence: GPL# --------------------------------------------------------------------------------import sys+import argparse+import cmd+import codecs+import jsonimport osimport re-import json-import requestsimport shlex-import codecs+import sysimport time-import cmd-import argparsefrom os.path import expanduser+import requests+try:import readlineexcept ImportError:diff --git a/sfdb.py b/sfdb.pyindex 16d376bc..f00374ab 100644--- a/sfdb.py+++ b/sfdb.py@@ -10,10 +10,11 @@# Licence: GPL# --------------------------------------------------------------------------------import sqlite3import re-import time+import sqlite3import threading+import time+from sflib import SpiderFoot, SpiderFootEventdiff --git a/sflib.py b/sflib.pyindex 48c2aee8..195d8c7f 100644--- a/sflib.py+++ b/sflib.py@@ -11,37 +11,38 @@# Licence: GPL# --------------------------------------------------------------------------------from stem import Signal-from stem.control import Controller-import inspectimport hashlibimport html+import inspectimport ioimport json-import reimport osimport random-import requests+import reimport socketimport sslimport sysimport time-import netaddrimport traceback-import OpenSSL+import urllib.error+import urllib.parse+import urllib.requestimport uuid+from copy import deepcopy+from datetime import datetime+import cryptographyimport dns.resolver-import urllib.request-import urllib.parse-import urllib.error+import netaddr+import OpenSSL+import requestsimport urllib3-from publicsuffixlist import PublicSuffixList+from bs4 import BeautifulSoup, SoupStrainerfrom networkx import nxfrom networkx.readwrite.gexf import GEXFWriter-from datetime import datetime-from bs4 import BeautifulSoup, SoupStrainer-from copy import deepcopy+from publicsuffixlist import PublicSuffixList+from stem import Signal+from stem.control import Controller# For hiding the SSL warnings coming from the requests liburllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)diff --git a/sfscan.py b/sfscan.pyindex 94575182..af29d67a 100644--- a/sfscan.py+++ b/sfscan.py@@ -9,14 +9,17 @@# Copyright: (c) Steve Micallef 2013# License: GPL# ------------------------------------------------------------------import traceback-import time-import sysimport socket+import sys+import time+import tracebackfrom copy import deepcopy+import dns.resolver+from sfdb import SpiderFootDb-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget, SpiderFootPlugin+from sflib import (SpiderFoot, SpiderFootEvent, SpiderFootPlugin,+ SpiderFootTarget)class SpiderFootScanner():diff --git a/sfwebui.py b/sfwebui.pyindex 47e20858..a553f66a 100644--- a/sfwebui.py+++ b/sfwebui.py@@ -9,23 +9,26 @@# Copyright: (c) Steve Micallef 2012# License: GPL# ------------------------------------------------------------------import json-import cherrypy-import htmlimport csv-import time-import random+import html+import jsonimport multiprocessing as mp-from secure import SecureHeaders-from cherrypy import _cperror-from operator import itemgetter+import random+import timefrom copy import deepcopy+from io import StringIO+from operator import itemgetter++import cherrypy+from cherrypy import _cperrorfrom mako.lookup import TemplateLookupfrom mako.template import Template+from secure import SecureHeaders+from sfdb import SpiderFootDbfrom sflib import SpiderFootfrom sfscan import SpiderFootScanner-from io import StringIO+mp.set_start_method("spawn", force=True)