From 535f44044dbebe90f077d41dbb3fe0104feab5c0 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Tue, 29 Jan 2019 09:46:03 +0100
Subject: [PATCH] fix: [Onion] add timeout signal

---
 bin/Onion.py                   | 36 +++++++++++++++++++++++++---------
 bin/packages/config.cfg.sample |  3 +++
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/bin/Onion.py b/bin/Onion.py
index 1f233fcf..e95b987a 100755
--- a/bin/Onion.py
+++ b/bin/Onion.py
@@ -29,10 +29,18 @@ import os
 import base64
 import subprocess
 import redis
+import signal
 import re
 
 from Helper import Process
 
+class TimeoutException(Exception):
+    pass
+
+def timeout_handler(signum, frame):
+    raise TimeoutException
+
+signal.signal(signal.SIGALRM, timeout_handler)
 
 def fetch(p, r_cache, urls, domains, path):
     failed = []
@@ -113,6 +121,8 @@ if __name__ == "__main__":
     message = p.get_from_set()
     prec_filename = None
 
+    max_execution_time = p.config.getint("Onion", "max_execution_time")
+
     # send to crawler:
     activate_crawler = p.config.get("Crawler", "activate_crawler")
     if activate_crawler == 'True':
@@ -140,16 +150,24 @@ if __name__ == "__main__":
                 urls = []
                 PST = Paste.Paste(filename)
 
-                for x in PST.get_regex(url_regex):
-                    print(x)
-                    # Extracting url with regex
-                    url, s, credential, subdomain, domain, host, port, \
-                        resource_path, query_string, f1, f2, f3, f4 = x
+                # max execution time on regex
+                signal.alarm(max_execution_time)
+                try:
+                    for x in PST.get_regex(url_regex):
+                        print(x)
+                        # Extracting url with regex
+                        url, s, credential, subdomain, domain, host, port, \
+                            resource_path, query_string, f1, f2, f3, f4 = x
 
-                    if '.onion' in url:
-                        print(url)
-                        domains_list.append(domain)
-                        urls.append(url)
+                        if '.onion' in url:
+                            print(url)
+                            domains_list.append(domain)
+                            urls.append(url)
+                except TimeoutException:
+                    encoded_list = []
+                    p.incr_module_timeout_statistic()
+                    print ("{0} processing timeout".format(PST.p_path))
+                    continue
 
                 '''
                 for x in PST.get_regex(i2p_regex):
diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample
index b5980766..ace656cc 100644
--- a/bin/packages/config.cfg.sample
+++ b/bin/packages/config.cfg.sample
@@ -68,6 +68,9 @@ minTopPassList=5
 [Curve]
 max_execution_time = 90
 
+[Onion]
+max_execution_time = 180
+
 [Base64]
 path = Base64/
 max_execution_time = 60