update

alex123-2star · Jan 20, 2022 · d66c302 · d66c302
1 parent d4d8ecf
commit d66c302
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/app/scan/lib/Scandir.py b/app/scan/lib/Scandir.py
@@ -47,10 +47,6 @@ def scan_dir(scanmethod_query, target_id, current_user):
         for j in threads:
             j.join()
 
-        sql = "DELETE FROM Celerytask WHERE celery_target= %s"
-        cursor.execute(sql,(target_id,))
-        conn.commit()
-
     if(scanmethod_query[11] == True):
         #12是字典
         wordlist = scanmethod_query[12]
@@ -62,10 +58,11 @@ def scan_dir(scanmethod_query, target_id, current_user):
             threads.append(thread)
         for j in threads:
             j.join()
-
+        
         sql = "DELETE FROM Celerytask WHERE celery_target= %s"
         cursor.execute(sql,(target_id,))
         conn.commit()
+
 
     #关闭数据库句柄
     cursor.close()
@@ -110,15 +107,6 @@ def run(self):
                         print(e)
                         break
 
-                sql = "SELECT * FROM Celerytask where celery_target = %s"
-                cursor.execute(sql,(target_id,))
-                celery_status = cursor.fetchone()[2]
-
-                if celery_status == False:
-                    task.control.revoke(dir_scan.id, terminate=True)
-                    break
-                time.sleep(2)
-
 
 class tool_fileleak(Thread):
     def __init__(self, fileleak_queue, task, wordlist,target_id, conn, cursor, current_user):
@@ -160,15 +148,6 @@ def run(self):
                         print(e)
                         break
 
-                sql = "SELECT * FROM Celerytask where celery_target = %s"
-                cursor.execute(sql,(target_id,))
-                celery_status = cursor.fetchone()[2]
-
-                if celery_status == False:
-                    task.control.revoke(dir_scan.id, terminate=True)
-                    break
-                time.sleep(2)
-
 #保存
 def save_result(target, target_id, result, cursor, conn, current_user): 
     tool = result['tool']

