Skip to content

SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.

fix: decode result of 'encode('raw_unicode_escape')'

Amr Awadaebe6b66db2a
diff --git a/modules/sfp_citadel.py b/modules/sfp_citadel.py
index 386d68f8..1b5f1329 100644
--- a/modules/sfp_citadel.py
+++ b/modules/sfp_citadel.py
@@ -57,7 +57,7 @@ class sfp_citadel(SpiderFootPlugin):
apikey = "3edfb5603418f101926c64ca5dd0e409"
params = {
- 'query': email.encode('raw_unicode_escape'),
+ 'query': email.encode('raw_unicode_escape').decode("ascii"),
'type': 'email_address',
'key': apikey
}
diff --git a/modules/sfp_crt.py b/modules/sfp_crt.py
index 2a3f40da..9b4e396f 100644
--- a/modules/sfp_crt.py
+++ b/modules/sfp_crt.py
@@ -62,7 +62,7 @@ class sfp_crt(SpiderFootPlugin):
self.sf.debug("Received event, " + eventName + ", from " + srcModuleName)
params = {
- 'q': '%.' + eventData,
+ 'q': '%.' + str(eventData),
'output': 'json'
}
diff --git a/modules/sfp_darksearch.py b/modules/sfp_darksearch.py
index b0460188..a27ed779 100644
--- a/modules/sfp_darksearch.py
+++ b/modules/sfp_darksearch.py
@@ -52,7 +52,7 @@ class sfp_darksearch(SpiderFootPlugin):
# https://darksearch.io/apidoc
def query(self, qry, page):
params = {
- 'query': '"' + qry.encode('raw_unicode_escape') + '"',
+ 'query': '"' + qry.encode('raw_unicode_escape').decode("ascii") + '"',
'page': str(page)
}
diff --git a/modules/sfp_fringeproject.py b/modules/sfp_fringeproject.py
index 3c526022..40824c3f 100644
--- a/modules/sfp_fringeproject.py
+++ b/modules/sfp_fringeproject.py
@@ -45,7 +45,7 @@ class sfp_fringeproject(SpiderFootPlugin):
def query(self, qry):
params = {
- 'q': qry.encode('raw_unicode_escape')
+ 'q': qry.encode('raw_unicode_escape').decode("ascii")
}
res = self.sf.fetchUrl('https://api.fringeproject.com/api/search?' + urllib.parse.urlencode(params),
diff --git a/modules/sfp_fsecure_riddler.py b/modules/sfp_fsecure_riddler.py
index 868fbceb..82e83a4b 100644
--- a/modules/sfp_fsecure_riddler.py
+++ b/modules/sfp_fsecure_riddler.py
@@ -54,8 +54,8 @@ class sfp_fsecure_riddler(SpiderFootPlugin):
# https://riddler.io/help/api
def login(self):
params = {
- 'email': self.opts['username'].encode('raw_unicode_escape'),
- 'password': self.opts['password'].encode('raw_unicode_escape')
+ 'email': self.opts['username'].encode('raw_unicode_escape').decode("ascii"),
+ 'password': self.opts['password'].encode('raw_unicode_escape').decode("ascii")
}
headers = {
'Content-Type': 'application/json',
@@ -95,7 +95,7 @@ class sfp_fsecure_riddler(SpiderFootPlugin):
# https://riddler.io/help/search
def query(self, qry):
params = {
- 'query': qry.encode('raw_unicode_escape')
+ 'query': qry.encode('raw_unicode_escape').decode("ascii")
}
headers = {
'Authentication-Token': self.token,
diff --git a/modules/sfp_numverify.py b/modules/sfp_numverify.py
index 6278a744..f8b906ff 100644
--- a/modules/sfp_numverify.py
+++ b/modules/sfp_numverify.py
@@ -54,7 +54,7 @@ class sfp_numverify(SpiderFootPlugin):
number = qry.strip('+').strip('(').strip(')')
params = {
- 'number': number.encode('raw_unicode_escape'),
+ 'number': number.encode('raw_unicode_escape').decode("ascii"),
'country_code': '',
'format': '0', # set to "1" for prettified debug output
'access_key': self.opts['api_key']
diff --git a/modules/sfp_onionsearchengine.py b/modules/sfp_onionsearchengine.py
index a0782a81..7baf801e 100644
--- a/modules/sfp_onionsearchengine.py
+++ b/modules/sfp_onionsearchengine.py
@@ -73,7 +73,7 @@ class sfp_onionsearchengine(SpiderFootPlugin):
return None
params = {
- 'search': '"' + eventData.encode('raw_unicode_escape') + '"',
+ 'search': '"' + eventData.encode('raw_unicode_escape').decode("ascii") + '"',
'submit': 'Search',
'page': str(page)
}
diff --git a/modules/sfp_openstreetmap.py b/modules/sfp_openstreetmap.py
index aae71021..8e0f9e2a 100644
--- a/modules/sfp_openstreetmap.py
+++ b/modules/sfp_openstreetmap.py
@@ -47,7 +47,7 @@ class sfp_openstreetmap(SpiderFootPlugin):
# https://operations.osmfoundation.org/policies/nominatim/
def query(self, qry):
params = {
- 'q': qry.encode('raw_unicode_escape'),
+ 'q': qry.encode('raw_unicode_escape').decode("ascii"),
'format': 'json',
'polygon': '0',
'addressdetails': '0'
diff --git a/modules/sfp_pulsedive.py b/modules/sfp_pulsedive.py
index 38f8b2aa..d2099cb4 100644
--- a/modules/sfp_pulsedive.py
+++ b/modules/sfp_pulsedive.py
@@ -73,7 +73,7 @@ class sfp_pulsedive(SpiderFootPlugin):
# https://pulsedive.com/api/
def query(self, qry):
params = {
- 'indicator': qry.encode('raw_unicode_escape'),
+ 'indicator': qry.encode('raw_unicode_escape').decode("ascii"),
'key': self.opts['api_key']
}
diff --git a/modules/sfp_scylla.py b/modules/sfp_scylla.py
index ba3f9cb4..a7d18006 100644
--- a/modules/sfp_scylla.py
+++ b/modules/sfp_scylla.py
@@ -53,7 +53,7 @@ class sfp_scylla(SpiderFootPlugin):
# Query Scylla API
def query(self, qry, per_page=20, start=0):
params = {
- 'q': 'Email:@' + qry.encode('raw_unicode_escape'),
+ 'q': 'Email:@' + qry.encode('raw_unicode_escape').decode("ascii"),
'num': str(per_page),
'from': str(start)
}
diff --git a/modules/sfp_shodan.py b/modules/sfp_shodan.py
index 4be4e4d6..3711a946 100644
--- a/modules/sfp_shodan.py
+++ b/modules/sfp_shodan.py
@@ -92,7 +92,7 @@ class sfp_shodan(SpiderFootPlugin):
def searchHtml(self, qry):
params = {
- 'query': 'http.html:"' + qry.encode('raw_unicode_escape') + '"',
+ 'query': 'http.html:"' + qry.encode('raw_unicode_escape').decode("ascii") + '"',
'key': self.opts['api_key']
}
diff --git a/modules/sfp_ssltools.py b/modules/sfp_ssltools.py
index 0b0f1fef..43fda691 100644
--- a/modules/sfp_ssltools.py
+++ b/modules/sfp_ssltools.py
@@ -58,7 +58,7 @@ class sfp_ssltools(SpiderFootPlugin):
# Query SSL Tools for DNS
def queryDns(self, domain):
params = {
- 'url': domain.encode('raw_unicode_escape')
+ 'url': domain.encode('raw_unicode_escape').decode("ascii")
}
headers = { 'Content-Type': 'application/x-www-form-urlencoded' }
@@ -86,7 +86,7 @@ class sfp_ssltools(SpiderFootPlugin):
# Query SSL Tools for certificate information
def queryScan(self, domain, port):
params = {
- 'url': domain.encode('raw_unicode_escape'),
+ 'url': domain.encode('raw_unicode_escape').decode("ascii"),
'path': '/',
'port': str(port),
'live_scan': 'true'
diff --git a/modules/sfp_urlscan.py b/modules/sfp_urlscan.py
index 6340cb61..dea0ee6e 100644
--- a/modules/sfp_urlscan.py
+++ b/modules/sfp_urlscan.py
@@ -48,7 +48,7 @@ class sfp_urlscan(SpiderFootPlugin):
# https://urlscan.io/about-api/
def query(self, qry):
params = {
- 'q': 'domain:' + qry.encode('raw_unicode_escape')
+ 'q': 'domain:' + qry.encode('raw_unicode_escape').decode("ascii")
}
res = self.sf.fetchUrl('https://urlscan.io/api/v1/search/?' + urllib.parse.urlencode(params),