Merge pull request #592 from 15911075183ma/fix-Feign-bug

Fix feign bug

Author: mazp99

dongtai-agent/src/test/java/io/dongtai/iast/agent/util/ByteUtilsTest.java

@@ -0,0 +1,38 @@
+package io.dongtai.iast.agent.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ByteUtilsTest {
+    @Test
+    public void testFormatByteSize() {
+        // 测试formatByteSize方法是否返回正确的格式化字符串
+
+        // 测试不足1KB的情况
+        Assert.assertEquals("0B", ByteUtils.formatByteSize(0));
+        Assert.assertEquals("1023B", ByteUtils.formatByteSize(1023));
+
+        // 测试不足1MB的情况
+        Assert.assertEquals("1KB", ByteUtils.formatByteSize(1024));
+        Assert. assertEquals("1.5KB", ByteUtils.formatByteSize(1536));
+        Assert.assertEquals("1023.5KB", ByteUtils.formatByteSize(1023 * 1024 + 512));
+
+        // 测试不足1GB的情况
+        Assert.assertEquals("1MB", ByteUtils.formatByteSize(1024 * 1024));
+        Assert.assertEquals("1.5MB", ByteUtils.formatByteSize(1536 * 1024));
+        Assert.assertEquals("1023.5MB", ByteUtils.formatByteSize(1023 * 1024 * 1024 + 512 * 1024));
+
+        // 测试不足1TB的情况
+        Assert.assertEquals("1GB", ByteUtils.formatByteSize(1024 * 1024 * 1024));
+        Assert.assertEquals("1.5GB", ByteUtils.formatByteSize(1536 * 1024 * 1024));
+        Assert.assertEquals("1023.5GB", ByteUtils.formatByteSize(1023L * 1024 * 1024 * 1024 + 512 * 1024 * 1024));
+
+        // 测试不足1PB的情况
+        Assert.assertEquals("1TB", ByteUtils.formatByteSize(1024L * 1024 * 1024 * 1024));
+        Assert.assertEquals("1.5TB", ByteUtils.formatByteSize(1536L * 1024 * 1024 * 1024));
+        Assert.assertEquals("1023.5TB", ByteUtils.formatByteSize(1023L * 1024 * 1024 * 1024 * 1024 + 512L * 1024 * 1024 * 1024));
+
+        // 测试超过1PB的情况
+        Assert.assertEquals(">PB", ByteUtils.formatByteSize(Long.MAX_VALUE));
+    }
+}

dongtai-agent/src/test/java/io/dongtai/iast/agent/util/FileUtilsTest.java

