laramies/theHarvester
1
1
Fork 0
mirror of https://github.com/laramies/theHarvester.git synced 2025-02-26 07:23:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix type hints

Browse source
This commit is contained in:
David Mougeolle 2020-03-20 17:56:14 +01:00
parent 1b7adaf90a
commit 55fc10bee0
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
theHarvester/discovery/dnssearch.py
View file

@ -14,7 +14,7 @@
from aiodns import DNSResolver from aiodns import DNSResolver
from ipaddress import IPv4Network from ipaddress import IPv4Network
from typing import Awaitable, Callable, Iterable, List from typing import Awaitable, Callable, List
# TODO: need big focus on performance and results parsing, now does the basic. # TODO: need big focus on performance and results parsing, now does the basic.
@ -95,14 +95,16 @@ def serialize_ip_range(
The network OSI address, like '192.168.0.0/24'. The network OSI address, like '192.168.0.0/24'.
""" """
__ip_matches = re.search(NETWORK_REGEX, ip, re.IGNORECASE) __ip_matches = re.search(NETWORK_REGEX, ip, re.IGNORECASE)
__ip = __ip_matches.group(1) if __ip_matches and __ip_matches.groups():
__netmask = netmask if netmask else __ip_matches.group(3) __ip = __ip_matches.group(1)
if __ip and __netmask: __netmask = netmask if netmask else __ip_matches.group(3)
return str(IPv4Network('{}/{}'.format(__ip, __netmask), strict=False)) if __ip and __netmask:
elif __ip: return str(IPv4Network('{}/{}'.format(__ip, __netmask), strict=False))
return str(IPv4Network('{}/{}'.format(__ip, '24'), strict=False)) elif __ip:
else: # invalid input ip return str(IPv4Network('{}/{}'.format(__ip, '24'), strict=False))
return ''
# invalid input ip
return ''
def list_ips_in_network_range( def list_ips_in_network_range(
@ -130,7 +132,7 @@ def list_ips_in_network_range(
async def reverse_single_ip( async def reverse_single_ip(
ip: str, ip: str,
resolver: DNSResolver) -> Awaitable[str]: resolver: DNSResolver) -> str:
""" """
Reverse a single IP and output the linked CNAME, if it exists. Reverse a single IP and output the linked CNAME, if it exists.
@ -222,7 +224,7 @@ def log_result(
def generate_postprocessing_callback( def generate_postprocessing_callback(
target: str, target: str,
**iters: Iterable[str]) -> Callable: **allhosts: List[str]) -> Callable:
""" """
Postprocess the query results asynchronously too, instead of waiting for Postprocess the query results asynchronously too, instead of waiting for
the querying stage to be completely finished. the querying stage to be completely finished.
@ -231,7 +233,7 @@ def generate_postprocessing_callback(
---------- ----------
target: str. target: str.
The domain wanted as TLD. The domain wanted as TLD.
iters: Iterable. allhosts: List.
A collection of all the subdomains -of target- found so far. A collection of all the subdomains -of target- found so far.
Returns Returns
@ -242,8 +244,8 @@ def generate_postprocessing_callback(
""" """
def append_matching_hosts(host: str) -> None: def append_matching_hosts(host: str) -> None:
if host and target in host: if host and target in host:
for __name, __iter in iters.items(): for __name, __hosts in allhosts.items():
if host not in __iter: if host not in __hosts:
__iter.append(host) __hosts.append(host)
return append_matching_hosts return append_matching_hosts