From 27aef069aa709b02471016cc205343ec4d5e6c07 Mon Sep 17 00:00:00 2001 From: bidaya0 Date: Thu, 15 Dec 2022 14:53:02 +0800 Subject: [PATCH 1/3] feat: add event and service. --- dongtai_common/models/agent.py | 21 ++++-- dongtai_common/models/server.py | 1 + dongtai_protocol/views/agent_register.py | 91 ++++++++++++++++-------- dongtai_protocol/views/except_action.py | 15 +++- dongtai_web/views/agents_v2.py | 15 ++-- test/apiserver/test_agent_base.py | 6 +- test/apiserver/test_agent_register.py | 7 +- 7 files changed, 112 insertions(+), 44 deletions(-) diff --git a/dongtai_common/models/agent.py b/dongtai_common/models/agent.py index 8c3348ce8..3e7633392 100644 --- a/dongtai_common/models/agent.py +++ b/dongtai_common/models/agent.py @@ -13,6 +13,8 @@ from dongtai_common.utils.settings import get_managed from dongtai_common.models.project import IastProject from dongtai_common.models.project_version import IastProjectVersion +import json + class IastAgent(models.Model): token = models.CharField(max_length=255, blank=True, null=True) @@ -38,10 +40,10 @@ class IastAgent(models.Model): null=True, default=-1) project_version = models.ForeignKey(IastProjectVersion, - on_delete=models.CASCADE, - blank=True, - null=True, - default=-1) + on_delete=models.CASCADE, + blank=True, + null=True, + default=-1) project_name = models.CharField(max_length=255, blank=True, null=True) online = models.PositiveSmallIntegerField(blank=True, default=0) language = models.CharField(max_length=10, blank=True, null=True) @@ -59,12 +61,21 @@ class IastAgent(models.Model): actual_running_status = models.IntegerField(default=1, null=False) except_running_status = models.IntegerField(default=1, null=False) state_status = models.IntegerField(default=1, null=False) - + events = models.JSONField(null=False, default=lambda: ['注册成功']) class Meta: managed = get_managed() db_table = 'iast_agent' + def append_events(self, event: str): + events_list = json.loads(self.events) + events_list.append(event) + self.events = json.dumps(events_list) + self.save() + + def only_register(self): + events_list = json.loads(self.events) + return events_list == ['注册成功'] #class IastAgent(models.Model): # diff --git a/dongtai_common/models/server.py b/dongtai_common/models/server.py index 69eeaeb6a..c619fea9f 100644 --- a/dongtai_common/models/server.py +++ b/dongtai_common/models/server.py @@ -30,6 +30,7 @@ class IastServer(models.Model): null=True, default='') pid = models.IntegerField(blank=True, null=True) + ipaddresslist = models.JSONField(null=False, default=list) class Meta: managed = get_managed() diff --git a/dongtai_protocol/views/agent_register.py b/dongtai_protocol/views/agent_register.py index 31271dc76..07d4fe350 100644 --- a/dongtai_protocol/views/agent_register.py +++ b/dongtai_protocol/views/agent_register.py @@ -99,8 +99,10 @@ def get_runtime(envs): return '' @staticmethod - def register_server(agent_id, hostname, network, container_name, server_addr, server_port, cluster_name,cluster_version, - server_path, server_env, pid): + def register_server(agent_id, hostname, network, container_name, + server_addr, server_port, cluster_name, + cluster_version, server_path, server_env, pid, + server_ipaddresslist): """ 注册server，并关联server至agent :param agent_id: @@ -131,12 +133,16 @@ def register_server(agent_id, hostname, network, container_name, server_addr, se try: port = int(server_port) except Exception as e: - logger.error(_('The server port does not exist, has been set to the default: 0')) + logger.error( + _('The server port does not exist, has been set to the default: 0' + )) port = 0 server_id = agent.server_id - server = IastServer.objects.filter(id=server_id).first() if server_id else None + server = IastServer.objects.filter( + id=server_id).first() if server_id else None + ipaddresslist = json.dumps(server_ipaddresslist) if server: server.hostname = hostname server.network = network @@ -149,7 +155,19 @@ def register_server(agent_id, hostname, network, container_name, server_addr, se server.cluster_version = cluster_version server.status = 'online' server.update_time = int(time.time()) - server.save(update_fields=['hostname', 'command', 'ip', 'port', 'env', 'status', 'update_time', 'cluster_name', 'cluster_version']) + server.ipaddresslist = ipaddresslist + server.save(update_fields=[ + 'hostname', + 'command', + 'ip', + 'port', + 'env', + 'status', + 'update_time', + 'cluster_name', + 'cluster_version', + "ipaddresslist", + ]) else: server = IastServer.objects.create( hostname=hostname, @@ -167,34 +185,33 @@ def register_server(agent_id, hostname, network, container_name, server_addr, se command=command, runtime=AgentRegisterEndPoint.get_runtime(envs), create_time=int(time.time()), - update_time=int(time.time()) + update_time=int(time.time()), + ipaddresslist=ipaddresslist, ) agent.server_id = server.id agent.save(update_fields=['server_id']) logger.info(_('Server record creation success')) - @extend_schema( - description='Agent Register, Data is Gzip', - parameters=[ - DongTaiParameter.AGENT_NAME, - DongTaiParameter.LANGUAGE, - DongTaiParameter.VERSION, - DongTaiParameter.PROJECT_NAME, - DongTaiParameter.HOSTNAME, - DongTaiParameter.NETWORK, - DongTaiParameter.CONTAINER_NAME, - DongTaiParameter.SERVER_ADDR, - DongTaiParameter.SERVER_PORT, - DongTaiParameter.SERVER_PATH, - DongTaiParameter.SERVER_ENV, - DongTaiParameter.PID, - DongTaiParameter.AUTO_CREATE_PROJECT, - ], - responses=[ - {204: None} - ], - methods=['POST'] - ) + @extend_schema(description='Agent Register, Data is Gzip', + parameters=[ + DongTaiParameter.AGENT_NAME, + DongTaiParameter.LANGUAGE, + DongTaiParameter.VERSION, + DongTaiParameter.PROJECT_NAME, + DongTaiParameter.HOSTNAME, + DongTaiParameter.NETWORK, + DongTaiParameter.CONTAINER_NAME, + DongTaiParameter.SERVER_ADDR, + DongTaiParameter.SERVER_PORT, + DongTaiParameter.SERVER_PATH, + DongTaiParameter.SERVER_ENV, + DongTaiParameter.PID, + DongTaiParameter.AUTO_CREATE_PROJECT, + ], + responses=[{ + 204: None + }], + methods=['POST']) def post(self, request: Request): try: param = parse_data(request.read()) @@ -282,6 +299,7 @@ def post(self, request: Request): cluster_version=cluster_version, server_env=server_env, pid=pid, + server_ipaddresslist = get_ipaddresslist(network), ) core_auto_start = 0 @@ -353,3 +371,20 @@ def get_ipaddress(network: str): except Exception as e: logger.error(e, exc_info=True) return '' + + +def get_ipaddresslist(network: str) -> list: + try: + network_data = json.loads(network) + if isinstance(network_data, list): + res = [] + for i in network_data: + res.append(i['ip']) + return res + if isinstance(network_data, dict): + return [network_data['ip']] + except KeyError as e: + return [] + except Exception as e: + logger.error(e, exc_info=True) + return [] diff --git a/dongtai_protocol/views/except_action.py b/dongtai_protocol/views/except_action.py index 3c297dfa5..d3251c477 100644 --- a/dongtai_protocol/views/except_action.py +++ b/dongtai_protocol/views/except_action.py @@ -10,10 +10,13 @@ from urllib.parse import urlparse, urlunparse from dongtai_web.views.project_add import is_ip from rest_framework.viewsets import ViewSet + logger = logging.getLogger('dongtai.openapi') +EVENT_MAPPING = {1: "加载成功", 2: "降级成功", 3: "卸载成功", 4: "代码异常"} + -class AgentActionV2EndPoint(OpenApiEndPoint,ViewSet): +class AgentActionV2EndPoint(OpenApiEndPoint, ViewSet): @extend_schema(description='Agent Update, Data is Gzip', responses=[{ @@ -26,12 +29,18 @@ def actual_running_status(self, request): agent_id = int(param.get('agentId', None)) actual_running_status = int(param.get('actualRunningStatus', None)) state_status = int(param.get('stateStatus', None)) - except Exception as e: - logger.error(e, exc_info=True) + except Exception as exception: + logger.error(exception, exc_info=True) return R.failure(msg="参数错误") agent = IastAgent.objects.filter(pk=agent_id).first() if not agent: return R.failure(msg=_("Agent not found")) + if agent.only_register( + ) or agent.actual_running_status != actual_running_status: + if not agent.events: + agent.append_events("注册成功") + if agent.actual_running_status in EVENT_MAPPING: + agent.append_events(EVENT_MAPPING[agent.actual_running_status]) agent.actual_running_status = actual_running_status agent.state_status = state_status agent.save() diff --git a/dongtai_web/views/agents_v2.py b/dongtai_web/views/agents_v2.py index a52b1c930..6640d1626 100644 --- a/dongtai_web/views/agents_v2.py +++ b/dongtai_web/views/agents_v2.py @@ -75,8 +75,10 @@ def pagenation_list(self, request): agent['except_running_status'], agent['online'], ) - agent['ipaddresses'] = ['172.22.22.11', '10.0.2.15'] - agent['events'] = ['注册成功', '加载成功'] + agent['ipaddresses'] = get_service_addrs( + agent['server__ipaddresslist'], agent['server__port']) + if not agent['events']: + agent['events'] = ['注册成功'] data = {'agents': queryset, "summary": summary} except Exception as e: logger.error("agents pagenation_list error:{}".format(e), @@ -101,6 +103,8 @@ def agent_stat(self, request): res = dict() return R.success(data=res) +def get_service_addrs(ip_list: list, port: int) -> list: + return list(map(lambda x: x + str(port) ,ip_list)) def get_agent_stat(agent_id: int, user_id: int) -> dict: res = {} @@ -189,7 +193,8 @@ def query_agent(filter_condiction=Q()) -> QuerySet: return IastAgent.objects.filter(filter_condiction).values( 'alias', 'token', 'bind_project__name', 'bind_project__user__username', 'language', 'server__ip', 'server__port', 'server__path', - 'server__hostname', 'heartbeat__memory', 'heartbeat__cpu', - 'heartbeat__disk', 'register_time', 'is_core_running', 'is_control', - 'online', 'id', 'bind_project__id', 'version', 'except_running_status', + 'server__ipaddresslist', 'events', 'server__hostname', + 'heartbeat__memory', 'heartbeat__cpu', 'heartbeat__disk', + 'register_time', 'is_core_running', 'is_control', 'online', 'id', + 'bind_project__id', 'version', 'except_running_status', 'actual_running_status', 'state_status').order_by('-latest_time') diff --git a/test/apiserver/test_agent_base.py b/test/apiserver/test_agent_base.py index 9c6e218c8..0906bc38b 100644 --- a/test/apiserver/test_agent_base.py +++ b/test/apiserver/test_agent_base.py @@ -24,7 +24,7 @@ "language": "JAVA", "serverPort": "0", "version": "v1.1.3", - "network": "{\"name\":\"en0\",\"ip\":\"192.168.2.143\"}", + "network": "[{\"isAddress\":\"1\",\"ip\":\"172.22.22.11\",\"name\":\"enp0s8\"},{\"isAddress\":\"1\",\"ip\":\"10.0.2.15\",\"name\":\"enp0s3\"}]", "serverEnv": "{java.runtime.name=OpenJDK Runtime Environment, spring.output.ansi.enabled=always, project.name=SpringSec, sun.boot.library.path=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib, java.vm.version=25.312-b07, gopherProxySet=false, java.vm.vendor=Amazon.com Inc., java.vendor.url=https://aws.amazon.com/corretto/, path.separator=:, project.version=120901, java.vm.name=OpenJDK 64-Bit Server VM, file.encoding.pkg=sun.io, user.country=CN, sun.java.launcher=SUN_STANDARD, sun.os.patch.level=unknown, java.vm.specification.name=Java Virtual Machine Specification, user.dir=/Users/erzhuangniu/workspace/vul/SecExample, java.runtime.version=1.8.0_312-b07, java.awt.graphicsenv=sun.awt.CGraphicsEnvironment, java.endorsed.dirs=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/endorsed, os.arch=x86_64, java.io.tmpdir=/var/folders/xy/xyx56h3s29z6376gvk32621h0000gn/T/, line.separator=
, java.vm.specification.vendor=Oracle Corporation, os.name=Mac OS X, sun.jnu.encoding=UTF-8, java.library.path=/Users/erzhuangniu/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:., spring.jmx.enabled=true, java.specification.name=Java Platform API Specification, java.class.version=52.0, sun.management.compiler=HotSpot 64-Bit Tiered Compilers, spring.liveBeansView.mbeanDomain=, os.version=11.4, user.home=/Users/erzhuangniu, sun.net.http.allowRestrictedHeaders=true, user.timezone=, java.awt.printerjob=sun.lwawt.macosx.CPrinterJob, file.encoding=UTF-8, java.specification.version=1.8, java.class.path=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/charsets.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/cldrdata.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/dnsns.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/jaccess.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/jfxrt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/localedata.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/nashorn.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/sunec.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/zipfs.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jce.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jfr.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jfxswt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jsse.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/management-agent.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/resources.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/rt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/ant-javafx.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/dt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/javafx-mx.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/jconsole.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/packager.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/sa-jdi.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/tools.jar:/Users/erzhuangniu/workspace/vul/SecExample/target/classes:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-thymeleaf/2.5.0/spring-boot-starter-thymeleaf-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter/2.5.0/spring-boot-starter-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-logging/2.5.0/spring-boot-starter-logging-2.5.0.jar:/Users/erzhuangniu/.m2/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar:/Users/erzhuangniu/.m2/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar:/Users/erzhuangniu/.m2/repository/org/apache/logging/log4j/log4j-to-slf4j/2.14.1/log4j-to-slf4j-2.14.1.jar:/Users/erzhuangniu/.m2/repository/org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar:/Users/erzhuangniu/.m2/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar:/Users/erzhuangniu/.m2/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar:/Users/erzhuangniu/.m2/repository/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar:/Users/erzhuangniu/.m2/repository/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar:/Users/erzhuangniu/.m2/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-web/2.5.0/spring-boot-starter-web-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-json/2.5.0/spring-boot-starter-json-2.5.0.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.12.3/jackson-databind-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.3/jackson-annotations-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.12.3/jackson-core-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.12.3/jackson-datatype-jdk8-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.12.3/jackson-datatype-jsr310-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.12.3/jackson-module-parameter-names-2.12.3.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-tomcat/2.5.0/spring-boot-starter-tomcat-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46.jar:/Users/erzhuangniu/.m2/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.46/tomcat-embed-el-9.0.46.jar:/Users/erzhuangniu/.m2/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-web/5.3.7/spring-web-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-beans/5.3.7/spring-beans-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-webmvc/5.3.7/spring-webmvc-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-aop/5.3.7/spring-aop-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-context/5.3.7/spring-context-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-expression/5.3.7/spring-expression-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-devtools/2.5.0/spring-boot-devtools-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot/2.5.0/spring-boot-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-autoconfigure/2.5.0/spring-boot-autoconfigure-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.0/mybatis-spring-boot-starter-1.3.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-jdbc/2.5.0/spring-boot-starter-jdbc-2.5.0.jar:/Users/erzhuangniu/.m2/repository/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-jdbc/5.3.7/spring-jdbc-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-tx/5.3.7/spring-tx-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.0/mybatis-spring-boot-autoconfigure-1.3.0.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/mybatis/3.4.4/mybatis-3.4.4.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/mybatis-spring/1.3.1/mybatis-spring-1.3.1.jar:/Users/erzhuangniu/.m2/repository/mysql/mysql-connector-java/5.1.31/mysql-connector-java-5.1.31.jar:/Users/erzhuangniu/.m2/repository/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar:/Users/erzhuangniu/.m2/repository/com/github/pagehelper/pagehelper-spring-boot-starter/1.3.0/pagehelper-spring-boot-starter-1.3.0.jar:/Users/erzhuangniu/.m2/repository/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.3.0/pagehelper-spring-boot-autoconfigure-1.3.0.jar:/Users/erzhuangniu/.m2/repository/com/github/pagehelper/pagehelper/5.2.0/pagehelper-5.2.0.jar:/Users/erzhuangniu/.m2/repository/com/github/jsqlparser/jsqlparser/3.2/jsqlparser-3.2.jar:/Users/erzhuangniu/.m2/repository/com/alibaba/fastjson/1.2.24/fastjson-1.2.24.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-core/5.3.7/spring-core-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-jcl/5.3.7/spring-jcl-5.3.7.jar:/Users/erzhuangniu/workspace/nagent/DongTai-agent-java/release/iast-agent.jar:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar, user.name=erzhuangniu, com.sun.management.jmxremote=, java.vm.specification.version=1.8, sun.java.command=com.suyu.secexample.SecexampleApplication, java.home=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre, sun.arch.data.model=64, user.language=zh, java.specification.vendor=Oracle Corporation, awt.toolkit=sun.lwawt.macosx.LWCToolkit, java.vm.info=mixed mode, java.version=1.8.0_312, java.ext.dirs=/Users/erzhuangniu/Library/Java/Extensions:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java, sun.boot.class.path=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/resources.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/rt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/sunrsasign.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jsse.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jce.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/charsets.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jfr.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/classes, java.vendor=Amazon.com Inc., spring.application.admin.enabled=true, file.separator=/, java.vendor.url.bug=https://github.com/corretto/corretto-8/issues/, iast.server.mode=local, sun.io.unicode.encoding=UnicodeBig, sun.cpu.endian=little, sun.cpu.isalist=}", "hostname": "localhost", @@ -382,7 +382,9 @@ def setUp(self): self.agent_id = data['id'] def raw_register(self, **kwargs): - data = gzipdata(REGISTER_JSON) + register_data = REGISTER_JSON.copy() + register_data.update(kwargs) + data = gzipdata(register_data) token, success = Token.objects.get_or_create(user=self.user) response = self.client.post( 'http://testserver/api/v1/agent/register', diff --git a/test/apiserver/test_agent_register.py b/test/apiserver/test_agent_register.py index 5cfb9d37d..c23ef3ff4 100644 --- a/test/apiserver/test_agent_register.py +++ b/test/apiserver/test_agent_register.py @@ -19,7 +19,6 @@ def setUp(self): def test_rep_register(self): data1 = self.raw_register(name='rep_data') - self.agent_heartbeat() data2 = self.raw_register(name='rep_data') assert data1.status_code == 200 and data2.status_code == 200 self.test_agent_id += [ @@ -31,3 +30,9 @@ def test_rep_register(self): def test_register(self): assert not IastAgent.objects.filter(pk=self.agent_id, project_version_id=0).exists() + + def test_old_register(self): + dic = { + "network": "{\"name\":\"en0\",\"ip\":\"192.168.2.143\"}", + } + self.raw_register(**dic) From 5650d060b3363bb37450c8047ec0c48232b6b3f2 Mon Sep 17 00:00:00 2001 From: bidaya0 Date: Thu, 15 Dec 2022 15:36:12 +0800 Subject: [PATCH 2/3] fix(lint): fix pep and mypy check. --- dongtai_protocol/views/agent_register.py | 6 +++--- dongtai_web/views/agents_v2.py | 4 +++- test/apiserver/test_agent_base.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dongtai_protocol/views/agent_register.py b/dongtai_protocol/views/agent_register.py index 07d4fe350..801ea99d5 100644 --- a/dongtai_protocol/views/agent_register.py +++ b/dongtai_protocol/views/agent_register.py @@ -384,7 +384,7 @@ def get_ipaddresslist(network: str) -> list: if isinstance(network_data, dict): return [network_data['ip']] except KeyError as e: - return [] + logger.error(network_data,exc_info=e) except Exception as e: - logger.error(e, exc_info=True) - return [] + logger.error(e, exc_info=e) + return [] diff --git a/dongtai_web/views/agents_v2.py b/dongtai_web/views/agents_v2.py index 6640d1626..35a61b462 100644 --- a/dongtai_web/views/agents_v2.py +++ b/dongtai_web/views/agents_v2.py @@ -103,8 +103,10 @@ def agent_stat(self, request): res = dict() return R.success(data=res) + def get_service_addrs(ip_list: list, port: int) -> list: - return list(map(lambda x: x + str(port) ,ip_list)) + return list(map(lambda x: x + str(port), ip_list)) + def get_agent_stat(agent_id: int, user_id: int) -> dict: res = {} diff --git a/test/apiserver/test_agent_base.py b/test/apiserver/test_agent_base.py index 0906bc38b..8e84d092d 100644 --- a/test/apiserver/test_agent_base.py +++ b/test/apiserver/test_agent_base.py @@ -24,7 +24,8 @@ "language": "JAVA", "serverPort": "0", "version": "v1.1.3", - "network": "[{\"isAddress\":\"1\",\"ip\":\"172.22.22.11\",\"name\":\"enp0s8\"},{\"isAddress\":\"1\",\"ip\":\"10.0.2.15\",\"name\":\"enp0s3\"}]", + "network": + "[{\"isAddress\":\"1\",\"ip\":\"172.22.22.11\",\"name\":\"enp0s8\"},{\"isAddress\":\"1\",\"ip\":\"10.0.2.15\",\"name\":\"enp0s3\"}]", "serverEnv": "{java.runtime.name=OpenJDK Runtime Environment, spring.output.ansi.enabled=always, project.name=SpringSec, sun.boot.library.path=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib, java.vm.version=25.312-b07, gopherProxySet=false, java.vm.vendor=Amazon.com Inc., java.vendor.url=https://aws.amazon.com/corretto/, path.separator=:, project.version=120901, java.vm.name=OpenJDK 64-Bit Server VM, file.encoding.pkg=sun.io, user.country=CN, sun.java.launcher=SUN_STANDARD, sun.os.patch.level=unknown, java.vm.specification.name=Java Virtual Machine Specification, user.dir=/Users/erzhuangniu/workspace/vul/SecExample, java.runtime.version=1.8.0_312-b07, java.awt.graphicsenv=sun.awt.CGraphicsEnvironment, java.endorsed.dirs=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/endorsed, os.arch=x86_64, java.io.tmpdir=/var/folders/xy/xyx56h3s29z6376gvk32621h0000gn/T/, line.separator=
, java.vm.specification.vendor=Oracle Corporation, os.name=Mac OS X, sun.jnu.encoding=UTF-8, java.library.path=/Users/erzhuangniu/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:., spring.jmx.enabled=true, java.specification.name=Java Platform API Specification, java.class.version=52.0, sun.management.compiler=HotSpot 64-Bit Tiered Compilers, spring.liveBeansView.mbeanDomain=, os.version=11.4, user.home=/Users/erzhuangniu, sun.net.http.allowRestrictedHeaders=true, user.timezone=, java.awt.printerjob=sun.lwawt.macosx.CPrinterJob, file.encoding=UTF-8, java.specification.version=1.8, java.class.path=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/charsets.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/cldrdata.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/dnsns.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/jaccess.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/jfxrt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/localedata.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/nashorn.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/sunec.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext/zipfs.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jce.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jfr.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jfxswt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jsse.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/management-agent.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/resources.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/rt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/ant-javafx.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/dt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/javafx-mx.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/jconsole.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/packager.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/sa-jdi.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/lib/tools.jar:/Users/erzhuangniu/workspace/vul/SecExample/target/classes:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-thymeleaf/2.5.0/spring-boot-starter-thymeleaf-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter/2.5.0/spring-boot-starter-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-logging/2.5.0/spring-boot-starter-logging-2.5.0.jar:/Users/erzhuangniu/.m2/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar:/Users/erzhuangniu/.m2/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar:/Users/erzhuangniu/.m2/repository/org/apache/logging/log4j/log4j-to-slf4j/2.14.1/log4j-to-slf4j-2.14.1.jar:/Users/erzhuangniu/.m2/repository/org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar:/Users/erzhuangniu/.m2/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar:/Users/erzhuangniu/.m2/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar:/Users/erzhuangniu/.m2/repository/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar:/Users/erzhuangniu/.m2/repository/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar:/Users/erzhuangniu/.m2/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-web/2.5.0/spring-boot-starter-web-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-json/2.5.0/spring-boot-starter-json-2.5.0.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.12.3/jackson-databind-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.12.3/jackson-annotations-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.12.3/jackson-core-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.12.3/jackson-datatype-jdk8-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.12.3/jackson-datatype-jsr310-2.12.3.jar:/Users/erzhuangniu/.m2/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.12.3/jackson-module-parameter-names-2.12.3.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-tomcat/2.5.0/spring-boot-starter-tomcat-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46.jar:/Users/erzhuangniu/.m2/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.46/tomcat-embed-el-9.0.46.jar:/Users/erzhuangniu/.m2/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-web/5.3.7/spring-web-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-beans/5.3.7/spring-beans-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-webmvc/5.3.7/spring-webmvc-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-aop/5.3.7/spring-aop-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-context/5.3.7/spring-context-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-expression/5.3.7/spring-expression-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-devtools/2.5.0/spring-boot-devtools-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot/2.5.0/spring-boot-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-autoconfigure/2.5.0/spring-boot-autoconfigure-2.5.0.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.0/mybatis-spring-boot-starter-1.3.0.jar:/Users/erzhuangniu/.m2/repository/org/springframework/boot/spring-boot-starter-jdbc/2.5.0/spring-boot-starter-jdbc-2.5.0.jar:/Users/erzhuangniu/.m2/repository/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-jdbc/5.3.7/spring-jdbc-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-tx/5.3.7/spring-tx-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.0/mybatis-spring-boot-autoconfigure-1.3.0.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/mybatis/3.4.4/mybatis-3.4.4.jar:/Users/erzhuangniu/.m2/repository/org/mybatis/mybatis-spring/1.3.1/mybatis-spring-1.3.1.jar:/Users/erzhuangniu/.m2/repository/mysql/mysql-connector-java/5.1.31/mysql-connector-java-5.1.31.jar:/Users/erzhuangniu/.m2/repository/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar:/Users/erzhuangniu/.m2/repository/com/github/pagehelper/pagehelper-spring-boot-starter/1.3.0/pagehelper-spring-boot-starter-1.3.0.jar:/Users/erzhuangniu/.m2/repository/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.3.0/pagehelper-spring-boot-autoconfigure-1.3.0.jar:/Users/erzhuangniu/.m2/repository/com/github/pagehelper/pagehelper/5.2.0/pagehelper-5.2.0.jar:/Users/erzhuangniu/.m2/repository/com/github/jsqlparser/jsqlparser/3.2/jsqlparser-3.2.jar:/Users/erzhuangniu/.m2/repository/com/alibaba/fastjson/1.2.24/fastjson-1.2.24.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-core/5.3.7/spring-core-5.3.7.jar:/Users/erzhuangniu/.m2/repository/org/springframework/spring-jcl/5.3.7/spring-jcl-5.3.7.jar:/Users/erzhuangniu/workspace/nagent/DongTai-agent-java/release/iast-agent.jar:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar, user.name=erzhuangniu, com.sun.management.jmxremote=, java.vm.specification.version=1.8, sun.java.command=com.suyu.secexample.SecexampleApplication, java.home=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre, sun.arch.data.model=64, user.language=zh, java.specification.vendor=Oracle Corporation, awt.toolkit=sun.lwawt.macosx.LWCToolkit, java.vm.info=mixed mode, java.version=1.8.0_312, java.ext.dirs=/Users/erzhuangniu/Library/Java/Extensions:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java, sun.boot.class.path=/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/resources.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/rt.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/sunrsasign.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jsse.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jce.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/charsets.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/lib/jfr.jar:/Users/erzhuangniu/Library/Java/JavaVirtualMachines/corretto-1.8.0_312/Contents/Home/jre/classes, java.vendor=Amazon.com Inc., spring.application.admin.enabled=true, file.separator=/, java.vendor.url.bug=https://github.com/corretto/corretto-8/issues/, iast.server.mode=local, sun.io.unicode.encoding=UnicodeBig, sun.cpu.endian=little, sun.cpu.isalist=}", "hostname": "localhost", From ded8ee9904974c8f44afd08ee28138e600fbf857 Mon Sep 17 00:00:00 2001 From: bidaya0 Date: Thu, 15 Dec 2022 16:11:28 +0800 Subject: [PATCH 3/3] fix(lint): enable E401. --- .github/workflows/teststate.yml | 2 +- dongtai_engine/signals/handlers/vul_handler.py | 3 ++- dongtai_protocol/report/report_handler_factory.py | 5 ++++- dongtai_protocol/views/agent_download.py | 9 ++++++--- dongtai_protocol/views/report_upload.py | 3 ++- dongtai_web/base/update_project_version.py | 3 ++- dongtai_web/views/project_version_current.py | 3 ++- dongtai_web/views/project_version_delete.py | 3 ++- dongtai_web/views/project_version_list.py | 3 ++- dongtai_web/views/vul_summary.py | 3 ++- 10 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/teststate.yml b/.github/workflows/teststate.yml index 0e02e81e6..64d4e8a4e 100644 --- a/.github/workflows/teststate.yml +++ b/.github/workflows/teststate.yml @@ -144,7 +144,7 @@ jobs: - name: Django Unit Testing run: | - pep8 --ignore=E501,E402,E231,E302,E301,E303,E251,E265,W291,E126,W391,W503,E128,E122,E241,E225,E401,E701,W191 --statistics . + pep8 --ignore=E501,E402,E231,E302,E301,E303,E251,E265,W291,E126,W391,W503,E128,E122,E241,E225,E701,W191 --statistics . Run-Unit-TEST: runs-on: ubuntu-latest diff --git a/dongtai_engine/signals/handlers/vul_handler.py b/dongtai_engine/signals/handlers/vul_handler.py index 4d256f041..f669a7da4 100644 --- a/dongtai_engine/signals/handlers/vul_handler.py +++ b/dongtai_engine/signals/handlers/vul_handler.py @@ -3,7 +3,8 @@ # author: owefsad@huoxian.cn # datetime: 2021/4/30 下午3:00 # project: dongtai-engine -import json,random +import json +import random import time import requests from celery.apps.worker import logger diff --git a/dongtai_protocol/report/report_handler_factory.py b/dongtai_protocol/report/report_handler_factory.py index e1795d638..e8c8557d3 100644 --- a/dongtai_protocol/report/report_handler_factory.py +++ b/dongtai_protocol/report/report_handler_factory.py @@ -4,7 +4,10 @@ # datetime:2020/10/23 12:00 # software: PyCharm # project: webapi -import logging, requests, json, time +import logging +import requests +import json +import time from django.utils.translation import gettext_lazy as _ from dongtai_conf import settings from dongtai_protocol.report.log_service import LogService diff --git a/dongtai_protocol/views/agent_download.py b/dongtai_protocol/views/agent_download.py index 156bf10ba..55858bfed 100644 --- a/dongtai_protocol/views/agent_download.py +++ b/dongtai_protocol/views/agent_download.py @@ -5,8 +5,10 @@ # software: PyCharm # project: lingzhi-agent-server import json -import os, re -import uuid, logging +import os +import re +import uuid +import logging from django.http import FileResponse from dongtai_common.endpoint import UserEndPoint, R @@ -19,7 +21,8 @@ from dongtai_conf.settings import BUCKET_NAME_BASE_URL, VERSION import shutil -import tarfile, os +import tarfile +import os import threading import time diff --git a/dongtai_protocol/views/report_upload.py b/dongtai_protocol/views/report_upload.py index 4b5a17e0e..18cee31fe 100644 --- a/dongtai_protocol/views/report_upload.py +++ b/dongtai_protocol/views/report_upload.py @@ -7,7 +7,8 @@ from dongtai_common.endpoint import OpenApiEndPoint, R from drf_spectacular.utils import extend_schema -import time,logging +import time +import logging from dongtai_protocol.api_schema import DongTaiParameter from dongtai_protocol.decrypter import parse_data from dongtai_protocol.report.report_handler_factory import ReportHandler diff --git a/dongtai_web/base/update_project_version.py b/dongtai_web/base/update_project_version.py index f66bb042b..4d1d561d0 100644 --- a/dongtai_web/base/update_project_version.py +++ b/dongtai_web/base/update_project_version.py @@ -3,7 +3,8 @@ # author:sjh # software: PyCharm # project: lingzhi-webapi -import logging, time +import logging +import time from dongtai_common.endpoint import UserEndPoint, R from dongtai_common.models.project_version import IastProjectVersion from dongtai_common.models.project import IastProject diff --git a/dongtai_web/views/project_version_current.py b/dongtai_web/views/project_version_current.py index a2fc9417a..ed6958b8d 100644 --- a/dongtai_web/views/project_version_current.py +++ b/dongtai_web/views/project_version_current.py @@ -4,7 +4,8 @@ # software: PyCharm # project: lingzhi-webapi -import logging, time +import logging +import time from dongtai_common.endpoint import R from django.db.models import Q from dongtai_common.endpoint import UserEndPoint diff --git a/dongtai_web/views/project_version_delete.py b/dongtai_web/views/project_version_delete.py index 2004d86a6..8e6bdf7b3 100644 --- a/dongtai_web/views/project_version_delete.py +++ b/dongtai_web/views/project_version_delete.py @@ -3,7 +3,8 @@ # author:sjh # software: PyCharm # project: lingzhi-webapi -import logging, time +import logging +import time from dongtai_common.endpoint import R from dongtai_common.endpoint import UserEndPoint from dongtai_common.models.project_version import IastProjectVersion diff --git a/dongtai_web/views/project_version_list.py b/dongtai_web/views/project_version_list.py index 01bf5532b..c164abc80 100644 --- a/dongtai_web/views/project_version_list.py +++ b/dongtai_web/views/project_version_list.py @@ -3,7 +3,8 @@ # author:sjh # software: PyCharm # project: lingzhi-webapi -import logging, time +import logging +import time from dongtai_common.endpoint import R from dongtai_common.endpoint import UserEndPoint from dongtai_common.models.project_version import IastProjectVersion diff --git a/dongtai_web/views/vul_summary.py b/dongtai_web/views/vul_summary.py index a6718b7ed..81fc7fdc7 100644 --- a/dongtai_web/views/vul_summary.py +++ b/dongtai_web/views/vul_summary.py @@ -20,7 +20,8 @@ from dongtai_web.serializers.vul import VulSummaryResponseDataSerializer -import copy,time +import copy +import time _ResponseSerializer = get_response_serializer(VulSummaryResponseDataSerializer())