Merge pull request #1548 from HXSecurity/revert-1546-feat/new_api_rou…

…te_upload Revert "feat/new_api_route_upload"
HXSecurity · Jun 25, 2023 · 9de217d · 9de217d
2 parents 57aaa6a + e7a63b3
commit 9de217d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 168 deletions.
diff --git a/dongtai_common/models/api_route_v2.py b/dongtai_common/models/api_route_v2.py
diff --git a/dongtai_common/utils/const.py b/dongtai_common/utils/const.py
@@ -16,7 +16,6 @@
 REPORT_AUTH_UPDATE = 0x32
 REPORT_ERROR_LOG = 0x51
 REPORT_API_ROUTE = 0x61
-REPORT_API_ROUTE_V2 = 0x62
 REPORT_THIRD_PARTY_SERVICE = 0x81
 REPORT_FILE_PATH = 0x82
 

diff --git a/dongtai_conf/celery.py b/dongtai_conf/celery.py
@@ -68,7 +68,6 @@
 # configs['worker_concurrency'] = 8
 configs["task_routes"] = {
     # normal
-    "dongtai_protocol.report.handler.api_route_v2_handler.api_route_gather_v2": {'queue': 'dongtai-api-route-handler', 'routing_key': 'dongtai-api-route-handler'},
     "dongtai_protocol.report.handler.api_route_handler.api_route_gather": {'queue': 'dongtai-api-route-handler', 'routing_key': 'dongtai-api-route-handler'},
     "dongtai_engine.tasks.search_vul_from_method_pool": {'queue': 'dongtai-method-pool-scan', 'routing_key': 'dongtai-method-pool-scan'},
     "dongtai_engine.plugins.project_time_update.project_time_stamp_update": {'queue': 'dongtai-project-time-stamp-update', 'routing_key': 'dongtai-project-time-stamp-update'},

diff --git a/dongtai_protocol/report/__init__.py b/dongtai_protocol/report/__init__.py
@@ -8,10 +8,8 @@
 from dongtai_protocol.report.handler.heartbeat_handler import HeartBeatHandler
 from dongtai_protocol.report.handler.narmal_vul_handler import NormalVulnHandler
 from dongtai_protocol.report.handler.saas_method_pool_handler import SaasMethodPoolHandler
-from dongtai_protocol.report.handler.sca_handler import (ScaHandler,
-                                                         ScaBulkHandler)
+from dongtai_protocol.report.handler.sca_handler import (ScaHandler, ScaBulkHandler)
 from dongtai_protocol.report.handler.api_route_handler import ApiRouteHandler
-from dongtai_protocol.report.handler.api_route_v2_handler import ApiRouteV2Handler
 from dongtai_protocol.report.handler.hardencode_vul_handler import HardEncodeVulHandler
 from dongtai_protocol.report.handler.agent_third_service_handler import ThirdPartyServiceHandler
 from dongtai_protocol.report.handler.agent_filepath_handler import FilePathHandler
@@ -23,7 +21,6 @@
     NormalVulnHandler()
     SaasMethodPoolHandler()
     ApiRouteHandler()
-    ApiRouteV2Handler()
     HardEncodeVulHandler()
     ScaBulkHandler()
     ThirdPartyServiceHandler()

diff --git a/dongtai_protocol/report/handler/api_route_v2_handler.py b/dongtai_protocol/report/handler/api_route_v2_handler.py
diff --git a/dongtai_protocol/report/handler/saas_method_pool_handler.py b/dongtai_protocol/report/handler/saas_method_pool_handler.py
@@ -105,7 +105,7 @@ def save(self):
         """
         headers = SaasMethodPoolHandler.parse_headers(self.http_req_header)
         #save_project_header(list(headers.keys()), self.agent_id)
-        #add_new_api_route(self.agent, self.http_uri, self.http_method)
+        add_new_api_route(self.agent, self.http_uri, self.http_method)
         import base64
         params_dict = get_params_dict(base64.b64decode(self.http_req_header),
                                       self.http_req_data,

diff --git a/test/apiserver/test_agent_apiroute_v2.py b/test/apiserver/test_agent_apiroute_v2.py
diff --git a/test/integration/mockdata/api-report.json b/test/integration/mockdata/api-report.json