sharp tuning UNION tests even more

stamparm · stamparm · commit 95dea1fbf957 · 2011-05-28T08:06:19.000Z
diff --git a/lib/techniques/inband/union/test.py b/lib/techniques/inband/union/test.py
@@ -72,13 +72,6 @@ def __findUnionCharCount(comment, place, parameter, value, prefix, suffix, where
     ratios.pop(ratios.index(min_))
     ratios.pop(ratios.index(max_))
 
-    deviation = stdev(ratios)
-
-    if abs(max_ - min_) < MIN_STATISTICAL_RANGE:
-        kb.errorIsNone = popValue()
-        return None
-
-    lower, upper = average(ratios) - UNION_STDEV_COEFF * deviation, average(ratios) + UNION_STDEV_COEFF * deviation
     minItem, maxItem = None, None
 
     for item in items:
@@ -87,6 +80,20 @@ def __findUnionCharCount(comment, place, parameter, value, prefix, suffix, where
         elif item[1] == max_:
             maxItem = item
 
+    if all(map(lambda x: x == min_ and x != max_, ratios)):
+        return maxItem[0]
+
+    elif all(map(lambda x: x != min_ and x == max_, ratios)):
+        return minItem[0]
+
+    deviation = stdev(ratios)
+
+    if abs(max_ - min_) < MIN_STATISTICAL_RANGE:
+        kb.errorIsNone = popValue()
+        return None
+
+    lower, upper = average(ratios) - UNION_STDEV_COEFF * deviation, average(ratios) + UNION_STDEV_COEFF * deviation
+
     if min_ < lower:
         retVal = minItem[0]
 
