Fixes #1897

.github/workflows/tests.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest]
 
     steps:

modules/sfp__stor_stdout.py

@@ -55,20 +55,20 @@ def watchedEvents(self):
 
     def output(self, event):
         d = self.opts['_csvdelim']
-        if type(event.data) in [list, dict]:
+        if isinstance(event.data, (list, dict)):
             data = str(event.data)
         else:
             data = event.data
 
-        if type(data) != str:
+        if not isinstance(data, str):
             data = str(event.data)
 
-        if type(event.sourceEvent.data) in [list, dict]:
+        if isinstance(event.sourceEvent.data, (list, dict)):
             srcdata = str(event.sourceEvent.data)
         else:
             srcdata = event.sourceEvent.data
 
-        if type(srcdata) != str:
+        if not isinstance(srcdata, str):
             srcdata = str(event.sourceEvent.data)
 
         if self.opts['_stripnewline']:

modules/sfp_arin.py

@@ -143,7 +143,7 @@ def handleEvent(self, event):
                 if "pocRef" in ret['pocs']:
                     ref = list()
                     # Might be a list or a dictionary
-                    if type(ret['pocs']['pocRef']) == dict:
+                    if isinstance(ret['pocs']['pocRef'], dict):
                         ref = [ret['pocs']['pocRef']]
                     else:
                         ref = ret['pocs']['pocRef']
@@ -169,7 +169,7 @@ def handleEvent(self, event):
                 if "pocRef" in ret['pocs']:
                     ref = list()
                     # Might be a list or a dictionary
-                    if type(ret['pocs']['pocRef']) == dict:
+                    if isinstance(ret['pocs']['pocRef'], dict):
                         ref = [ret['pocs']['pocRef']]
                     else:
                         ref = ret['pocs']['pocRef']

modules/sfp_fraudguard.py

@@ -123,10 +123,10 @@ def query(self, qry):
 
         fraudguard_url = "https://api.fraudguard.io/ip/" + qry
         api_key_account = self.opts['fraudguard_api_key_account']
-        if type(api_key_account) == str:
+        if isinstance(api_key_account, str):
             api_key_account = api_key_account.encode('utf-8')
         api_key_password = self.opts['fraudguard_api_key_password']
-        if type(api_key_password) == str:
+        if isinstance(api_key_password, str):
             api_key_password = api_key_password.encode('utf-8')
         token = base64.b64encode(api_key_account + ':'.encode('utf-8') + api_key_password)
         headers = {

modules/sfp_github.py

@@ -263,7 +263,7 @@ def handleEvent(self, event):
                     continue
 
                 for item in repret:
-                    if type(item) != dict:
+                    if not isinstance(item, dict):
                         self.debug("Encountered an unexpected or empty response from Github.")
                         continue
 

modules/sfp_riskiq.py

@@ -112,10 +112,10 @@ def query(self, qry, qtype, opts=dict()):
             post = '{"field": "email", "query": "' + qry + '"}'
 
         api_key_login = self.opts['api_key_login']
-        if type(api_key_login) == str:
+        if isinstance(api_key_login, str):
             api_key_login = api_key_login.encode('utf-8')
         api_key_password = self.opts['api_key_password']
-        if type(api_key_password) == str:
+        if isinstance(api_key_password, str):
             api_key_password = api_key_password.encode('utf-8')
         cred = base64.b64encode(api_key_login + ":".encode('utf-8') + api_key_password)
         headers = {

modules/sfp_spider.py

@@ -243,7 +243,7 @@ def linkNotify(self, url: str, parentEvent=None):
         else:
             utype = "LINKED_URL_EXTERNAL"
 
-        if type(url) != str:
+        if not isinstance(url, str):
             url = str(url, "utf-8", errors='replace')
         event = SpiderFootEvent(utype, url, self.__name__, parentEvent)
         self.notifyListeners(event)

modules/sfp_tldsearch.py

@@ -170,7 +170,7 @@ def handleEvent(self, event):
         # Look through all TLDs for the existence of this target keyword
         targetList = list()
         for tld in self.opts['_internettlds']:
-            if type(tld) != str:
+            if not isinstance(tld, str):
                 tld = str(tld.strip(), errors='ignore')
             else:
                 tld = tld.strip()

modules/sfp_xforce.py

@@ -134,10 +134,10 @@ def query(self, qry, querytype):
         xforce_url = "https://api.xforce.ibmcloud.com"
 
         api_key = self.opts['xforce_api_key']
-        if type(api_key) == str:
+        if isinstance(api_key, str):
             api_key = api_key.encode('utf-8')
         api_key_password = self.opts['xforce_api_key_password']
-        if type(api_key_password) == str:
+        if isinstance(api_key_password, str):
             api_key_password = api_key_password.encode('utf-8')
         token = base64.b64encode(api_key + ":".encode('utf-8') + api_key_password)
         headers = {