Fix for an Issue #485 (failing back to single-thread mode if over som…

…e bisection length)
andresriancho · Jul 9, 2013 · be5ce76 · be5ce76
1 parent d7c0805
commit be5ce76
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -481,6 +481,9 @@
 # Maximum response total page size (trimmed if larger)
 MAX_CONNECTION_TOTAL_SIZE = 100 * 1024 * 1024
 
+# Maximum (multi-threaded) length of entry in bisection algorithm
+MAX_BISECTION_LENGTH = 50 * 1024 * 1024
+
 # Mark used for trimming unnecessary content in large chunks
 LARGE_CHUNK_TRIM_MARKER = "__TRIMMED_CONTENT__"
 

diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -40,6 +40,7 @@
 from lib.core.settings import INFERENCE_GREATER_CHAR
 from lib.core.settings import INFERENCE_EQUALS_CHAR
 from lib.core.settings import INFERENCE_NOT_EQUALS_CHAR
+from lib.core.settings import MAX_BISECTION_LENGTH
 from lib.core.settings import MAX_TIME_REVALIDATION_STEPS
 from lib.core.settings import PARTIAL_HEX_VALUE_MARKER
 from lib.core.settings import PARTIAL_VALUE_MARKER
@@ -135,6 +136,9 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
         if length and (lastChar > 0 or firstChar > 0):
             length = min(length, lastChar or length) - firstChar
 
+        if length and length > MAX_BISECTION_LENGTH:
+            length = None
+
         showEta = conf.eta and isinstance(length, int)
         numThreads = min(conf.threads, length)