fix: clean code.

‘niuerzhuang’ · ‘niuerzhuang’ · commit 22cf21aa0d63 · 2023-09-01T15:06:22.000+08:00
diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/IastClassLoader.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/IastClassLoader.java
@@ -50,8 +50,7 @@ protected synchronized Class<?> loadClass(String name, boolean resolve) throws C
             return loadedClass;
         }
 
-        if (!name.startsWith("io.dongtai") && !name.startsWith("com.secnium")
-                && !name.startsWith("cn.huoxian") && !name.startsWith("java.lang.iast")) {
+        if (!name.startsWith("io.dongtai") && !name.startsWith("java.lang.iast")) {
             return super.loadClass(name, resolve);
         }
 
diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/manager/EngineManager.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/manager/EngineManager.java
@@ -21,7 +21,7 @@
  */
 public class EngineManager {
 
-    private static final String ENGINE_ENTRYPOINT_CLASS = "com.secnium.iast.core.AgentEngine";
+    private static final String ENGINE_ENTRYPOINT_CLASS = "io.dongtai.iast.core.AgentEngine";
     private static final String INJECT_PACKAGE_REMOTE_URI = "/api/v1/engine/download?engineName=dongtai-spy";
     private static final String ENGINE_PACKAGE_REMOTE_URI = "/api/v1/engine/download?engineName=dongtai-core";
     private static final String API_PACKAGE_REMOTE_URI = "/api/v1/engine/download?engineName=dongtai-api";
diff --git a/dongtai-api-gather/dongtai-api-gather-dubbo-api/src/main/java/io/dongtai/iast/api/gather/dubbo/convertor/MethodConvertor.java b/dongtai-api-gather/dongtai-api-gather-dubbo-api/src/main/java/io/dongtai/iast/api/gather/dubbo/convertor/MethodConvertor.java
@@ -18,8 +18,8 @@
  */
 public class MethodConvertor {
 
-    private OpenApiSchemaConvertorManager manager;
-    private Method reflectionMethod;
+    private final OpenApiSchemaConvertorManager manager;
+    private final Method reflectionMethod;
 
     /**
      * @param manager
diff --git a/dongtai-api-gather/dongtai-api-gather-dubbo-api/src/main/java/io/dongtai/iast/api/gather/dubbo/convertor/ServiceConvertor.java b/dongtai-api-gather/dongtai-api-gather-dubbo-api/src/main/java/io/dongtai/iast/api/gather/dubbo/convertor/ServiceConvertor.java
@@ -17,8 +17,8 @@
  */
 public class ServiceConvertor {
 
-    private OpenApiSchemaConvertorManager manager;
-    private Class interfaceClass;
+    private final OpenApiSchemaConvertorManager manager;
+    private final Class interfaceClass;
 
     public ServiceConvertor(OpenApiSchemaConvertorManager manager, Class interfaceClass) {
         this.manager = manager;
diff --git a/dongtai-api-gather/dongtai-api-gather-dubbo-api/src/main/java/io/dongtai/iast/api/gather/dubbo/extractor/AbstractDubboServiceExtractor.java b/dongtai-api-gather/dongtai-api-gather-dubbo-api/src/main/java/io/dongtai/iast/api/gather/dubbo/extractor/AbstractDubboServiceExtractor.java
@@ -27,7 +27,7 @@ public abstract class AbstractDubboServiceExtractor {
     private static final String DUBBO_PROTOCOL_NAME = "dubbo";
 
     // 每个Gather共享同一个Manager
-    private OpenApiSchemaConvertorManager manager;
+    private final OpenApiSchemaConvertorManager manager;
 
     public AbstractDubboServiceExtractor() {
         this.manager = new OpenApiSchemaConvertorManager();
diff --git a/dongtai-api-gather/dongtai-api-gather-openapi/src/main/java/io/dongtai/iast/api/openapi/convertor/ComponentDatabase.java b/dongtai-api-gather/dongtai-api-gather-openapi/src/main/java/io/dongtai/iast/api/openapi/convertor/ComponentDatabase.java
@@ -14,15 +14,15 @@
 public class ComponentDatabase {
 
     // 类到Schema的映射
-    private Map<Class, Schema> classToSchemaMap;
+    private final Map<Class, Schema> classToSchemaMap;
 
     // 已经发现了的类，用于避免重复处理，也避免碰到循环引用时递归爆栈
     private Set<Class> existsClassSet = new HashSet<>();
 
     // 符合类型的schema生成完毕的时候的回调方法，用于处理环形依赖
-    private Map<Class, List<Consumer<Schema>>> classSchemaDoneCallbackMap;
+    private final Map<Class, List<Consumer<Schema>>> classSchemaDoneCallbackMap;
 
-    private OpenApiSchemaConvertorManager manager;
+    private final OpenApiSchemaConvertorManager manager;
 
     public ComponentDatabase(OpenApiSchemaConvertorManager manager) {
         this.manager = manager;
diff --git a/dongtai-api-gather/dongtai-api-gather-spring-api/src/main/java/io/dongtai/iast/api/gather/spring/convertor/RequestMappingInfoConvertor.java b/dongtai-api-gather/dongtai-api-gather-spring-api/src/main/java/io/dongtai/iast/api/gather/spring/convertor/RequestMappingInfoConvertor.java
@@ -26,7 +26,7 @@ public class RequestMappingInfoConvertor {
     private final HandlerMethod handlerMethod;
 
     // 从方法中解析出的映射
-    private Map<String, Path> pathMap;
+    private final Map<String, Path> pathMap;
 
     public RequestMappingInfoConvertor(OpenApiSchemaConvertorManager manager, WebApplicationContext webApplicationContext, RequestMappingInfo requestMappingInfo, HandlerMethod handlerMethod) {
         this.manager = manager;
@@ -176,7 +176,7 @@ private Operation parseOperation() {
         operation.setOperationId(UUID.randomUUID().toString());
 
         // 全路径类名放在tags中
-        operation.setTags(Arrays.asList(this.handlerMethod.getBeanType().getName()));
+        operation.setTags(Collections.singletonList(this.handlerMethod.getBeanType().getName()));
 
         try {
             // 解析HandlerMethod
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/AgentEngine.java b/dongtai-core/src/main/java/io/dongtai/iast/core/AgentEngine.java
@@ -1,14 +1,16 @@
-package com.secnium.iast.core;
+package io.dongtai.iast.core;
 
 import io.dongtai.iast.common.constants.AgentConstant;
 import io.dongtai.iast.common.state.AgentState;
 import io.dongtai.iast.common.state.State;
-import io.dongtai.iast.core.EngineManager;
 import io.dongtai.iast.core.handler.hookpoint.models.policy.PolicyManager;
 import io.dongtai.iast.core.init.IEngine;
 import io.dongtai.iast.core.init.impl.ConfigEngine;
 import io.dongtai.iast.core.init.impl.TransformEngine;
-import io.dongtai.iast.core.service.*;
+import io.dongtai.iast.core.service.ServiceDirReport;
+import io.dongtai.iast.core.service.ServiceFactory;
+import io.dongtai.iast.core.service.StartUpTimeReport;
+import io.dongtai.iast.core.service.ThreadPools;
 import io.dongtai.iast.core.utils.PropertyUtils;
 import io.dongtai.log.DongTaiLog;
 import io.dongtai.log.ErrorCode;
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/IastClassFileTransformer.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/IastClassFileTransformer.java
@@ -126,9 +126,7 @@ public byte[] transform(final ClassLoader loader,
 
         if (internalClassName == null
                 || internalClassName.startsWith("io/dongtai/")
-                || internalClassName.startsWith("com/secnium/iast/")
                 || internalClassName.startsWith("java/lang/iast/")
-                || internalClassName.startsWith("cn/huoxian/iast/")
                 || internalClassName.startsWith("META-INF/")
                 || "module-info".equals(internalClassName)) {
             return null;
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/SpyDispatcherImpl.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/SpyDispatcherImpl.java
@@ -1,6 +1,6 @@
 package io.dongtai.iast.core.handler.hookpoint;
 
-import com.secnium.iast.core.AgentEngine;
+import io.dongtai.iast.core.AgentEngine;
 import io.dongtai.iast.common.config.ConfigBuilder;
 import io.dongtai.iast.common.config.ConfigKey;
 import io.dongtai.iast.common.scope.Scope;
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/MethodEvent.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/MethodEvent.java
@@ -7,7 +7,10 @@
 import io.dongtai.iast.core.utils.StringUtils;
 
 import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 方法事件
@@ -304,7 +307,7 @@ public String obj2String(Object value) {
                                 appendWithMaxLength(sb, subTaint.toString() + " ", taintValueLength);
                             }
                         } else {
-                            appendWithMaxLength(sb, taint.toString() + " ", taintValueLength);
+                            appendWithMaxLength(sb, taint + " ", taintValueLength);
                         }
                     }
                 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/policy/PolicyBuilder.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/policy/PolicyBuilder.java
@@ -10,7 +10,9 @@
 import io.dongtai.log.DongTaiLog;
 import io.dongtai.log.ErrorCode;
 import org.apache.commons.io.FileUtils;
-import org.json.*;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/DynamicPropagatorScanner.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/DynamicPropagatorScanner.java
@@ -34,7 +34,7 @@ public class DynamicPropagatorScanner implements IVulScan {
             new UnvalidatedRedirectCheck()
     ));
 
-    private static final Set<ServiceTrace> SERVICE_TRACES = new HashSet<ServiceTrace>(Arrays.asList(
+    private static final Set<ServiceTrace> SERVICE_TRACES = new HashSet<ServiceTrace>(Collections.singletonList(
             new HttpService()
     ));
 
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/utils/PropertyUtils.java b/dongtai-core/src/main/java/io/dongtai/iast/core/utils/PropertyUtils.java
@@ -113,15 +113,15 @@ public String toString() {
     }
 
     public String getBlackClassFilePath() {
-        return "com.secnium.iast.resources/blacklist.txt";
+        return "io.dongtai.resources/blacklist.txt";
     }
 
     public String getBlackUrl() {
-        return "com.secnium.iast.resources/blackurl.txt";
+        return "io.dongtai.resources/blackurl.txt";
     }
 
     public String getBlackExtFilePath() {
-        return "com.secnium.iast.resources/blackext.txt";
+        return "io.dongtai.resources/blackext.txt";
     }
 
     public String getDumpClassPath() {
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/utils/matcher/ConfigMatcher.java b/dongtai-core/src/main/java/io/dongtai/iast/core/utils/matcher/ConfigMatcher.java
@@ -142,11 +142,8 @@ public boolean canHook(String className, PolicyManager policyManager) {
             // DongTaiLog.trace("ignore transform {}. Reason: classname is a aop class by Proxy", className);
             return false;
         }
-        if (className.startsWith("com/secnium/iast/")
-                || className.startsWith("java/lang/iast/")
-                || className.startsWith("cn/huoxian/iast/")
+        if (className.startsWith("java/lang/iast/")
                 || className.startsWith("io/dongtai/")
-                || className.startsWith("oshi/")
                 || className.startsWith("com/sun/jna/")
         ) {
             // DongTaiLog.trace("ignore transform {}. Reason: class is in blacklist", className);
diff --git a/dongtai-core/src/main/resources/com.secnium.iast.resources/blacklist.txt b/dongtai-core/src/main/resources/com.secnium.iast.resources/blacklist.txt
diff --git a/dongtai-core/src/main/resources/io.dongtai.resources/blackext.txt b/dongtai-core/src/main/resources/io.dongtai.resources/blackext.txt
diff --git a/dongtai-core/src/main/resources/io.dongtai.resources/blacklist.txt b/dongtai-core/src/main/resources/io.dongtai.resources/blacklist.txt
diff --git a/dongtai-core/src/main/resources/io.dongtai.resources/blackurl.txt b/dongtai-core/src/main/resources/io.dongtai.resources/blackurl.txt

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ protected synchronized Class<?> loadClass(String name, boolean resolve) throws C`
`50`	`50`	`return loadedClass;`
`51`	`51`	`}`
`52`	`52`
`53`		`- if (!name.startsWith("io.dongtai") && !name.startsWith("com.secnium")`
`54`		`- && !name.startsWith("cn.huoxian") && !name.startsWith("java.lang.iast")) {`
	`53`	`+ if (!name.startsWith("io.dongtai") && !name.startsWith("java.lang.iast")) {`
`55`	`54`	`return super.loadClass(name, resolve);`
`56`	`55`	`}`
`57`	`56`