AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-09-20 07:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: [Tools] fix loop

Browse source
This commit is contained in:
Terrtia 2019-09-25 23:48:30 +02:00
parent 4faba001cf
commit b9c9187e3e
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/Tools.py
View file

@ -40,7 +40,7 @@ def search_tools(item_id, item_content):
regex_match = False regex_match = False
for regex_nb in list(range(tool_dict['nb_regex'])): for regex_nb in list(range(tool_dict['nb_regex'])):
regex_index = tool_dict['nb_regex'] + 1 regex_index = regex_nb + 1
regex = tool_dict['regex{}'.format(regex_index)] regex = tool_dict['regex{}'.format(regex_index)]
signal.alarm(tool_dict['max_execution_time']) signal.alarm(tool_dict['max_execution_time'])
@ -61,13 +61,12 @@ def search_tools(item_id, item_content):
else: else:
regex_match = True regex_match = True
if 'tag{}'.format(regex_index) in tool_dict: if 'tag{}'.format(regex_index) in tool_dict:
print('{} found: {}'.format(item_id, tool_dict['tag{}'.format(regex_index)]))
msg = '{};{}'.format(tool_dict['tag{}'.format(regex_index)], item_id) msg = '{};{}'.format(tool_dict['tag{}'.format(regex_index)], item_id)
else: p.populate_set_out(msg, 'Tags')
msg = '{};{}'.format(tool_dict['tag'], item_id)
p.populate_set_out(msg, 'Tags') if regex_match:
print('{} found: {}'.format(item_id, tool_dict['name']))
if tools_found:
# Tag Item # Tag Item
msg = '{};{}'.format(tool_dict['tag'], item_id) msg = '{};{}'.format(tool_dict['tag'], item_id)
p.populate_set_out(msg, 'Tags') p.populate_set_out(msg, 'Tags')
@ -205,6 +204,7 @@ if __name__ == "__main__":
while True: while True:
# Get one message from the input queue # Get one message from the input queue
item_id = p.get_from_set() item_id = p.get_from_set()
item_id = 'submitted/2019/09/25/4c299ce1-0147-4727-8030-d77f903a9774.gz'
if item_id is None: if item_id is None:
publisher.debug("{} queue is empty, waiting".format(config_section)) publisher.debug("{} queue is empty, waiting".format(config_section))
time.sleep(1) time.sleep(1)

4
bin/packages/modules.cfg
View file

@ -30,6 +30,10 @@ publish = Redis_Tags
subscribe = Redis_Global subscribe = Redis_Global
publish = Redis_Tags publish = Redis_Tags
[Tools]
subscribe = Redis_Global
publish = Redis_Tags
[Categ] [Categ]
subscribe = Redis_Global subscribe = Redis_Global
publish = Redis_CreditCards,Redis_Mail,Redis_Onion,Redis_Web,Redis_Credential,Redis_SourceCode,Redis_Cve,Redis_ApiKey publish = Redis_CreditCards,Redis_Mail,Redis_Onion,Redis_Web,Redis_Credential,Redis_SourceCode,Redis_Cve,Redis_ApiKey