Merge remote-tracking branch 'origin/fix/clean-code' into fix/clean-code

Author: ‘niuerzhuang’

dongtai-agent/pom.xml

@@ -25,13 +25,6 @@
             <version>${commons-lang3.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>

dongtai-api-gather/dongtai-api-gather-openapi/pom.xml

@@ -24,12 +24,6 @@
             <version>${fastjson2.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

dongtai-api-gather/dongtai-api-gather-spring-api/pom.xml

@@ -30,12 +30,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

dongtai-api-gather/dongtai-api-gather-spring-api/src/main/java/io/dongtai/iast/api/gather/spring/extractor/SpringMVCApiExtractor.java

@@ -2,6 +2,7 @@
 
 import io.dongtai.iast.api.gather.spring.convertor.RequestMappingHandlerMappingConvertor;
 import io.dongtai.iast.api.openapi.domain.OpenApi;
+import io.dongtai.iast.common.utils.ExceptionUtil;
 import io.dongtai.log.DongTaiLog;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
@@ -72,7 +73,11 @@ private List<RequestMappingHandlerMapping> findRequestMappingHandlerMapping(WebA
                 }
             }
         } catch (Throwable e) {
-            DongTaiLog.debug("try use BeanFactoryUtils find RequestMappingHandlerMapping exception", e);
+            // 仅在出现预期外错误的时候才打印日志
+            String s = ExceptionUtil.getPrintStackTraceString(e);
+            if (!s.contains("java.lang.NoSuchMethodException: org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors()")) {
+                DongTaiLog.debug("try use BeanFactoryUtils throw RequestMappingHandlerMapping exception", e);
+            }
         }
 
         // 没有工具类，就只从自己里面找

dongtai-api-gather/pom.xml

@@ -18,4 +18,13 @@
         <module>dongtai-api-gather-dubbo-api</module>
     </modules>
 
+    <dependencies>
+        <dependency>
+            <groupId>io.dongtai.iast</groupId>
+            <artifactId>dongtai-common</artifactId>
+            <version>${revision}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
 </project>

dongtai-common/pom.xml

@@ -37,12 +37,6 @@
             <artifactId>fastjson2</artifactId>
             <version>${fastjson2.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

dongtai-common/src/main/java/io/dongtai/iast/common/utils/ExceptionUtil.java

@@ -0,0 +1,27 @@
+package io.dongtai.iast.common.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * 处理异常相关的公共逻辑提取到这里
+ *
+ * @author CC11001100
+ * @since 1.13.2
+ */
+public class ExceptionUtil {
+
+    /**
+     * 把printStackTrace会打印的内容以字符串的形式返回
+     *
+     * @param e
+     * @return
+     */
+    public static String getPrintStackTraceString(Throwable e) {
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+        e.printStackTrace(printWriter);
+        return stringWriter.toString();
+    }
+
+}

dongtai-common/src/test/java/io/dongtai/iast/common/utils/ExceptionUtilTest.java

@@ -0,0 +1,20 @@
+package io.dongtai.iast.common.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author CC11001100
+ */
+public class ExceptionUtilTest {
+
+    @Test
+    public void getPrintStackTraceString() {
+        Exception e = new Exception();
+        String printStackTraceString = ExceptionUtil.getPrintStackTraceString(e);
+        Assert.assertNotNull(printStackTraceString);
+    }
+
+}

dongtai-core/pom.xml

@@ -145,12 +145,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-spy</artifactId>

dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/MethodEvent.java

@@ -4,7 +4,6 @@
 import io.dongtai.iast.core.handler.hookpoint.models.policy.TaintPosition;
 import io.dongtai.iast.core.handler.hookpoint.models.taint.range.TaintRanges;
 import io.dongtai.iast.core.utils.PropertyUtils;
-import io.dongtai.iast.core.utils.StringUtils;
 
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -18,10 +17,6 @@
  * @author [email protected]
  */
 public class MethodEvent {
-    /**
-     * max display value size for object/return/parameters
-     */
-    private static final int MAX_VALUE_LENGTH = 1024;
 
     /**
      * method invoke id
@@ -249,7 +244,7 @@ public void setReturnValue(Object ret, boolean hasTaint) {
 
     private String formatValue(Object val, boolean hasTaint) {
         String str = obj2String(val);
-        return "[" + StringUtils.normalize(str, MAX_VALUE_LENGTH) + "]"
+        return "[" + str + "]"
                 + (hasTaint ? "*" : "") + str.length();
     }
 
@@ -304,10 +299,12 @@ public String obj2String(Object value) {
                         if (taint.getClass().isArray() && !taint.getClass().getComponentType().isPrimitive()) {
                             Object[] subTaints = (Object[]) taint;
                             for (Object subTaint : subTaints) {
-                                appendWithMaxLength(sb, subTaint.toString() + " ", taintValueLength);
+                                appendWithMaxLength(sb, subTaint.toString(), taintValueLength);
+                                sb.append(" ");
                             }
                         } else {
-                            appendWithMaxLength(sb, taint + " ", taintValueLength);
+                            appendWithMaxLength(sb, taint.toString(), taintValueLength);
+                            sb.append(" ");
                         }
                     }
                 }