From 0b548386ddc6833eb94765d5ef3c0a91368a5514 Mon Sep 17 00:00:00 2001
From: zgjx <953870958@qq.com>
Date: Sat, 28 Sep 2019 15:57:17 +0800
Subject: [PATCH 1/3] add pyqt5_gui

---
 dirmap.ico                    | Bin 0 -> 16958 bytes
 dirmap_qtgui.py               | 160 ++++++++++++++++++++++++++++++++++
 lib/controller/bruter.py      |   4 +-
 requirement.txt               |   4 +-
 start_dirmap_no_console.vbs   |   2 +
 start_dirmap_with_console.vbs |   2 +
 6 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 dirmap.ico
 create mode 100644 dirmap_qtgui.py
 create mode 100644 start_dirmap_no_console.vbs
 create mode 100644 start_dirmap_with_console.vbs

diff --git a/dirmap.ico b/dirmap.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7d7a38e44f819638e228caf0f23bdce9c4031c0e
GIT binary patch
literal 16958
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

literal 0
HcmV?d00001

diff --git a/dirmap_qtgui.py b/dirmap_qtgui.py
new file mode 100644
index 0000000..56c7996
--- /dev/null
+++ b/dirmap_qtgui.py
@@ -0,0 +1,160 @@
+import sys
+import os
+
+from gevent import monkey
+monkey.patch_all()
+from PyQt5.QtWidgets import QMainWindow,QGridLayout,QLabel,QLineEdit,QPushButton,QTableWidget,QWidget,QDesktopWidget,QApplication,QTableWidgetItem
+from PyQt5.QtGui import QIcon,QColor
+from PyQt5.QtCore import QThread,Qt,pyqtSignal
+from gevent import monkey
+monkey.patch_all()
+from lib.controller.engine import run
+from lib.core.common import setPaths
+from lib.core.data import cmdLineOptions, conf, paths, tasks
+from lib.core.option import initOptions
+# from QCandyUi.CandyWindow import colorful
+from QCandyUi import CandyWindow
+# from lib.parse.cmdline import cmdLineParser
+
+class WorkThread(QThread):
+    stop = pyqtSignal()
+    update = pyqtSignal(str,str,str,str)
+    update_status =  pyqtSignal()
+
+    def __int__(self):
+        super(WorkThread, self).__init__()
+
+    def run(self):
+        run()
+        self.stop.emit()  # 循环完毕后发出信号
+
+# @colorful('blueGreen')
+class DirmapGUI(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        self.is_stop = True
+        self.initUI()
+
+    def initUI(self):
+        self.resize(1000, 600)
+        self.center()
+        self.setWindowTitle('Dirmap - PyQT')
+        self.setWindowIcon(QIcon('dirmap.ico'))
+
+        grid = QGridLayout()
+        # grid.setSpacing(10)
+        urlLable = QLabel('URL')
+        urlLable.setAlignment((Qt.AlignRight | Qt.AlignVCenter))
+        self.urlText = QLineEdit()
+        startButton = QPushButton("开始")
+        stopButton = QPushButton("结束")
+        startButton.clicked.connect(self.start_button_clicked)
+        stopButton.clicked.connect(self.stop_button_clicked)
+        self.status = self.statusBar()
+        self.status.showMessage("准备就绪,相关参数请自行修改配置文件,无需重启")
+
+        grid.addWidget(urlLable, 0, 0)
+        grid.addWidget(self.urlText, 0, 1, 1, 12)
+        grid.addWidget(startButton, 0, 13)
+        grid.addWidget(stopButton, 0, 14)
+
+        self.tableWidget = QTableWidget()  # 创建一个表格
+        # self.tableWidget.setRowCount(1)
+        self.tableWidget.setColumnCount(4)
+        self.tableWidget.setHorizontalHeaderLabels(['地址', '类型', '大小', '响应码'])
+
+        self.tableWidget.setColumnWidth(0, 570)
+        self.tableWidget.setColumnWidth(1, 200)
+        self.tableWidget.setEditTriggers(QTableWidget.NoEditTriggers)
+        self.tableWidget.horizontalHeader().setFixedHeight(30)
+        grid.addWidget(self.tableWidget, 2, 0, 1, 15)  # 把表格加入布局
+
+        wid_get = QWidget()
+        wid_get.setLayout(grid)
+        self.setCentralWidget(wid_get)
+
+        # self.setLayout(grid)
+        # self.show()
+
+    # 控制窗口显示在屏幕中心的方法
+    def center(self):
+        # 获得窗口
+        qr = self.frameGeometry()
+        # 获得屏幕中心点
+        cp = QDesktopWidget().availableGeometry().center()
+        # 显示到屏幕中心
+        qr.moveCenter(cp)
+        self.move(qr.topLeft())
+
+    def start_button_clicked(self):
+        if not conf.is_stop:
+            return
+        text = self.urlText.text()
+        if text == "": return
+        conf.is_stop = False
+        row_index = self.tableWidget.rowCount()
+        for i in range(row_index):
+            self.tableWidget.removeRow(0)
+
+        paths.ROOT_PATH = os.getcwd()
+        setPaths()
+        dicts = {'thread_num': 8, 'target_input': text, 'target_file': '', 'load_config_file': True,
+                 'debug': False}
+        cmdLineOptions.update(dicts)
+        initOptions(cmdLineOptions)
+        # run()
+        # self.stop_button_clicked()
+        self.workThread = WorkThread()
+        conf["thread"] = self.workThread
+        self.workThread.start()
+        self.workThread.stop.connect(self.stop_button_clicked)
+        self.workThread.update.connect(self.update_table)
+        self.workThread.update_status.connect(self.update_status_bar)
+
+    def stop_button_clicked(self):
+        conf.is_stop = True
+        self.status.showMessage("扫描结束")
+        tasks['task_count'] = 0
+        while not tasks.all_task.empty():
+            tasks.all_task.get(block=True, timeout=3)
+
+    def update_table(self, url, types, size, code):
+        print(url, types, size, code)
+        row_index = self.tableWidget.rowCount()
+        self.tableWidget.setRowCount(row_index + 1)
+        url_item = QLabel()
+        url_item.setOpenExternalLinks(True)
+        url_item.setText(f"<a href='{url}'>{url}</a>")
+        self.tableWidget.setCellWidget(row_index, 0, url_item)
+        new_item = QTableWidgetItem(types)
+        new_item.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        self.tableWidget.setItem(row_index, 1, new_item)
+        new_item = QTableWidgetItem(size)
+        new_item.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        self.tableWidget.setItem(row_index, 2, new_item)
+        new_item = QTableWidgetItem(code)
+        new_item.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        if code[0] == '2':
+            new_item.setForeground(QColor("green"))
+        elif code[0] == '3':
+            new_item.setForeground(QColor("blue"))
+        elif code[0] == '4':
+            new_item.setForeground(QColor("red"))
+        self.tableWidget.setItem(row_index, 3, new_item)
+
+    def update_status_bar(self):
+        if tasks['task_length']:
+            message = f"{tasks['task_count']}/{tasks['task_length']}"
+        else:
+            message = str(tasks['task_count'])
+        self.status.showMessage(message)
+
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    conf["is_stop"] = True
+    conf["ex"] = DirmapGUI()
+    conf["ex"] = CandyWindow.createWindow(conf["ex"], 'blueGreen', title="DirMap - PyQT", ico_path="dirmap.ico")
+    conf["ex"].show()
+    app.setWindowIcon(QIcon('dirmap.ico'))
+    sys.exit(app.exec_())
\ No newline at end of file
diff --git a/lib/controller/bruter.py b/lib/controller/bruter.py
index 6c227f9..5c512fb 100644
--- a/lib/controller/bruter.py
+++ b/lib/controller/bruter.py
@@ -453,6 +453,7 @@ def responseHandler(response):
             msg += '[{}] '.format(str(size))
         msg += response.url
         outputscreen.info('\r'+msg+' '*(th.console_width-len(msg)+1))
+        conf['thread'].update.emit(response.url,response.headers.get('content-type'),str(size),str(response.status_code))
         #已去重复，结果保存。NOTE:此处使用response.url进行文件名构造，解决使用-iL参数时，不能按照域名来命名文件名的问题
         #使用replace()，替换`:`，修复window下不能创建有`:`的文件问题
         saveResults(urllib.parse.urlparse(response.url).netloc.replace(':','_'),msg)
@@ -513,6 +514,7 @@ def worker():
         #更新进度条
         tasks.task_count += 1
         bar.log.update(tasks.task_count)
+        conf['thread'].update_status.emit()
 
 def boss():
     '''
@@ -520,7 +522,7 @@ def boss():
     @param {type}
     @return:
     '''
-    while not tasks.all_task.empty():
+    while not tasks.all_task.empty() and not conf.is_stop:
         worker()
 
 def bruter(url):
diff --git a/requirement.txt b/requirement.txt
index 3990adc..0889167 100644
--- a/requirement.txt
+++ b/requirement.txt
@@ -1,4 +1,6 @@
 gevent
 requests
 progressbar2
-lxml
\ No newline at end of file
+lxml
+QCandyUi
+PyQt5
diff --git a/start_dirmap_no_console.vbs b/start_dirmap_no_console.vbs
new file mode 100644
index 0000000..c0ac39c
--- /dev/null
+++ b/start_dirmap_no_console.vbs
@@ -0,0 +1,2 @@
+Set ws = CreateObject("Wscript.Shell")
+ws.run "cmd /c python dirmap_qtgui.py" ,vbhide
\ No newline at end of file
diff --git a/start_dirmap_with_console.vbs b/start_dirmap_with_console.vbs
new file mode 100644
index 0000000..4c0ddff
--- /dev/null
+++ b/start_dirmap_with_console.vbs
@@ -0,0 +1,2 @@
+Set ws = CreateObject("Wscript.Shell")
+ws.run "cmd /k python dirmap_qtgui.py"
\ No newline at end of file

From 98a2292793056af68efb37c31dba8c5769de1f56 Mon Sep 17 00:00:00 2001
From: zgjx <953870958@qq.com>
Date: Fri, 18 Oct 2019 21:29:40 +0800
Subject: [PATCH 2/3] update_preview_image

---
 dirmap.png      | Bin 0 -> 14065 bytes
 dirmap_qtgui.py |  11 -----------
 2 files changed, 11 deletions(-)
 create mode 100644 dirmap.png

diff --git a/dirmap.png b/dirmap.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a1c6e626240b0018a2e751cad5bbff91c5d19fd
GIT binary patch
literal 14065
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
Xi%u&knAS;VNnN&eyx92XjR*e=TmeZF

literal 0
HcmV?d00001

diff --git a/dirmap_qtgui.py b/dirmap_qtgui.py
index 56c7996..4d8bd59 100644
--- a/dirmap_qtgui.py
+++ b/dirmap_qtgui.py
@@ -12,9 +12,7 @@
 from lib.core.common import setPaths
 from lib.core.data import cmdLineOptions, conf, paths, tasks
 from lib.core.option import initOptions
-# from QCandyUi.CandyWindow import colorful
 from QCandyUi import CandyWindow
-# from lib.parse.cmdline import cmdLineParser
 
 class WorkThread(QThread):
     stop = pyqtSignal()
@@ -28,7 +26,6 @@ def run(self):
         run()
         self.stop.emit()  # 循环完毕后发出信号
 
-# @colorful('blueGreen')
 class DirmapGUI(QMainWindow):
     def __init__(self):
         super().__init__()
@@ -42,7 +39,6 @@ def initUI(self):
         self.setWindowIcon(QIcon('dirmap.ico'))
 
         grid = QGridLayout()
-        # grid.setSpacing(10)
         urlLable = QLabel('URL')
         urlLable.setAlignment((Qt.AlignRight | Qt.AlignVCenter))
         self.urlText = QLineEdit()
@@ -73,9 +69,6 @@ def initUI(self):
         wid_get.setLayout(grid)
         self.setCentralWidget(wid_get)
 
-        # self.setLayout(grid)
-        # self.show()
-
     # 控制窗口显示在屏幕中心的方法
     def center(self):
         # 获得窗口
@@ -95,15 +88,12 @@ def start_button_clicked(self):
         row_index = self.tableWidget.rowCount()
         for i in range(row_index):
             self.tableWidget.removeRow(0)
-
         paths.ROOT_PATH = os.getcwd()
         setPaths()
         dicts = {'thread_num': 8, 'target_input': text, 'target_file': '', 'load_config_file': True,
                  'debug': False}
         cmdLineOptions.update(dicts)
         initOptions(cmdLineOptions)
-        # run()
-        # self.stop_button_clicked()
         self.workThread = WorkThread()
         conf["thread"] = self.workThread
         self.workThread.start()
@@ -119,7 +109,6 @@ def stop_button_clicked(self):
             tasks.all_task.get(block=True, timeout=3)
 
     def update_table(self, url, types, size, code):
-        print(url, types, size, code)
         row_index = self.tableWidget.rowCount()
         self.tableWidget.setRowCount(row_index + 1)
         url_item = QLabel()

From c3810ad0a3ffe3b6daeea48ffeac1f23d21c866a Mon Sep 17 00:00:00 2001
From: zgjx <953870958@qq.com>
Date: Fri, 18 Oct 2019 21:30:47 +0800
Subject: [PATCH 3/3] update_preview_image

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 373130f..6781693 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 一个高级web目录扫描工具，功能将会强于DirBuster、Dirsearch、cansina、御剑
 
-![dirmap](doc/dirmap.png)
+![dirmap](dirmap.png)
 
 # 需求分析