终端显示成功个数

README.md

@@ -131,5 +131,5 @@ w13scan是一款插件化基于流量分析的扫描器，通过编写插件它
     * [ ] 主动引擎批量fuzz 时间的优化
     * [ ] 一些FUZZ插件的编写
     * [ ] 对命令行的支持，控制台的颜色等等
-    * [ ] 终端进度条显示结果个数
+    * [x] 终端进度条显示结果个数
     * [ ] URL去重算法对时间参数的过滤

lib/const.py

@@ -16,6 +16,7 @@
     '.pl',
     '.cgi',
     '.jsp', '.jhtml', '.jhtm', '.jws',
+    '.htm', '.html',
     '.do', ''
 ]
 

lib/controller.py

@@ -10,6 +10,7 @@
 
 from config import THREAD_NUM
 from lib.data import logger, KB, Share
+from lib.output import out
 
 
 def exception_handled_function(thread_function, args=()):
@@ -25,7 +26,6 @@ def exception_handled_function(thread_function, args=()):
 def run_threads(num_threads, thread_function, args: tuple = ()):
     threads = []
 
-
     try:
         info_msg = "Staring {0} threads".format(num_threads)
         logger.info(info_msg)
@@ -83,10 +83,7 @@ def task_run():
         KB["lock"].release()
         poc_module = copy.deepcopy(KB["registered"][poc_module_name])
 
-        try:
-            poc_module.execute(request, response)
-        except:
-            pass
+        poc_module.execute(request, response)
 
         KB["lock"].acquire()
         KB["finished"] += 1
@@ -99,11 +96,11 @@ def task_run():
 
 
 def printProgress():
-    msg = '%s running | %s remaining | %s scanned in %.2f seconds' % (
-        KB["running"], KB["task_queue"].qsize(), KB["finished"], time.time() - KB['start_time'])
+    msg = '%s success | %s remaining | %s scanned in %.2f seconds' % (
+        out.count(), KB["task_queue"].qsize(), KB["finished"], time.time() - KB['start_time'])
 
-    out = '\r' + ' ' * (KB['console_width'][0] - len(msg)) + msg
-    Share.dataToStdout(out)
+    _ = '\r' + ' ' * (KB['console_width'][0] - len(msg)) + msg
+    Share.dataToStdout(_)
 
 
 def task_push(plugin_type, request, response):

lib/output.py

@@ -4,10 +4,10 @@
 # @Author  : w8ay
 # @File    : output.py
 
-from lib.controller import printProgress
-from lib.data import Share, KB
 from threading import Lock
 
+from lib.data import Share, KB
+
 
 class OutPut(object):
 
@@ -66,7 +66,6 @@ def success(self, url, plugin='unknown', **kw):
                 self.log(" ")
                 index += 1
         self.lock.release()
-        printProgress()
 
     def log(self, msg):
         width = KB["console_width"][0]