minor update

stamparm · stamparm · commit 6fd8602f014d · 2011-05-29T23:33:34.000Z
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
@@ -341,13 +341,19 @@ def errorThread():
 
                             output = __errorFields(expression, expressionFields, expressionFieldsList, expected, num, resumeValue)
 
+                            if not kb.threadContinue:
+                                break
+
                             if output and isinstance(output, list) and len(output) == 1:
                                 output = output[0]
 
                             kb.locks.outputs.acquire()
                             threadData.shared.outputs.append(output)
                             kb.locks.outputs.release()
+
                     except KeyboardInterrupt:
+                        kb.threadContinue = False
+                        kb.threadException = True
                         raise
 
                 runThreads(numThreads, errorThread)
diff --git a/lib/techniques/inband/union/use.py b/lib/techniques/inband/union/use.py
@@ -273,46 +273,55 @@ def unionUse(expression, unpack=True, dump=False):
                 threadData.shared.value = ""
 
                 def unionThread():
-                    threadData = getCurrentThreadData()
-
-                    while threadData.shared.limits and kb.threadContinue:
-                        kb.locks.limits.acquire()
-                        num = threadData.shared.limits[-1]
-                        del threadData.shared.limits[-1]
-                        kb.locks.limits.release()
-
-                        if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
-                            field = expressionFieldsList[0]
-                        elif Backend.isDbms(DBMS.ORACLE):
-                            field = expressionFieldsList
-                        else:
-                            field = None
-
-                        limitedExpr = agent.limitQuery(num, expression, field)
-                        output = resume(limitedExpr, None)
-
-                        if not output:
-                            output = __oneShotUnionUse(limitedExpr, unpack)
-
-                        if output:
-                            kb.locks.value.acquire()
-                            threadData.shared.value += output
-                            kb.locks.value.release()
-
-                            if conf.verbose == 1:
-                                if all(map(lambda x: x in output, [kb.misc.start, kb.misc.stop])):
-                                    items = extractRegexResult(r'%s(?P<result>.*?)%s' % (kb.misc.start, kb.misc.stop), output, re.DOTALL | re.IGNORECASE).split(kb.misc.delimiter)
-                                else:
-                                    items = output.replace(kb.misc.start, "").replace(kb.misc.stop, "").split(kb.misc.delimiter)
-
-                                status = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), safecharencode(",".join(map(lambda x: "\"%s\"" % x, items))))
-
-                                if len(status) > width:
-                                    status = "%s..." % status[:width - 3]
-
-                                kb.locks.ioLock.acquire()
-                                dataToStdout(status, True)
-                                kb.locks.ioLock.release()
+                    try:
+                        threadData = getCurrentThreadData()
+
+                        while threadData.shared.limits and kb.threadContinue:
+                            kb.locks.limits.acquire()
+                            num = threadData.shared.limits[-1]
+                            del threadData.shared.limits[-1]
+                            kb.locks.limits.release()
+
+                            if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
+                                field = expressionFieldsList[0]
+                            elif Backend.isDbms(DBMS.ORACLE):
+                                field = expressionFieldsList
+                            else:
+                                field = None
+
+                            limitedExpr = agent.limitQuery(num, expression, field)
+                            output = resume(limitedExpr, None)
+
+                            if not output:
+                                output = __oneShotUnionUse(limitedExpr, unpack)
+
+                            if not kb.threadContinue:
+                                break
+
+                            if output:
+                                kb.locks.value.acquire()
+                                threadData.shared.value += output
+                                kb.locks.value.release()
+
+                                if conf.verbose == 1:
+                                    if all(map(lambda x: x in output, [kb.misc.start, kb.misc.stop])):
+                                        items = extractRegexResult(r'%s(?P<result>.*?)%s' % (kb.misc.start, kb.misc.stop), output, re.DOTALL | re.IGNORECASE).split(kb.misc.delimiter)
+                                    else:
+                                        items = output.replace(kb.misc.start, "").replace(kb.misc.stop, "").split(kb.misc.delimiter)
+
+                                    status = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), safecharencode(",".join(map(lambda x: "\"%s\"" % x, items))))
+
+                                    if len(status) > width:
+                                        status = "%s..." % status[:width - 3]
+
+                                    kb.locks.ioLock.acquire()
+                                    dataToStdout(status, True)
+                                    kb.locks.ioLock.release()
+
+                    except KeyboardInterrupt:
+                        kb.threadContinue = False
+                        kb.threadException = True
+                        raise
 
                 runThreads(numThreads, unionThread)
 