diff --git a/client/dir_scan/jsfinder/tools/httpx_1642654582.901837.txt b/client/dir_scan/jsfinder/tools/httpx_1642654582.901837.txt
@@ -0,0 +1,8 @@
+{"timestamp":"2022-01-20T12:56:33.405673+08:00","scheme":"https","port":"443","path":"/standard/log","body-sha256":"1ad3e4394b5f2363b8f1b0525d221a8e1481919232068010921794c541cef10e","header-sha256":"370743f8ed92acbe15f136de174ef41a48887ef2b0cedba0e59c84d8a48e0f0e","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/standard/log","input":"https://110.18.com.cn:443/standard/log","title":"405 Method Not Allowed","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":178,"status-code":405,"response-time":"192.446792ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.438817+08:00","scheme":"https","port":"443","path":"/../lib/runtest","body-sha256":"010f3448408cd9fde3ff0b2ee0d8ba26b3b2ea70eee26caa8a8290c6d3a7e572","header-sha256":"a0039408b3f6179fa45ef6353969d4c40ed2bf6e208decab7a86858511523021","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/../lib/runtest","input":"https://110.18.com.cn:443/../lib/runtest","title":"400 Bad Request","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":227,"status-code":400,"response-time":"258.31704ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.480569+08:00","scheme":"https","port":"443","path":"/../lib/interface","body-sha256":"010f3448408cd9fde3ff0b2ee0d8ba26b3b2ea70eee26caa8a8290c6d3a7e572","header-sha256":"a0039408b3f6179fa45ef6353969d4c40ed2bf6e208decab7a86858511523021","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/../lib/interface","input":"https://110.18.com.cn:443/../lib/interface","title":"400 Bad Request","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":227,"status-code":400,"response-time":"307.747551ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.49969+08:00","scheme":"https","port":"443","path":"/standard/record-questionnaire","body-sha256":"1ad3e4394b5f2363b8f1b0525d221a8e1481919232068010921794c541cef10e","header-sha256":"370743f8ed92acbe15f136de174ef41a48887ef2b0cedba0e59c84d8a48e0f0e","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/standard/record-questionnaire","input":"https://110.18.com.cn:443/standard/record-questionnaire","title":"405 Method Not Allowed","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":178,"status-code":405,"response-time":"293.338321ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.502994+08:00","scheme":"https","port":"443","path":"/api","body-sha256":"4fffae76e507d28192d174cdcaca9e42a76cc1617d04a4e44f2b28460f5900d4","header-sha256":"e9e21d1971080080fe4d7e0cef81861bcc171110147b13f94b5d0b8833a77881","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/api","input":"https://110.18.com.cn:443/api","location":"https://110.18.com.cn/standard/","title":"Redirecting...","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":227,"status-code":302,"response-time":"302.696329ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.721373+08:00","scheme":"https","port":"443","path":"/../lib/api","body-sha256":"010f3448408cd9fde3ff0b2ee0d8ba26b3b2ea70eee26caa8a8290c6d3a7e572","header-sha256":"a0039408b3f6179fa45ef6353969d4c40ed2bf6e208decab7a86858511523021","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/../lib/api","input":"https://110.18.com.cn:443/../lib/api","title":"400 Bad Request","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":227,"status-code":400,"response-time":"535.121961ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.723015+08:00","scheme":"https","port":"443","path":"/standard/home","body-sha256":"4fffae76e507d28192d174cdcaca9e42a76cc1617d04a4e44f2b28460f5900d4","header-sha256":"e9e21d1971080080fe4d7e0cef81861bcc171110147b13f94b5d0b8833a77881","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/standard/home","input":"https://110.18.com.cn:443/standard/home","location":"https://110.18.com.cn/standard/","title":"Redirecting...","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":227,"status-code":302,"response-time":"496.495699ms","failed":false}
+{"timestamp":"2022-01-20T12:56:33.777866+08:00","scheme":"https","port":"443","path":"/standard/phoneNumber","body-sha256":"1ad3e4394b5f2363b8f1b0525d221a8e1481919232068010921794c541cef10e","header-sha256":"370743f8ed92acbe15f136de174ef41a48887ef2b0cedba0e59c84d8a48e0f0e","a":["61.129.129.10"],"url":"https://110.18.com.cn:443/standard/phoneNumber","input":"https://110.18.com.cn:443/standard/phoneNumber","title":"405 Method Not Allowed","webserver":"Tengine","content-type":"text/html","method":"GET","host":"61.129.129.10","content-length":178,"status-code":405,"response-time":"558.330018ms","failed":false}
diff --git a/client/dir_scan/jsfinder/tools/jsfinder_1642654582.901829.txt b/client/dir_scan/jsfinder/tools/jsfinder_1642654582.901829.txt
@@ -0,0 +1,9 @@
+https://110.18.com.cn:443/api
+https://110.18.com.cn:443/../lib/interface
+https://110.18.com.cn:443/../lib/api
+https://110.18.com.cn:443/../lib/runtest
+https://110.18.com.cn:443/standard/log
+https://110.18.com.cn:443/standard/utils/unsupported
+https://110.18.com.cn:443/standard/home
+https://110.18.com.cn:443/standard/record-questionnaire
+https://110.18.com.cn:443/standard/phoneNumber
diff --git a/config.ini b/config.ini
@@ -1,6 +1,8 @@
 [CELERY_CONFIG]
-CELERY_BROKER_URL = amqp:https://H245245111:H245245111@rabbitmq:5672/H_broker
-CELERY_RESULT_BACKEND = redis:https://:H245245111@redis:6379/2
+CELERY_BROKER_URL = amqp:https://guest:[email protected]:5672/H_broker
+CELERY_RESULT_BACKEND = amqp:https://guest:[email protected]:5672/H_backend
+; CELERY_BROKER_URL = amqp:https://H245245111:H245245111@rabbitmq:5672/H_broker
+; CELERY_RESULT_BACKEND = redis:https://:H245245111@redis:6379/2
 
 [DATABASE]
 DB_HOST = 127.0.0.1