Merge pull request #539 from lostsnow/feature/add-parameter-type-to-dubbo-request-uri

add parameter types to dubbo request uri

Author: lostsnow

dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/asm/AsmMethods.java

@@ -167,6 +167,7 @@ static Method getAsmMethod(final Class<?> clazz,
             Object.class,
             String.class,
             Object[].class,
+            Class[].class,
             Map.class,
             String.class,
             String.class,

dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/framework/dubbo/DubboProxyHandlerInvokeAdviceAdapter.java

@@ -9,6 +9,7 @@
 public class DubboProxyHandlerInvokeAdviceAdapter extends AbstractAdviceAdapter {
     private static final Method GET_ARGUMENTS_METHOD = Method.getMethod("java.lang.Object[] getArguments()");
     private static final Method GET_METHOD_NAME_METHOD = Method.getMethod("java.lang.String getMethodName()");
+    private static final Method GET_PARAMETER_TYPES_METHOD = Method.getMethod("java.lang.Class[] getParameterTypes()");
 
     private final String packageName;
     private final Type invocationType;
@@ -60,6 +61,8 @@ private void collectDubboRequestSource() {
         loadArg(0);
         invokeInterface(this.invocationType, GET_ARGUMENTS_METHOD);
         loadArg(0);
+        invokeInterface(this.invocationType, GET_PARAMETER_TYPES_METHOD);
+        loadArg(0);
         invokeInterface(this.invocationType, this.getAttachmentsMethod);
         push(this.classContext.getClassName());
         push(this.name);

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

@@ -337,7 +337,7 @@ public void collectDubboRequest(Object handler, Object channel, Object request,
 
     @Override
     public void collectDubboRequestSource(Object handler, Object invocation, String methodName,
-                                          Object[] arguments, Map<String, ?> headers,
+                                          Object[] arguments, Class<?>[] argumentTypes, Map<String, ?> headers,
                                           String hookClass, String hookMethod, String hookSign) {
         try {
             ScopeManager.SCOPE_TRACKER.getPolicyScope().enterAgent();
@@ -346,7 +346,7 @@ public void collectDubboRequestSource(Object handler, Object invocation, String
                 return;
             }
 
-            DubboImpl.collectDubboRequestSource(handler, invocation, methodName, arguments, headers,
+            DubboImpl.collectDubboRequestSource(handler, invocation, methodName, arguments, argumentTypes, headers,
                     hookClass, hookMethod, hookSign, INVOKE_ID_SEQUENCER);
         } catch (Throwable e) {
             DongTaiLog.warn(ErrorCode.get("SPY_COLLECT_DUBBO_FAILED"), "request source", e);

dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/controller/impl/DubboImpl.java

@@ -44,7 +44,7 @@ public static void solveDubboRequest(Object handler, Object channel, Object requ
 
 
     public static void collectDubboRequestSource(Object handler, Object invocation, String methodName,
-                                                 Object[] arguments, Map<String, ?> headers,
+                                                 Object[] arguments, Class<?>[] argumentTypes, Map<String, ?> headers,
                                                  String hookClass, String hookMethod, String hookSign,
                                                  AtomicInteger invokeIdSequencer) {
         if (arguments == null || arguments.length == 0) {
@@ -57,6 +57,23 @@ public static void collectDubboRequestSource(Object handler, Object invocation,
 
         String url = (String) requestMeta.get("requestURL") + "/" + methodName;
         String uri = (String) requestMeta.get("requestURI") + "/" + methodName;
+
+        StringBuilder argSign = new StringBuilder("(");
+        if (argumentTypes != null && argumentTypes.length > 0) {
+            int i = 0;
+            for (Class<?> argumentType : argumentTypes) {
+                if (i != 0) {
+                    argSign.append(",");
+                }
+                argSign.append(argumentType.getCanonicalName());
+                i++;
+            }
+        }
+        argSign.append(")");
+        String argSignStr = argSign.toString();
+        url += argSignStr;
+        uri += argSignStr;
+
         requestMeta.put("requestURL", url);
         requestMeta.put("requestURI", uri);
 

dongtai-spy/src/main/java/java/lang/dongtai/NopSpy.java

@@ -97,7 +97,7 @@ public void collectDubboRequest(Object handler, Object channel, Object request,
 
     @Override
     public void collectDubboRequestSource(Object handler, Object invocation, String methodName,
-                                          Object[] arguments, Map<String, ?> headers,
+                                          Object[] arguments, Class<?>[] argumentTypes, Map<String, ?> headers,
                                           String hookClass, String hookMethod, String hookSign) {
     }
 

dongtai-spy/src/main/java/java/lang/dongtai/SpyDispatcher.java

@@ -60,7 +60,7 @@ void collectDubboRequest(Object handler, Object channel, Object request,
                              boolean isTwoWay, boolean isEvent, boolean isBroken, boolean isHeartbeat);
 
     void collectDubboRequestSource(Object handler, Object invocation, String methodName,
-                                   Object[] arguments, Map<String, ?> headers,
+                                   Object[] arguments, Class<?>[] argumentTypes, Map<String, ?> headers,
                                    String hookClass, String hookMethod, String hookSign);
 
     void collectDubboResponse(Object result, byte status);