fix: add option disabled_plugins.

‘niuerzhuang’ · ‘niuerzhuang’ · commit 5274ec064340 · 2023-05-06T12:14:38.000+08:00
diff --git a/dongtai-agent/module-info.java b/dongtai-agent/module-info.java
diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/Agent.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/Agent.java
@@ -38,6 +38,7 @@ private static String[] parseAgentArgs(String[] args) throws ParseException {
         attachOptions.addOption(build("log_level", "log_level", "optional: DongTai agent log print level."));
         attachOptions.addOption(build("log_path", "log_path", "optional: DongTai agent log print path."));
         attachOptions.addOption(build("log_disable_collector", "log_disable_collector", "optional: DongTai agent disable log collector."));
+        attachOptions.addOption(build("disabled_plugins", "disabled_plugins", "optional: DongTai agent disable plugins."));
 
         CommandLineParser parser = new DefaultParser();
         HelpFormatter formatter = new HelpFormatter();
diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/AgentLauncher.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/AgentLauncher.java
@@ -2,7 +2,6 @@
 
 import io.dongtai.iast.agent.manager.EngineManager;
 import io.dongtai.iast.agent.monitor.MonitorDaemonThread;
-import io.dongtai.iast.agent.monitor.impl.AgentStateMonitor;
 import io.dongtai.iast.agent.report.AgentRegisterReport;
 import io.dongtai.iast.common.constants.AgentConstant;
 import io.dongtai.iast.common.scope.ScopeManager;
diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/IastProperties.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/IastProperties.java
@@ -33,6 +33,7 @@ public class IastProperties {
         put("log_path", PropertyConstant.PROPERTY_LOG_PATH);
         put("log_disable_collector", PropertyConstant.PROPERTY_LOG_DISABLE_COLLECTOR);
         put("uuid_path", PropertyConstant.PROPERTY_UUID_PATH);
+        put("disabled_plugins", PropertyConstant.PROPERTY_DISABLED_PLUGINS);
     }};
 
     private static IastProperties instance;
diff --git a/dongtai-common/src/main/java/io/dongtai/iast/common/constants/PropertyConstant.java b/dongtai-common/src/main/java/io/dongtai/iast/common/constants/PropertyConstant.java
@@ -32,4 +32,5 @@ public class PropertyConstant {
     public static final String PROPERTY_RESPONSE_LENGTH = "dongtai.response.length";
     public static final String PROPERTY_POLICY_PATH = "dongtai.policy.path";
     public static final String PROPERTY_UUID_PATH = "dongtai.uuid.path";
+    public static final String PROPERTY_DISABLED_PLUGINS = "dongtai.disabled.plugins";
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/DispatchPlugin.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/DispatchPlugin.java
@@ -16,4 +16,6 @@ public interface DispatchPlugin {
      * @return ClassVisitor 命中的类访问起
      */
     ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Policy policy);
+
+    String getName();
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/PluginRegister.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/PluginRegister.java
@@ -9,13 +9,12 @@
 import io.dongtai.iast.core.bytecode.enhance.plugin.hardcoded.DispatchHardcodedPlugin;
 import io.dongtai.iast.core.bytecode.enhance.plugin.service.jdbc.DispatchJdbc;
 import io.dongtai.iast.core.bytecode.enhance.plugin.service.kafka.DispatchKafka;
-import io.dongtai.iast.core.bytecode.enhance.plugin.spring.DispatchSpringApplication;
+import io.dongtai.iast.core.bytecode.enhance.plugin.spring.DispatchApiCollector;
 import io.dongtai.iast.core.handler.hookpoint.models.policy.Policy;
 import io.dongtai.iast.core.handler.hookpoint.models.policy.PolicyManager;
 import org.objectweb.asm.ClassVisitor;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author dongzhiyong@huoxian.cn
@@ -28,25 +27,26 @@ public class PluginRegister {
     private final List<DispatchPlugin> plugins;
 
     public PluginRegister() {
-        this.plugins = new ArrayList<DispatchPlugin>();
-        if(!"false".equals(System.getProperty("dongtai.plugin.api"))){
-            this.plugins.add(new DispatchSpringApplication());
-        }
-        this.plugins.add(new DispatchJ2ee());
-        if(!"false".equals(System.getProperty("dongtai.plugin.kafka"))) {
-            this.plugins.add(new DispatchKafka());
-        }
-        this.plugins.add(new DispatchJdbc());
-        if(!"false".equals(System.getProperty("dongtai.plugin.shiro"))) {
-            this.plugins.add(new DispatchShiro());
-        }
-        if(!"false".equals(System.getProperty("dongtai.plugin.feign"))) {
-            this.plugins.add(new DispatchFeign());
-        }
-        if(!"false".equals(System.getProperty("dongtai.plugin.dubbo"))) {
-            this.plugins.add(new DispatchDubbo());
-        }
-        this.plugins.add(new DispatchClassPlugin());
+        this.plugins = new ArrayList<>();
+        List<String> disabledPlugins = getdisabledPlugins();
+        List<DispatchPlugin> allPlugins = new ArrayList<>(Arrays.asList(
+                new DispatchApiCollector(),
+                new DispatchJ2ee(),
+                new DispatchKafka(),
+                new DispatchJdbc(),
+                new DispatchShiro(),
+                new DispatchFeign(),
+                new DispatchDubbo(),
+                new DispatchClassPlugin()
+        ));
+        allPlugins.removeIf(plugin -> disabledPlugins != null && disabledPlugins.contains(plugin.getName()));
+        this.plugins.addAll(allPlugins);
+    }
+
+    private List<String> getdisabledPlugins() {
+        return Optional.ofNullable(System.getProperty("dongtai.disabled.plugins"))
+                .map(s -> Arrays.asList(s.split(",")))
+                .orElse(null);
     }
 
     public ClassVisitor initial(ClassVisitor classVisitor, ClassContext context, PolicyManager policyManager) {
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/authentication/shiro/DispatchShiro.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/authentication/shiro/DispatchShiro.java
@@ -17,4 +17,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
         }
         return classVisitor;
     }
+
+    @Override
+    public String getName() {
+        return "shiro";
+    }
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/core/DispatchClassPlugin.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/core/DispatchClassPlugin.java
@@ -39,6 +39,11 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext classContex
         return new ClassVisit(classVisitor, classContext, policy);
     }
 
