Merge remote-tracking branch 'origin/master'

pom.xml

@@ -36,14 +36,33 @@
     </scm>
 
     <developers>
-        <developer><id>guoxin</id><name>GuoXin</name><organization>Keyware</organization></developer>
-        <developer><id>renfengjiang</id><name>RenFengJiang</name><organization>Keyware</organization></developer>
-        <developer><id>renfengshan</id><name>RenFengShan</name><organization>Keyware</organization></developer>
-        <developer><id>wuhaoyang</id><name>WuHaoYang</name><organization>Keyware</organization></developer>
-        <developer><id>zhangchenbao</id><name>ZhangChenBao</name><organization>Keyware</organization></developer>
+        <developer>
+            <id>guoxin</id>
+            <name>GuoXin</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>renfengjiang</id>
+            <name>RenFengJiang</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>renfengshan</id>
+            <name>RenFengShan</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>wuhaoyang</id>
+            <name>WuHaoYang</name>
+            <organization>Keyware</organization>
+        </developer>
+        <developer>
+            <id>zhangchenbao</id>
+            <name>ZhangChenBao</name>
+            <organization>Keyware</organization>
+        </developer>
     </developers>
 
-
     <properties>
         <java.version>11</java.version>
         <jdk.min.version>11</jdk.min.version>
@@ -52,6 +71,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.java.version>7.24.0.32100</sonar.java.version>
         <version.jacoco.plugin>0.8.10</version.jacoco.plugin>
+        <junit.jupiter.version>5.9.1</junit.jupiter.version>
         <aggregate.report.dir>integration-tests/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
     </properties>
 
@@ -76,6 +96,41 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-migrationsupport</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

sonar-keyware-plugins-cxx/pom.xml

@@ -44,7 +44,6 @@
         <mockito-all.version>1.10.19</mockito-all.version>
         <mockito-core.version>5.8.0</mockito-core.version>
         <assertj-core.version>3.24.2</assertj-core.version>
-        <junit-jupiter.version>5.9.1</junit-jupiter.version>
     </properties>
 
     <dependencies>
@@ -114,13 +113,11 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

sonar-keyware-plugins-java/pom.xml

