update

blackye · Jan 13, 2016 · afc9092 · afc9092
1 parent 60a4619
commit afc9092
Show file tree

Hide file tree

Showing 8 changed files with 1,152 additions and 4 deletions.
diff --git a/.idea/BkScanner.iml b/.idea/BkScanner.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Bin/lib/webscan/webscan_class_func.py b/Bin/lib/webscan/webscan_class_func.py
@@ -143,6 +143,9 @@ def __load_scan_dic(self, path_dic = path_dic, file_dic = file_dic):
         with open(file_dic, 'r') as file:
             self.file_dic = list(set([each.strip(' \r\n') for each in file.readlines()]))
             if self.webdomain: #域名形式 www.baidu.com.tar.gz
+                domain_list = urlparse(self.url).netloc.split(".")
+                prefix_domain = domain_list[0]
+                self.file_dic.extend(['%s%s' % (prefix_domain, webfile) for webfile in dir_exts])
                 self.file_dic.extend(['%s%s' % (urlparse(self.url).netloc, webfile) for webfile in dir_exts])
         file.close()
 
@@ -426,9 +429,6 @@ def __webfile_crawler_work(self, file_suffix):
         探测完整web文件
         :return:
         '''
-        if len(self.exist_file_cache_list) != 0:
-            print len(self.exist_file_cache_list)
-
         # bug ---2015-12-23 -- 这里需要一个锁机制
         if len(self.exist_file_cache_list) < self.vaild_threshold['file']:  #如果该目录任何文件访问都一样，则停止访问
 

diff --git a/Plugins/SystemVul/workplugin.py b/Plugins/SystemVul/workplugin.py
@@ -57,7 +57,7 @@ def Work():
                 sysvulplugin.wait_for_complete(taskid)
             break
 
-    logger.info('[SytemVul exit] systemvul scan over, exit!')
+    logger.info('[SystemVul exit] systemvul scan over, exit!')
     #扫描完成
     sys.exit()
 

diff --git a/UnitTest/proxy_scan.py b/UnitTest/proxy_scan.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env/python
+#-*- coding:utf-8 -*-
+
+__author__ = 'BlackYe.'
+
+