+    @Override
+    public String getName() {
+        return "class";
+    }
+
     public class ClassVisit extends AbstractClassVisitor {
         private int classVersion;
         private final MethodAdapter[] methodAdapters;
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/dubbo/DispatchDubbo.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/dubbo/DispatchDubbo.java
@@ -36,4 +36,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
 
         return classVisitor;
     }
+
+    @Override
+    public String getName() {
+        return "dubbo";
+    }
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/feign/DispatchFeign.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/feign/DispatchFeign.java
@@ -18,4 +18,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
 
         return classVisitor;
     }
+
+    @Override
+    public String getName() {
+        return "feign";
+    }
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/j2ee/dispatch/DispatchJ2ee.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/j2ee/dispatch/DispatchJ2ee.java
@@ -48,6 +48,11 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
         return classVisitor;
     }
 
+    @Override
+    public String getName() {
+        return "j2ee";
+    }
+
     private boolean isJavaxServlet(String className, Set<String> diagram) {
         return JAVAX_FACES_SERVLET.equals(className) || JAVAX_HTTP_SERVLET.equals(className)
                 || diagram.contains(JAVAX_HTTP_SERVLET) || diagram.contains(JAVAX_FILTER);
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/hardcoded/DispatchHardcodedPlugin.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/hardcoded/DispatchHardcodedPlugin.java
@@ -33,6 +33,11 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
         return classVisitor;
     }
 
+    @Override
+    public String getName() {
+        return "hardcode";
+    }
+
     private class ExtractClassContent extends AbstractClassVisitor {
 
         private String source;
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/service/jdbc/DispatchJdbc.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/service/jdbc/DispatchJdbc.java
@@ -27,4 +27,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
 
         return classVisitor;
     }
+
+    @Override
+    public String getName() {
+        return "jdbc";
+    }
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/service/kafka/DispatchKafka.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/service/kafka/DispatchKafka.java
@@ -18,4 +18,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
 
         return classVisitor;
     }
+
+    @Override
+    public String getName() {
+        return "kafka";
+    }
 }
diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/DispatchApiCollector.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/DispatchApiCollector.java
@@ -5,7 +5,7 @@
 import io.dongtai.iast.core.handler.hookpoint.models.policy.Policy;
 import org.objectweb.asm.ClassVisitor;
 
-public class DispatchSpringApplication implements DispatchPlugin {
+public class DispatchApiCollector implements DispatchPlugin {
 
     private static final String FRAMEWORK_SERVLET = " org.springframework.web.servlet.FrameworkServlet".substring(1);
 
@@ -17,4 +17,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
         }
         return classVisitor;
     }
+
+    @Override
+    public String getName() {
+        return "api";
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,5 @@ public class PropertyConstant {`
`32`	`32`	`public static final String PROPERTY_RESPONSE_LENGTH = "dongtai.response.length";`
`33`	`33`	`public static final String PROPERTY_POLICY_PATH = "dongtai.policy.path";`
`34`	`34`	`public static final String PROPERTY_UUID_PATH = "dongtai.uuid.path";`
	`35`	`+ public static final String PROPERTY_DISABLED_PLUGINS = "dongtai.disabled.plugins";`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ public interface DispatchPlugin {`
`16`	`16`	`* @return ClassVisitor 命中的类访问起`
`17`	`17`	`*/`
`18`	`18`	`ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Policy policy);`
	`19`	`+`
	`20`	`+ String getName();`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po`
`17`	`17`	`}`
`18`	`18`	`return classVisitor;`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ @Override`
	`22`	`+ public String getName() {`
	`23`	`+ return "shiro";`
	`24`	`+ }`
`20`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po`
`36`	`36`
`37`	`37`	`return classVisitor;`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ @Override`
	`41`	`+ public String getName() {`
	`42`	`+ return "dubbo";`
	`43`	`+ }`
`39`	`44`	`}`