Skip to content

Commit

Permalink
Improve type annotations in spiderfoot/target.py (#1777)
Browse files Browse the repository at this point in the history
* Improve type annotations in target.py

* Create `TargetAlias` for better typing

* Annotate `alias`

* Update documented types

* Simplify `TargetAlias` definition

* Use `typing.Dict` instead of `dict`

* Use `typing.List` instead of `list`

* Refactor `TargetAlias` to not use `Literal`

`typing.Literal` is not available in Python 3.7.

* Conditionally use `TypedDict`

* Describe version check

* Remove `TYPE_CHECKING` check
  • Loading branch information
RA80533 committed May 3, 2023
1 parent d7e91b0 commit d8f628b
Showing 1 changed file with 25 additions and 16 deletions.
41 changes: 25 additions & 16 deletions spiderfoot/target.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
import sys
import typing

import netaddr


if sys.version_info >= (3, 8): # PEP 589 support (TypedDict)
TargetAlias = typing.TypedDict("TargetAlias", {"type": str, "value": str})
else:
TargetAlias = typing.Dict[str, str]


class SpiderFootTarget():
"""SpiderFoot target.
Attributes:
validTypes (list): valid event types accepted as a target
validTypes (typing.List[str]): valid event types accepted as a target
targetType (str): target type
targetValue (str): target value
targetAliases (list): target aliases
targetAliases (typing.List[TargetAlias]): target aliases
"""

_validTypes = ["IP_ADDRESS", 'IPV6_ADDRESS', "NETBLOCK_OWNER", "NETBLOCKV6_OWNER", "INTERNET_NAME",
"EMAILADDR", "HUMAN_NAME", "BGP_AS_OWNER", 'PHONE_NUMBER', "USERNAME",
"BITCOIN_ADDRESS"]
_targetType = None
_targetValue = None
_targetAliases = list()
_targetType: str
_targetValue: str
_targetAliases: typing.List[TargetAlias]

def __init__(self, targetValue: str, typeName: str) -> None:
"""Initialize SpiderFoot target.
Expand Down Expand Up @@ -57,11 +66,11 @@ def targetValue(self, targetValue: str) -> None:
self._targetValue = targetValue

@property
def targetAliases(self) -> list:
def targetAliases(self) -> typing.List[TargetAlias]:
return self._targetAliases

@targetAliases.setter
def targetAliases(self, value: list) -> None:
def targetAliases(self, value: typing.List[TargetAlias]) -> None:
self._targetAliases = value

def setAlias(self, value: str, typeName: str) -> None:
Expand All @@ -88,39 +97,39 @@ def setAlias(self, value: str, typeName: str) -> None:
if not typeName:
return

alias = {'type': typeName, 'value': value.lower()}
alias: TargetAlias = {'type': typeName, 'value': value.lower()}

if alias in self.targetAliases:
return

self.targetAliases.append(alias)

def _getEquivalents(self, typeName: str) -> list:
def _getEquivalents(self, typeName: str) -> typing.List[str]:
"""Get all aliases of the specfied target data type.
Args:
typeName (str): Target data type
Returns:
list: target aliases
typing.List[str]: target aliases
"""
ret = list()
ret: typing.List[str] = list()
for item in self.targetAliases:
if item['type'] == typeName:
ret.append(item['value'].lower())
return ret

def getNames(self) -> list:
def getNames(self) -> typing.List[str]:
"""Get all domains associated with the target.
Returns:
list: domains associated with the target
typing.List[str]: domains associated with the target
"""
e = self._getEquivalents("INTERNET_NAME")
if self.targetType in ["INTERNET_NAME", "EMAILADDR"] and self.targetValue.lower() not in e:
e.append(self.targetValue.lower())

names = list()
names: typing.List[str] = list()
for name in e:
if isinstance(name, bytes):
names.append(name.decode("utf-8"))
Expand All @@ -129,11 +138,11 @@ def getNames(self) -> list:

return names

def getAddresses(self) -> list:
def getAddresses(self) -> typing.List[str]:
"""Get all IP subnet or IP address aliases associated with the target.
Returns:
list: List of IP subnets and addresses
typing.List[str]: List of IP subnets and addresses
"""
e = self._getEquivalents("IP_ADDRESS")
if self.targetType == "IP_ADDRESS":
Expand Down

0 comments on commit d8f628b

Please sign in to comment.