@@ -50,6 +50,11 @@
             <version>${sonar.java.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -57,12 +62,17 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

sonar-keyware-plugins-java/src/main/java/com/keyware/sonar/java/rules/checkers/UploadFileVerifyChecker.java

@@ -41,11 +41,11 @@ public class UploadFileVerifyChecker extends IssuableSubscriptionVisitor {
         if (boo) {
             //获取文件名称类型判断是否配置文件权限
             var interiorInvoIf = new InteriorInvoIf();
-            interiorInvoIf.check(((MethodTree) tree).block());
+            ((MethodTree) tree).block().accept(interiorInvoIf);
             if (interiorInvoIf.fileType != "") {
                 //判断是否对文件后缀进行限制
                 NodeIf nodeIf = new NodeIf(interiorInvoIf.fileType);
-                nodeIf.check(((MethodTree) tree).block());
+                ((MethodTree) tree).block().accept(nodeIf);
                 if (nodeIf.boo) {
                     context.reportIssue(this, node.simpleName(), "程序设计时，应以“白名单”方式限制允许用户上传的文件的类型");
                 }
@@ -53,7 +53,7 @@ public class UploadFileVerifyChecker extends IssuableSubscriptionVisitor {
                 if (interiorInvoIf.fileName != "") {
                     //                判断是否对文件后缀进行限制
                     NodeIf nodeIf = new NodeIf(interiorInvoIf.fileName);
-                    nodeIf.check(((MethodTree) tree).block());
+                    ((MethodTree) tree).block().accept(nodeIf);
                     if (nodeIf.boo) {
                         context.reportIssue(this, node.simpleName(), "程序设计时，应以“白名单”方式限制允许用户上传的文件的类型");
                     }
@@ -65,7 +65,8 @@ public class UploadFileVerifyChecker extends IssuableSubscriptionVisitor {
             if (interiorInvoIf.sizeName != "") {
                 //判断是否对文件大小进行限制
                 NodeIf nodeIf = new NodeIf(interiorInvoIf.sizeName);
-                nodeIf.check(((MethodTree) tree).block());
+                //nodeIf.check(((MethodTree) tree).block());
+                ((MethodTree) tree).block().accept(nodeIf);
                 if (nodeIf.boo) {
                     context.reportIssue(this, node.simpleName(), "程序设计时，应以“白名单”方式限制允许用户上传的文件的类型");
                 }
@@ -79,7 +80,7 @@ public class UploadFileVerifyChecker extends IssuableSubscriptionVisitor {
     }
 
     //內部文件名称类型获取类
-    private class InteriorInvoIf extends IssuableSubscriptionVisitor{
+    private class InteriorInvoIf extends BaseTreeVisitor {
         //文件全名字
         public String fileName = "";
         //    文件后缀名
@@ -90,15 +91,9 @@ public class UploadFileVerifyChecker extends IssuableSubscriptionVisitor {
         public boolean privType = true;
 
         @Override
-        public List<Tree.Kind> nodesToVisit() {
-            return Collections.singletonList(Tree.Kind.METHOD_INVOCATION);
-        }
-
-        @Override
-        public void visitNode(Tree tree){
-            MethodInvocationTree methodInvocationTree = (MethodInvocationTree) tree;
+        public void visitMethodInvocation(MethodInvocationTree tree) {
             //获取到方法调用的参数
-            ExpressionTree expressionTree = methodInvocationTree.methodSelect();
+            ExpressionTree expressionTree = tree.methodSelect();
             if (expressionTree instanceof MemberSelectExpressionTree) {
                 MemberSelectExpressionTree expressionTree1 = (MemberSelectExpressionTree) expressionTree;
                 //对调用方法进行判断
@@ -137,32 +132,22 @@ public class UploadFileVerifyChecker extends IssuableSubscriptionVisitor {
                 }
             }
         }
-        public void check(Tree tree){
-            this.scanTree(tree);
-        }
     }
 
 
-    public class NodeIf extends IssuableSubscriptionVisitor{
+    public class NodeIf extends BaseTreeVisitor {
 
         private String name;
         public boolean boo = true;
-        @Override
-        public List<Tree.Kind> nodesToVisit() {
-            return Collections.singletonList(Tree.Kind.IF_STATEMENT);
-        }
 
         public NodeIf(String name) {
             this.name = name;
         }
-        public void check(Tree tree){
-            this.scanTree(tree);
-        }
+
         @Override
-        public void visitNode(Tree tree){
-            IfStatementTree tree1 = (IfStatementTree) tree;
+        public void visitIfStatement(IfStatementTree tree) {
             //获取到if表达式
-            ExpressionTree condition = tree1.condition();
+            ExpressionTree condition = tree.condition();
             if (condition instanceof BinaryExpressionTree) {
                 BinaryExpressionTree binaryExpressionTree = (BinaryExpressionTree) condition;
                 //判断是否进行if判断

sonar-keyware-plugins-java/src/test/java/com/keyware/sonar/java/rules/checkers/UploadFileVerifyCheckerTest.java

@@ -6,7 +6,6 @@
  */
 package com.keyware.sonar.java.rules.checkers;
 
-import com.keyware.sonar.java.utils.FilesUtils;
 import org.junit.jupiter.api.Test;
 import org.sonar.java.checks.verifier.CheckVerifier;
 
@@ -31,7 +30,7 @@ public class UploadFileVerifyCheckerTest {
         CheckVerifier.newVerifier()
                 .onFile("src/test/files/UploadFileVerifyRule.java")
                 .withCheck(rule)
-                .withClassPath(FilesUtils.getClassPath("target/test-jars"))
+                // .withClassPath(FilesUtils.getClassPath("target/test-jars"))
                 .verifyIssues();
     }
 }