Skip to content

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

sflib: move resolveTargets function to sfp_dnsresolve (#1384)

bcoles33fe1996eafd
diff --git a/modules/sfp_dnsresolve.py b/modules/sfp_dnsresolve.py
index 4f04618a..ce0660f4 100644
--- a/modules/sfp_dnsresolve.py
+++ b/modules/sfp_dnsresolve.py
@@ -63,7 +63,7 @@ class sfp_dnsresolve(SpiderFootPlugin):
ret = list()
# If it's an IP, get the hostname it reverse resolves to
self.sf.info("Identifying aliases for specified target(s)")
- ret = self.sf.resolveTargets(target, self.opts['validatereverse'])
+ ret = self.resolveTargets(target, self.opts['validatereverse'])
if not ret:
return target
@@ -86,10 +86,69 @@ class sfp_dnsresolve(SpiderFootPlugin):
# dom = self.sf.hostDomain(host, self.opts['_internettlds'])
# target.setAlias(dom, "INTERNET_NAME")
- self.sf.info("Aliases identified: " + str(target.targetAliases))
+ self.sf.info(f"Target aliases identified: {target.targetAliases}")
return target
+ def resolveTargets(self, target, validateReverse: bool) -> list:
+ """Resolve alternative names for a given target.
+
+ Args:
+ target (SpiderFootTarget): target object
+ validateReverse (bool): validate domain names resolve
+
+ Returns:
+ list: list of domain names and IP addresses
+ """
+ ret = list()
+
+ if not target:
+ return ret
+
+ t = target.targetType
+ v = target.targetValue
+
+ if t in ["IP_ADDRESS", "IPV6_ADDRESS"]:
+ r = self.sf.resolveIP(v)
+ if r:
+ ret.extend(r)
+ if t == "INTERNET_NAME":
+ r = self.sf.resolveHost(v)
+ if r:
+ ret.extend(r)
+ r = self.sf.resolveHost6(v)
+ if r:
+ ret.extend(r)
+ if t == "NETBLOCK_OWNER":
+ for addr in IPNetwork(v):
+ if self.checkForStop():
+ return list(set(ret))
+
+ ipaddr = str(addr)
+ if ipaddr.split(".")[3] in ['255', '0']:
+ continue
+
+ if '255' in ipaddr.split("."):
+ continue
+
+ ret.append(ipaddr)
+
+ # Add the reverse-resolved hostnames as aliases too
+ names = self.sf.resolveIP(ipaddr)
+ if not names:
+ continue
+
+ if not validateReverse:
+ ret.extend(names)
+ continue
+
+ for host in names:
+ chk = self.sf.resolveHost(host)
+ if chk and ipaddr in chk:
+ ret.append(host)
+
+ return list(set(ret))
+
# What events is this module interested in for input
def watchedEvents(self):
return [
diff --git a/sflib.py b/sflib.py
index 9a748ea4..660aa01d 100644
--- a/sflib.py
+++ b/sflib.py
@@ -1178,57 +1178,6 @@ class SpiderFoot:
return False
- def resolveTargets(self, target, validateReverse: bool) -> list:
- """Resolve alternative names for a given target.
-
- Args:
- target (SpiderFootTarget): target object
- validateReverse (bool): validate domain names resolve
-
- Returns:
- list: list of domain names and IP addresses
- """
- ret = list()
-
- if not target:
- return ret
-
- t = target.targetType
- v = target.targetValue
-
- if t in ["IP_ADDRESS", "IPV6_ADDRESS"]:
- r = self.resolveIP(v)
- if r:
- ret.extend(r)
- if t == "INTERNET_NAME":
- r = self.resolveHost(v)
- if r:
- ret.extend(r)
- r = self.resolveHost6(v)
- if r:
- ret.extend(r)
- if t == "NETBLOCK_OWNER":
- for addr in netaddr.IPNetwork(v):
- ipaddr = str(addr)
- if ipaddr.split(".")[3] in ['255', '0']:
- continue
- if '255' in ipaddr.split("."):
- continue
- ret.append(ipaddr)
-
- # Add the reverse-resolved hostnames as aliases too..
- names = self.resolveIP(ipaddr)
- if names:
- if validateReverse:
- for host in names:
- chk = self.resolveHost(host)
- if chk:
- if ipaddr in chk:
- ret.append(host)
- else:
- ret.extend(names)
- return list(set(ret))
-
def safeSocket(self, host: str, port: int, timeout: int) -> 'ssl.SSLSocket':
"""Create a safe socket that's using SOCKS/TOR if it was enabled.
diff --git a/test/unit/modules/test_sfp_dnsresolve.py b/test/unit/modules/test_sfp_dnsresolve.py
index c76b1a26..1f06504f 100644
--- a/test/unit/modules/test_sfp_dnsresolve.py
+++ b/test/unit/modules/test_sfp_dnsresolve.py
@@ -52,6 +52,46 @@ class TestModuleDnsResolve(unittest.TestCase):
self.assertEqual(result.targetType, target_type)
self.assertEqual(result.targetValue, target_value)
+ def test_resolveTargets_should_return_list(self):
+ """
+ Test resolveTargets(self, target, validateReverse)
+ """
+ sf = SpiderFoot(self.default_options)
+
+ module = sfp_dnsresolve()
+ module.setup(sf, dict())
+
+ target_value = 'spiderfoot.net'
+ target_type = 'INTERNET_NAME'
+ target = SpiderFootTarget(target_value, target_type)
+ module.setTarget(target)
+
+ invalid_types = [None, "", list(), dict()]
+ for invalid_type in invalid_types:
+ with self.subTest(invalid_type=invalid_type):
+ resolve_targets = module.resolveTargets(invalid_type, False)
+ self.assertIsInstance(resolve_targets, list)
+
+ target = SpiderFootTarget("spiderfoot.net", "INTERNET_NAME")
+ resolve_targets = module.resolveTargets(target, False)
+ self.assertIsInstance(resolve_targets, list)
+ self.assertIn('spiderfoot.net', resolve_targets)
+
+ target = SpiderFootTarget("127.0.0.1", "IP_ADDRESS")
+ resolve_targets = module.resolveTargets(target, False)
+ self.assertIsInstance(resolve_targets, list)
+ self.assertIn('127.0.0.1', resolve_targets)
+
+ target = SpiderFootTarget("::1", "IPV6_ADDRESS")
+ resolve_targets = module.resolveTargets(target, False)
+ self.assertIsInstance(resolve_targets, list)
+ self.assertIn('::1', resolve_targets)
+
+ target = SpiderFootTarget("127.0.0.1/32", "NETBLOCK_OWNER")
+ resolve_targets = module.resolveTargets(target, False)
+ self.assertIsInstance(resolve_targets, list)
+ self.assertIn('127.0.0.1', resolve_targets)
+
@unittest.skip("CI tests fail on MacOSX")
def test_handleEvent_event_data_ip_address_should_return_internet_name_event(self):
sf = SpiderFoot(self.default_options)
diff --git a/test/unit/test_spiderfoot.py b/test/unit/test_spiderfoot.py
index 2af12c90..32934036 100644
--- a/test/unit/test_spiderfoot.py
+++ b/test/unit/test_spiderfoot.py
@@ -3,7 +3,6 @@ import pytest
import unittest
from sflib import SpiderFoot
-from spiderfoot import SpiderFootTarget
@pytest.mark.usefixtures
@@ -816,33 +815,6 @@ class TestSpiderFoot(unittest.TestCase):
self.assertIsInstance(validate_ip, bool)
self.assertTrue(validate_ip)
- def test_resolve_targets_should_return_list(self):
- """
- Test resolveTargets(self, target, validateReverse)
- """
- sf = SpiderFoot(self.default_options)
-
- invalid_types = [None, "", list()]
- for invalid_type in invalid_types:
- with self.subTest(invalid_type=invalid_type):
- resolve_targets = sf.resolveTargets(invalid_type, False)
- self.assertIsInstance(resolve_targets, list)
-
- target = SpiderFootTarget("spiderfoot.net", "INTERNET_NAME")
- resolve_targets = sf.resolveTargets(target, False)
- self.assertIsInstance(resolve_targets, list)
- self.assertIn('spiderfoot.net', resolve_targets)
-
- target = SpiderFootTarget("1.1.1.1", "IP_ADDRESS")
- resolve_targets = sf.resolveTargets(target, False)
- self.assertIsInstance(resolve_targets, list)
- self.assertIn('1.1.1.1', resolve_targets)
-
- target = SpiderFootTarget("127.0.0.1/32", "NETBLOCK_OWNER")
- resolve_targets = sf.resolveTargets(target, False)
- self.assertIsInstance(resolve_targets, list)
- self.assertIn('127.0.0.1', resolve_targets)
-
@unittest.skip("todo")
def test_safe_socket(self):
"""