Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: kafka exception. #521

Merged
merged 3 commits into from
May 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed dongtai-agent/module-info.java
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ public interface DispatchPlugin {
* @return ClassVisitor 命中的类访问起
*/
ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Policy policy);

String getName();
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,18 +27,28 @@ public class PluginRegister {
private final List<DispatchPlugin> plugins;

public PluginRegister() {
this.plugins = new ArrayList<DispatchPlugin>();
this.plugins.add(new DispatchSpringApplication());
this.plugins.add(new DispatchJ2ee());
this.plugins.add(new DispatchKafka());
this.plugins.add(new DispatchJdbc());
this.plugins.add(new DispatchShiro());
this.plugins.add(new DispatchFeign());
this.plugins.add(new DispatchDubbo());

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()
));
allPlugins.removeIf(plugin -> disabledPlugins != null && disabledPlugins.contains(plugin.getName()));
this.plugins.addAll(allPlugins);
this.plugins.add(new DispatchClassPlugin());
}

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) {
Policy policy = policyManager.getPolicy();
if (policy == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
}
return classVisitor;
}

@Override
public String getName() {
return "shiro";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po

return classVisitor;
}

@Override
public String getName() {
return "dubbo";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po

return classVisitor;
}

@Override
public String getName() {
return "feign";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po

return classVisitor;
}

@Override
public String getName() {
return "jdbc";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po

return classVisitor;
}

@Override
public String getName() {
return "kafka";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.dongtai.iast.core.bytecode.enhance.asm.AsmTypes;
import io.dongtai.iast.core.handler.hookpoint.service.ServiceType;
import io.dongtai.iast.core.utils.AsmUtils;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.AdviceAdapter;
Expand All @@ -20,6 +21,12 @@ protected KafkaAbstractConfigInitAdviceAdapter(MethodVisitor mv, int access, Str
@Override
protected void onMethodExit(int opcode) {
if (opcode != ATHROW) {
Label tryL = new Label();
Label catchL = new Label();
Label exHandlerL = new Label();
visitTryCatchBlock(tryL, catchL, exHandlerL, ASM_TYPE_THROWABLE.getInternalName());
visitLabel(tryL);

localServers = newLocal(Type.getType(List.class));
loadThis();
push("bootstrap.servers");
Expand All @@ -39,6 +46,13 @@ protected void onMethodExit(int opcode) {
push("");
push("KafkaUrlHandler");
invokeInterface(ASM_TYPE_SPY_DISPATCHER, SPY$reportService);

visitLabel(catchL);
Label endL = new Label();
visitJumpInsn(GOTO, endL);
visitLabel(exHandlerL);
visitVarInsn(ASTORE, this.nextLocal);
visitLabel(endL);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -17,4 +17,9 @@ public ClassVisitor dispatch(ClassVisitor classVisitor, ClassContext context, Po
}
return classVisitor;
}

@Override
public String getName() {
return "api";
}
}
Loading