Merge pull request #332 from Nizernizer/main

Nizernizer · web-flow · commit cb6ee9c29973 · 2022-06-24T17:08:03.000+08:00
feat agent uninstall
diff --git a/dongtai-agent/pom.xml b/dongtai-agent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.dongtai.iast</groupId>
         <artifactId>iast</artifactId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <artifactId>dongtai-agent</artifactId>
     <name>dongtai-agent</name>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/Constant.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/Constant.java
@@ -4,7 +4,7 @@
  * @author dongzhiyong@huoxian.cn
  */
 public class Constant {
-    public static final String AGENT_VERSION_VALUE = "v1.7.1";
+    public static final String AGENT_VERSION_VALUE = "v1.7.2";
     public static final String LANGUAGE = "JAVA";
 
     public final static String API_AGENT_REGISTER = "/api/v1/agent/register";
diff --git a/dongtai-agent/src/main/resources/bin/fluent.conf b/dongtai-agent/src/main/resources/bin/fluent.conf
@@ -9,8 +9,9 @@
   Db           /tmp/ng.db
   Db.sync      Full
   Tag          Dongtai-${HOSTNAME_AGENT_ID}.log
-  Buffer_Chunk_Size 320KB
-  Buffer_Max_Size   520KB
+  Buffer_Chunk_Size 8MB
+  Buffer_Max_Size   16MB
+  Skip_Long_Lines   On
   Read_from_Head    true
 [FILTER]
   Name         record_modifier
diff --git a/dongtai-agent/src/main/resources/iast.properties b/dongtai-agent/src/main/resources/iast.properties
@@ -1,6 +1,6 @@
-iast.name=dongtai-Enterprise 1.7.1
+iast.name=dongtai-Enterprise 1.7.2
 iast.response.name=dongtai
-iast.response.value=1.7.1
+iast.response.value=1.7.2
 iast.server.url=https://iast.io/openapi
 iast.server.token=39133a96f5735c253edd908078846c1051824edc
 iast.allhook.enable=false
diff --git a/dongtai-agent/src/main/resources/iast.properties.example b/dongtai-agent/src/main/resources/iast.properties.example
@@ -1,7 +1,7 @@
 # iast.properties file example
-iast.name=dongtai-Enterprise 1.7.1
+iast.name=dongtai-Enterprise 1.7.2
 iast.response.name=dongtai
-iast.response.value=1.7.1
+iast.response.value=1.7.2
 iast.server.url=https://iast.io/openapi
 iast.server.token=39133a96f5735c253edd908078846c1051824edc
 iast.allhook.enable=false
diff --git a/dongtai-api/pom.xml b/dongtai-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>cn.huoxian.iast</groupId>
             <artifactId>dongtai-spring-api</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
         </dependency>
     </dependencies>
 
diff --git a/dongtai-api/src/main/java/io/dongtai/api/jakarta/JakartaResponseWrapper.java b/dongtai-api/src/main/java/io/dongtai/api/jakarta/JakartaResponseWrapper.java
@@ -23,7 +23,7 @@ public class JakartaResponseWrapper extends HttpServletResponseWrapper implement
 
     public JakartaResponseWrapper(HttpServletResponse response) {
         super(response);
-        response.addHeader("DongTai", "v1.7.1");
+        response.addHeader("DongTai", "v1.7.2");
     }
 
     @Override
diff --git a/dongtai-api/src/main/java/io/dongtai/api/servlet2/ServletResponseWrapper.java b/dongtai-api/src/main/java/io/dongtai/api/servlet2/ServletResponseWrapper.java
@@ -21,7 +21,7 @@ public class ServletResponseWrapper extends HttpServletResponseWrapper implement
 
     public ServletResponseWrapper(HttpServletResponse response) {
         super(response);
-        response.addHeader("DongTai", "v1.7.1");
+        response.addHeader("DongTai", "v1.7.2");
     }
 
     private String getLine() {
diff --git a/dongtai-common/pom.xml b/dongtai-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dongtai-core/pom.xml b/dongtai-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.dongtai.iast</groupId>
         <artifactId>iast</artifactId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <artifactId>dongtai-core</artifactId>
     <name>dongtai-core</name>
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-spy</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -224,7 +224,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
         </dependency>
         <dependency>
             <groupId>io.dongtai.iast</groupId>
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
@@ -46,6 +46,7 @@ public class IastClassFileTransformer implements ClassFileTransformer {
     private final PluginRegister plugins;
     private static IastClassFileTransformer INSTANCE;
     private final IastHookRuleModel hookRuleModel;
+    private final static HashMap<Object,byte[]> transformMap = new HashMap<>();
 
     /**
      * Gets a singleton object
@@ -154,6 +155,11 @@ public byte[] transform(final ClassLoader loader,
                     cr.accept(cv, ClassReader.EXPAND_FRAMES);
                     AbstractClassVisitor dumpClassVisitor = (AbstractClassVisitor) cv;
                     if (dumpClassVisitor.hasTransformed()) {
+                        if (null == classBeingRedefined){
+                            transformMap.put(className,srcByteCodeArray);
+                        }else {
+                            transformMap.put(classBeingRedefined,srcByteCodeArray);
+                        }
                         transformCount++;
                         return dumpClassIfNecessary(cr.getClassName(), cw.toByteArray(), srcByteCodeArray);
                     }
@@ -315,5 +321,8 @@ public void reTransform() {
         DongTaiLog.debug("finish reTransform, class count: {}, time: {}", getTransformCount(), stopWatch.getTime());
     }
 
+    public static HashMap<Object, byte[]> getTransformMap() {
+        return transformMap;
+    }
 }
 
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/init/impl/TransformEngine.java b/dongtai-core/src/main/java/io/dongtai/iast/core/init/impl/TransformEngine.java
@@ -5,7 +5,12 @@
 import io.dongtai.iast.core.bytecode.IastClassFileTransformer;
 import io.dongtai.log.DongTaiLog;
 
+import java.lang.instrument.ClassDefinition;
 import java.lang.instrument.Instrumentation;
+import java.lang.instrument.UnmodifiableClassException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Set;
 
 /**
  * @author dongzhiyong@huoxian.cn
@@ -46,6 +51,29 @@ public void stop() {
     @Override
     public void destroy() {
         inst.removeTransformer(classFileTransformer);
+        HashMap<Object, byte[]> transformMap = IastClassFileTransformer.getTransformMap();
+        int classSize = transformMap.size();
+        ClassDefinition[] classDefinitions = new ClassDefinition[classSize];
+        ArrayList<ClassDefinition> classDefinitionArrayList = new ArrayList<>();
+        Set<Object> classes = transformMap.keySet();
+        for (Object aClass:classes){
+            if(aClass instanceof String){
+                try {
+                    Class<?> transformClass = Class.forName((String) aClass);
+                    classDefinitionArrayList.add(new ClassDefinition(transformClass,transformMap.get(aClass)));
+                } catch (ClassNotFoundException e) {
+                    DongTaiLog.debug(e);
+                }
+            }else if (aClass instanceof Class<?>){
+                classDefinitionArrayList.add(new ClassDefinition((Class<?>) aClass,transformMap.get(aClass)));
+            }
+        }
+        classDefinitionArrayList.toArray(classDefinitions);
+        try {
+            inst.redefineClasses(classDefinitions);
+        } catch (ClassNotFoundException | UnmodifiableClassException e) {
+            DongTaiLog.error(e);
+        }
         inst = null;
         classFileTransformer = null;
     }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/utils/Constants.java b/dongtai-core/src/main/java/io/dongtai/iast/core/utils/Constants.java
@@ -4,7 +4,7 @@
  * @author dongzhiyong@huoxian.cn
  */
 public class Constants {
-    public static final String AGENT_VERSION_VALUE = "v1.7.1";
+    public static final String AGENT_VERSION_VALUE = "v1.7.2";
     public final static String API_REPORT_UPLOAD = "/api/v1/report/upload";
     public final static String SERVER_ADDRESS = "/api/v1/agent/update";
     public final static String API_HOOK_PROFILE = "/api/v1/profiles";
diff --git a/dongtai-log/pom.xml b/dongtai-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dongtai-plugins/dongtai-grpc/pom.xml b/dongtai-plugins/dongtai-grpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dongtai-plugins</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dongtai-plugins/pom.xml b/dongtai-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-core</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/dongtai-spring-api/pom.xml b/dongtai-spring-api/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.huoxian.iast</groupId>
     <artifactId>dongtai-spring-api</artifactId>
-    <version>1.7.1</version>
+    <version>1.7.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.dongtai.iast</groupId>
             <artifactId>dongtai-log</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
         </dependency>
     </dependencies>
 
diff --git a/dongtai-spy/pom.xml b/dongtai-spy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iast</artifactId>
         <groupId>io.dongtai.iast</groupId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
 
     <groupId>io.dongtai.iast</groupId>
     <artifactId>iast</artifactId>
-    <version>1.7.1</version>
+    <version>1.7.2</version>
     <packaging>pom</packaging>
 
     <name>dongtai-agent-java</name>
@@ -118,12 +118,12 @@
             <dependency>
                 <groupId>io.dongtai.iast</groupId>
                 <artifactId>dongtai-spy</artifactId>
-                <version>1.7.1</version>
+                <version>1.7.2</version>
             </dependency>
             <dependency>
                 <groupId>io.dongtai.iast</groupId>
                 <artifactId>dongtai-core</artifactId>
-                <version>1.7.1</version>
+                <version>1.7.2</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class JakartaResponseWrapper extends HttpServletResponseWrapper implement`
`23`	`23`
`24`	`24`	`public JakartaResponseWrapper(HttpServletResponse response) {`
`25`	`25`	`super(response);`
`26`		`- response.addHeader("DongTai", "v1.7.1");`
	`26`	`+ response.addHeader("DongTai", "v1.7.2");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ServletResponseWrapper extends HttpServletResponseWrapper implement`
`21`	`21`
`22`	`22`	`public ServletResponseWrapper(HttpServletResponse response) {`
`23`	`23`	`super(response);`
`24`		`- response.addHeader("DongTai", "v1.7.1");`
	`24`	`+ response.addHeader("DongTai", "v1.7.2");`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private String getLine() {`