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

fix: [Cryptocurrency] fix import conflict

pull/421/head
Terrtia 2019-11-11 10:29:36 +01:00
parent 207ac776a8
commit c5510acb73
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/Cryptocurrencies.py
View File

@ -26,8 +26,8 @@ import redis
import signal import signal
sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages')) sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages'))
import Cryptocurrency
import Item import Item
import Cryptocurrency
class TimeoutException(Exception): class TimeoutException(Exception):

4
bin/lib/Domain.py
View File

@ -15,12 +15,14 @@ import random
sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages/')) sys.path.append(os.path.join(os.environ['AIL_BIN'], 'packages/'))
import Correlation import Correlation
from Cryptocurrency import cryptocurrency import Cryptocurrency
from Pgp import pgp from Pgp import pgp
import Decoded import Decoded
import Item import Item
import Tag import Tag
cryptocurrency = Cryptocurrency.cryptocurrency
sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/')) sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/'))
import ConfigLoader import ConfigLoader

2
var/www/blueprints/crawler_splash.py
View File

@ -69,7 +69,5 @@ def showDomain():
dict_domain['crawler_history'] = domain.get_domain_items_crawled(items_link=True, epoch=epoch, item_screenshot=True, item_tag=True) # # TODO: handle multiple port dict_domain['crawler_history'] = domain.get_domain_items_crawled(items_link=True, epoch=epoch, item_screenshot=True, item_tag=True) # # TODO: handle multiple port
dict_domain['crawler_history']['random_item'] = random.choice(dict_domain['crawler_history']['items']) dict_domain['crawler_history']['random_item'] = random.choice(dict_domain['crawler_history']['items'])
print(dict_domain)
return render_template("showDomain.html", dict_domain=dict_domain, bootstrap_label=bootstrap_label, return render_template("showDomain.html", dict_domain=dict_domain, bootstrap_label=bootstrap_label,
modal_add_tags=get_modal_add_tags(dict_domain['domain'], tag_type="domain")) modal_add_tags=get_modal_add_tags(dict_domain['domain'], tag_type="domain"))