@@ -0,0 +1,35 @@
+package io.dongtai.iast.agent.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class FileUtilsTest {
+    @Test
+    public void testGetResourceToFile() {
+        // 测试getResourceToFile方法是否能正确地将资源文件复制到指定的文件路径
+
+        //获取临时文件路径
+        String tempDirectoryPath = org.apache.commons.io.FileUtils.getTempDirectoryPath();
+
+        String resourceName = "iast.properties.example"; // 假设存在名为test_resource.txt的资源文件
+        String fileName = tempDirectoryPath + "test.example"; // 替换为实际的目标文件路径
+
+        boolean result;
+        try {
+            result = FileUtils.getResourceToFile(resourceName, fileName);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        Assert.assertTrue(result); // 验证复制操作是否成功
+
+        // 验证目标文件是否存在
+        java.io.File targetFile = new java.io.File(fileName);
+        Assert.assertTrue(targetFile.exists());
+
+        // 清理测试产生的文件
+        targetFile.delete();
+    }
+}

dongtai-api-gather/dongtai-api-gather-dubbo-api/src/test/java/io/dongtai/iast/api/gather/dubbo/convertor/MethodConvertorTest.java

@@ -0,0 +1,75 @@
+package io.dongtai.iast.api.gather.dubbo.convertor;
+
+import io.dongtai.iast.api.openapi.convertor.OpenApiSchemaConvertorManager;
+import io.dongtai.iast.api.openapi.domain.DataType;
+import io.dongtai.iast.api.openapi.domain.MediaType;
+import io.dongtai.iast.api.openapi.domain.Operation;
+import io.dongtai.iast.api.openapi.domain.Response;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MethodConvertorTest {
+
+    private OpenApiSchemaConvertorManager manager;
+    private Method reflectionMethod;
+    private Method reflectionReturnMethod;
+
+    @Before
+    public void setUp() throws NoSuchMethodException {
+        // 创建 OpenApiSchemaConvertorManager 实例，或者使用真实的实例
+        manager = new OpenApiSchemaConvertorManager();
+
+        // 创建反射方法，或者使用真实的反射方法
+        reflectionMethod = SampleService.class.getMethod("sampleMethod",String.class,String.class);
+        reflectionReturnMethod = SampleService.class.getMethod("stringListSampleMethod",int.class);
+    }
+
+    @Test
+    public void testConvert() {
+        // 创建 MethodConvertor 实例
+        MethodConvertor methodConvertor = new MethodConvertor(manager, reflectionMethod);
+
+        // 调用 convert 方法
+        Operation convertedOperation = methodConvertor.convert();
+
+        // 进行断言，验证转换后的 Operation 对象是否符合预期
+        Assert.assertNotNull(convertedOperation);
+        //判断类型是否正确
+        Assert.assertEquals(DataType.String().getType(),convertedOperation.getParameters().get(0).getSchema().getType());
+        Assert.assertEquals(DataType.String().getType(),convertedOperation.getParameters().get(1).getSchema().getType());
+
+        MethodConvertor methodConvertor1 = new MethodConvertor(manager, reflectionReturnMethod);
+        Operation convert = methodConvertor1.convert();
+        Assert.assertNotNull(convert);
+        //判断有返回值的情况下是否正确
+        Assert.assertEquals(DataType.Array(DataType.String())
+                .getType(),convert.getResponses().get(Response.CODE_OK).getContent().get(MediaType.APPLICATION_JSON)
+                .getSchema().getType());
+
+
+    }
+
+    // 示例服务类，用于测试
+    static class SampleService {
+        /**
+         * 示例方法 无返回值
+         * @param s1 字符串1
+         * @param s2 字符串2
+         */
+        public void sampleMethod(String s1,String s2) {
+            // 示例方法，用于测试
+            System.out.println(s1);
+            System.out.println(s1+s2);
+        }
+
+        public List<String> stringListSampleMethod(int int1){
+            System.out.println(int1);
+            return new ArrayList<>();
+        }
+    }
+}

dongtai-api-gather/dongtai-api-gather-dubbo-api/src/test/java/io/dongtai/iast/api/gather/dubbo/convertor/ServiceConvertorTest.java

@@ -0,0 +1,93 @@
+package io.dongtai.iast.api.gather.dubbo.convertor;
+
+import io.dongtai.iast.api.openapi.convertor.OpenApiSchemaConvertorManager;
+import io.dongtai.iast.api.openapi.domain.Parameter;
+import io.dongtai.iast.api.openapi.domain.Path;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+public class ServiceConvertorTest {
+    @Test
+    public void testConvert() {
+        // 创建一个 OpenApiSchemaConvertorManager，这里可以根据需要进行配置
+        OpenApiSchemaConvertorManager manager = new OpenApiSchemaConvertorManager();
+
+        // 创建一个 ServiceConvertor 实例，传入需要转换的接口类
+        Class<?> interfaceClass = TestDubboServiceInterface.class; // 替换成实际的接口类
+        ServiceConvertor serviceConvertor = new ServiceConvertor(manager, interfaceClass);
+
+        // 调用 convert 方法进行转换
+        Map<String, Path> pathMap = serviceConvertor.convert();
+
+        // 打印转换结果或进行其他断言
+        for (Map.Entry<String, Path> entry : pathMap.entrySet()) {
+            String path = entry.getKey();
+            Path pathData = entry.getValue();
+            // 进行其他断言或操作
+            Method method = AnalysisMethod(path);
+            List<Parameter> parameters = pathData.getDubbo().getParameters();
+            Class<?>[] parameterTypes = method.getParameterTypes();
+            for (int i = 0, parametersSize = parameters.size(); i < parametersSize; i++) {
+                Parameter parameter = parameters.get(i);
+                String type = parameter.getSchema().getType();
+                Class<?> parameterType = parameterTypes[i];
+                String s = interceptType(parameterType);
+                Assert.assertTrue(s.equalsIgnoreCase(type));
+            }
+
+        }
+    }
+
+    /**
+     * 将JAVA类型转换为Openapi类型
+     * @param parameterType java类型
+     * @return Openapi类型
+     */
+    private static String interceptType(Class<?> parameterType) {
+        String[] split = parameterType.getName().split("\\.");
+        return split[split.length - 1];
+    }
+
+    /**
+     * 通过PATH 查找方法
+     * @param path 方法路径
+     * @return 方法
+     */
+    private Method AnalysisMethod(String path) {
+        String[] split = path.split("/");
+        Assert.assertEquals(3, split.length);
+        String methodNameWithParams = split[2];
+
+        String[] methodParts = methodNameWithParams.split("\\(");
+        String methodName = methodParts[0];
+        String paramsStr = methodParts[1].replace(")", "");
+        String[] paramTypeNames = paramsStr.split(",");
+        Class<?>[] paramTypes = new Class[paramTypeNames.length];
+        for (int i = 0; i < paramTypeNames.length; i++) {
+            try {
+                paramTypes[i] = Class.forName(paramTypeNames[i]);
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        Method method;
+        try {
+            method = TestDubboServiceInterface.class.getMethod(methodName, paramTypes);
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+        return method;
+
+    }
+
+    // Dubbo 服务接口类
+    private interface TestDubboServiceInterface {
+        // 定义需要测试的 Dubbo 服务方法
+        String sayHi(String name);
+    }
+}

dongtai-api-gather/dongtai-api-gather-spring-api/src/test/java/io/dongtai/iast/api/gather/spring/convertor/HandlerMethodConvertorTest.java

@@ -0,0 +1,50 @@
+package io.dongtai.iast.api.gather.spring.convertor;
+
+import io.dongtai.iast.api.openapi.convertor.OpenApiSchemaConvertorManager;
+import io.dongtai.iast.api.openapi.domain.DataType;
+import io.dongtai.iast.api.openapi.domain.Operation;
+import io.dongtai.iast.api.openapi.domain.Parameter;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.web.context.support.StaticWebApplicationContext;
+import org.springframework.web.method.HandlerMethod;
+
+import java.util.List;
+
+public class HandlerMethodConvertorTest {
+    private HandlerMethodConvertor handlerMethodConvertor;
+    private Operation operation;
+
+    @Before
+    public void setUp() {
+        // 在每个测试方法运行之前初始化必要的对象
+        OpenApiSchemaConvertorManager manager = new OpenApiSchemaConvertorManager(); // 创建实际的 manager 对象
+        operation = new Operation();
+        HandlerMethod handlerMethod;
+        try {
+            handlerMethod = new HandlerMethod(new TestController(), "testMethod",String.class,int.class); // 创建实际的 HandlerMethod 对象
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+        StaticWebApplicationContext webApplicationContext = new StaticWebApplicationContext(); // 创建一个静态的 WebApplicationContext
+        webApplicationContext.registerSingleton("testController", TestController.class); // 注册控制器实例
+        handlerMethodConvertor = new HandlerMethodConvertor(manager, webApplicationContext, operation, handlerMethod);
+    }
+
+    @Test
+    public void testParseParameters() {
+        // 调用parseParameters方法
+        handlerMethodConvertor.parse();
+
+        // 获取解析后的参数列表
+        List<Parameter> parameters = operation.getParameters();
+        //判断是否是有两个参数
+        Assert.assertEquals(2, parameters.size());
+        //判断第一个参数为string是否正确
+        Assert.assertEquals(DataType.String().getType(),parameters.get(0).getSchema().getType());
+        //判断第二个参数是否为int32
+        Assert.assertEquals(DataType.Int32().getType(),parameters.get(1).getSchema().getType());
+    }
+
+}

dongtai-api-gather/dongtai-api-gather-spring-api/src/test/java/io/dongtai/iast/api/gather/spring/convertor/RequestMappingHandlerMappingConvertorTest.java

@@ -0,0 +1,8 @@
+package io.dongtai.iast.api.gather.spring.convertor;
+
+/**
+ * 因未引入servlet，无法测试
+ */
+public class RequestMappingHandlerMappingConvertorTest {
+
+}

dongtai-api-gather/dongtai-api-gather-spring-api/src/test/java/io/dongtai/iast/api/gather/spring/convertor/TestController.java

@@ -0,0 +1,11 @@
+package io.dongtai.iast.api.gather.spring.convertor;
+
+/**
+ * 假设了一个名为 TestController 的控制器类
+ */
+public class TestController {
+    public String testMethod( String param1,int param2) {
+        // 实际的控制器方法逻辑
+        return "Hello, " + param1 + ". Your number is " + param2;
+    }
+}

dongtai-common/src/test/java/io/dongtai/iast/common/string/StringUtilsTest.java

@@ -1,10 +1,78 @@
 package io.dongtai.iast.common.string;
 
-import io.dongtai.iast.common.string.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class StringUtilsTest {
+
+
+    @Test
+    public void matchTest() {
+        String raw = "foo";
+        String compareValues = "foo";
+        //完全相同比较
+        Assert.assertTrue(StringUtils.match(raw, compareValues));
+
+        String objectValue = new String("foo");
+        //对象字符串与常量字符串比较，不完全相同
+        Assert.assertFalse(StringUtils.match(raw, objectValue));
+    }
+
+    @Test
+    public void testConvertStringToIntArray() {
+        // 准备测试数据
+        String input = "P1,2,3,4";
+        // 调用被测试方法
+        int[] result = StringUtils.convertStringToIntArray(input);
+        // 期望的结果
+        int[] expected = {0, 1, 2, 3}; // 输入中的每个数字减去1
+        // 使用断言验证结果
+        Assert.assertArrayEquals(expected, result);
+
+        // 测试包含负数的情况
+        input = "P-1,-2,-3,-4";
+
+        result = StringUtils.convertStringToIntArray(input);
+
+        expected = new int[]{-2, -3, -4, -5};
+
+        Assert.assertArrayEquals(expected, result);
+    }
+
+    @Test
+    public void isEmptyTest() {
+        //判断空字符串
+        String input = "";
+        Assert.assertTrue(StringUtils.isEmpty(input));
+        //判断空对象
+        input = null;
+        Assert.assertTrue(StringUtils.isEmpty(input));
+        //判断有值字符串
+        input = "in";
+        Assert.assertFalse(StringUtils.isEmpty(input));
+        //判断空格
+        input = " ";
+        Assert.assertFalse(StringUtils.isEmpty(input));
+
+
+    }
+
+    @Test
+    public void isBlankTest(){
+        //判断空字符串
+        String input = "";
+        Assert.assertTrue(StringUtils.isBlank(input));
+        //判断空对象
+        input = null;
+        Assert.assertTrue(StringUtils.isBlank(input));
+        //判断有值字符串
+        input = "in";
+        Assert.assertFalse(StringUtils.isBlank(input));
+        //判断空格
+        input = " ";
+        Assert.assertTrue(StringUtils.isBlank(input));
+    }
+
     @Test
     public void normalize() {
         int maxLength = 1024;