AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-30 09:47:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/CIRCL/AIL-framework

Browse source
This commit is contained in:
Terrtia 2019-05-24 13:27:44 +02:00
commit 4b0a7210b8
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/Crawler.py
View file

@ -12,6 +12,7 @@ import time
import subprocess import subprocess
import requests import requests
from collections import deque
from pyfaup.faup import Faup from pyfaup.faup import Faup
sys.path.append(os.environ['AIL_BIN']) sys.path.append(os.environ['AIL_BIN'])
@ -303,7 +304,7 @@ if __name__ == '__main__':
#mode = sys.argv[1] #mode = sys.argv[1]
splash_port = sys.argv[1] splash_port = sys.argv[1]
rotation_mode = ['onion', 'regular'] rotation_mode = deque(['onion', 'regular'])
default_proto_map = {'http': 80, 'https': 443} default_proto_map = {'http': 80, 'https': 443}
######################################################## add ftp ??? ######################################################## add ftp ???
@ -361,6 +362,7 @@ if __name__ == '__main__':
update_auto_crawler() update_auto_crawler()
rotation_mode.rotate()
to_crawl = get_elem_to_crawl(rotation_mode) to_crawl = get_elem_to_crawl(rotation_mode)
if to_crawl: if to_crawl:
url_data = unpack_url(to_crawl['url']) url_data = unpack_url(to_crawl['url'])

8
bin/packages/Paste.py
View file

@ -125,7 +125,15 @@ class Paste(object):
""" """
try:
paste = self.cache.get(self.p_path) paste = self.cache.get(self.p_path)
except UnicodeDecodeError:
paste = None
except Exception as e:
print("ERROR in: " + self.p_path)
print(e)
paste = None
if paste is None: if paste is None:
try: try:
with gzip.open(self.p_path, 'r') as f: with gzip.open(self.p_path, 'r') as f: