Merge pull request #5851 from Yuanruitao/bugfix_codecc_whitelist

bugfix: 修复CodCC白名单无效问题 #5802
TencentBlueKing · Dec 22, 2021 · 7ffb801 · 7ffb801
2 parents 11692d2 + b2f63bd
commit 7ffb801
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/src/backend/codecc/build.gradle b/src/backend/codecc/build.gradle
@@ -47,7 +47,7 @@ buildscript {
         commonsHttpclientVersion = "3.1"
         ciVersion = "1.5.8-RELEASE"
         jsonVersion = "20180130"
-        log4jVersion = "2.16.0"
+        log4jVersion = "2.17.0"
     }
 
     def mavenRepoUrl = System.getProperty("mavenRepoUrl")

diff --git a/...ct/src/main/java/com/tencent/bk/codecc/defect/component/NewCCNDefectTracingComponent.java b/...ct/src/main/java/com/tencent/bk/codecc/defect/component/NewCCNDefectTracingComponent.java
@@ -450,14 +450,14 @@ private boolean checkMaskByPath(CCNDefectEntity ccnDefectEntity,
                 && (ccnDefectEntity.getStatus() & ComConstants.DefectStatus.FIXED.value()) == 0
                 && (PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, filterPaths)
                 || (CollectionUtils.isNotEmpty(pathList)
-                && !PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, pathList)))) {
+                && !PathUtils.checkIfMaskByPath(filePath, pathList)))) {
             ccnDefectEntity.setStatus(ccnDefectEntity.getStatus() | ComConstants.DefectStatus.PATH_MASK.value());
             ccnDefectEntity.setExcludeTime(curTime);
             return true;
         }
         // 如果已经是被路径屏蔽的，但是实质没有被路径屏蔽，则要把屏蔽状态去掉
         else if ((CollectionUtils.isEmpty(pathList)
-                || PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, pathList))
+                || PathUtils.checkIfMaskByPath(filePath, pathList))
                 && !PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, filterPaths)
                 && (ccnDefectEntity.getStatus() & ComConstants.DefectStatus.PATH_MASK.value()) > 0) {
             ccnDefectEntity.setStatus(ccnDefectEntity.getStatus() - ComConstants.DefectStatus.PATH_MASK.value());

diff --git a/...t/src/main/java/com/tencent/bk/codecc/defect/component/NewLintDefectTracingComponent.java b/...t/src/main/java/com/tencent/bk/codecc/defect/component/NewLintDefectTracingComponent.java
@@ -476,14 +476,14 @@ private boolean checkMaskByPath(LintDefectV2Entity lintDefectV2Entity,
                 && (lintDefectV2Entity.getStatus() & DefectStatus.FIXED.value()) == 0
                 && (PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, filterPaths)
                 || (CollectionUtils.isNotEmpty(pathList)
-                && !PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, pathList)))) {
+                && !PathUtils.checkIfMaskByPath(filePath, pathList)))) {
             lintDefectV2Entity.setStatus(lintDefectV2Entity.getStatus() | ComConstants.TaskFileStatus.PATH_MASK.value());
             lintDefectV2Entity.setExcludeTime(curTime);
             return true;
         }
         // 如果已经是被路径屏蔽的，但是实质没有被路径屏蔽，则要把屏蔽状态去掉
         else if ((CollectionUtils.isEmpty(pathList)
-                || PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, pathList))
+                || PathUtils.checkIfMaskByPath(filePath, pathList))
                 && !PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, filterPaths)
                 && (lintDefectV2Entity.getStatus() & ComConstants.TaskFileStatus.PATH_MASK.value()) > 0) {
             lintDefectV2Entity.setStatus(lintDefectV2Entity.getStatus() - ComConstants.TaskFileStatus.PATH_MASK.value());

diff --git a/...-defect/src/main/java/com/tencent/bk/codecc/defect/consumer/CLOCDefectCommitConsumer.java b/...-defect/src/main/java/com/tencent/bk/codecc/defect/consumer/CLOCDefectCommitConsumer.java
@@ -203,8 +203,7 @@ private List<CLOCDefectEntity> checkMaskByPath(List<CLOCDefectEntity> clocDefect
             // 命中黑名单 或 没有命中白名单
             if (PathUtils.checkIfMaskByPath(it.getFileName(), filterPath)
                     || (CollectionUtils.isNotEmpty(pathSet)
-                    && !PathUtils.checkIfMaskByPath(StringUtils.isBlank(it.getRelPath())
-                    ? it.getFileName() : it.getRelPath(), pathSet))) {
+                    && !PathUtils.checkIfMaskByPath(it.getFileName(), pathSet))) {
                 pathMaskDefectList.add(it.getFileName());
                 return false;
             }

diff --git a/...-defect/src/main/java/com/tencent/bk/codecc/defect/consumer/DUPCDefectCommitConsumer.java b/...-defect/src/main/java/com/tencent/bk/codecc/defect/consumer/DUPCDefectCommitConsumer.java
@@ -523,7 +523,7 @@ private boolean checkMaskByPath(DUPCDefectEntity dupcDefectEntity,
                 && (dupcDefectEntity.getStatus() & ComConstants.DefectStatus.FIXED.value()) == 0
                 && (PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, filterPaths)
                 || (CollectionUtils.isNotEmpty(pathSet)
-                && !PathUtils.checkIfMaskByPath(StringUtils.isNotEmpty(relPath) ? relPath : filePath, pathSet))))
+                && !PathUtils.checkIfMaskByPath(filePath, pathSet))))
         {
             dupcDefectEntity.setStatus(dupcDefectEntity.getStatus() | ComConstants.TaskFileStatus.PATH_MASK.value());
             dupcDefectEntity.setExcludeTime(curTime);

diff --git a/...t/src/main/java/com/tencent/bk/codecc/defect/service/impl/UpdateDefectBizServiceImpl.java b/...t/src/main/java/com/tencent/bk/codecc/defect/service/impl/UpdateDefectBizServiceImpl.java
@@ -246,9 +246,7 @@ private int checkMaskByPath(DefectEntity defectEntity,
                                 Set<String> filterPathSet,
                                 Set<String> pathSet,
                                 long currTime) {
-        String path = StringUtils.isBlank(defectEntity.getRelPath())
-                ? defectEntity.getFilePathname()
-                : defectEntity.getRelPath();
+        String path = defectEntity.getFilePathname();
         // 当前未被屏蔽但是命中屏蔽路径的，需要把告警屏蔽掉
         if ((status & ComConstants.DefectStatus.PATH_MASK.value()) == 0
                 && (PathUtils.checkIfMaskByPath(path, filterPathSet)