CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

fix: [IPAdress module] empty queue if no IP ranges provided

pull/604/head
Terrtia 2023-06-19 15:17:41 +02:00
parent b64c70e0cd
commit c02b9f2a81
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/modules/IPAddress.py
View File

@ -43,14 +43,15 @@ class IPAddress(AbstractModule):
networks = config_loader.get_config_str("IP", "networks") networks = config_loader.get_config_str("IP", "networks")
if not networks: if not networks:
print('No IP ranges provided') print('No IP ranges provided')
sys.exit(0) # sys.exit(0)
try: else:
for network in networks.split(","): try:
self.ip_networks.add(IPv4Network(network)) for network in networks.split(","):
print(f'IP Range To Search: {network}') self.ip_networks.add(IPv4Network(network))
except: print(f'IP Range To Search: {network}')
print('Please provide a list of valid IP addresses') except:
sys.exit(0) print('Please provide a list of valid IP addresses')
sys.exit(0)
self.re_ipv4 = r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)' self.re_ipv4 = r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
re.compile(self.re_ipv4) re.compile(self.re_ipv4)
@ -62,6 +63,9 @@ class IPAddress(AbstractModule):
self.logger.info(f"Module {self.module_name} initialized") self.logger.info(f"Module {self.module_name} initialized")
def compute(self, message, r_result=False): def compute(self, message, r_result=False):
if not self.ip_networks:
return None
item = Item(message) item = Item(message)
content = item.get_content() content = item.get_content()