From eea84c91e825821cf85d1fb32c0056fb74c1594b Mon Sep 17 00:00:00 2001 From: Jacek Date: Mon, 8 Feb 2021 13:29:27 +0100 Subject: [PATCH] SONAR-14443 Deprecate 'sansTop25' param in WS --- .../org/sonar/server/security/SecurityStandards.java | 9 +++++++++ .../java/org/sonar/server/issue/index/IssueIndex.java | 4 ++++ .../sonarqube/ws/client/issue/IssuesWsParameters.java | 1 + 3 files changed, 14 insertions(+) diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/security/SecurityStandards.java b/server/sonar-server-common/src/main/java/org/sonar/server/security/SecurityStandards.java index b0709224372..dfa8ad11a96 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/security/SecurityStandards.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/security/SecurityStandards.java @@ -59,6 +59,11 @@ public final class SecurityStandards { private static final Set INSECURE_CWE = new HashSet<>(asList("89", "78", "79", "434", "352", "601")); private static final Set RISKY_CWE = new HashSet<>(asList("120", "22", "494", "829", "676", "131", "134", "190")); private static final Set POROUS_CWE = new HashSet<>(asList("306", "862", "798", "311", "807", "250", "863", "732", "327", "307", "759")); + + /** + * @deprecated SansTop25 report is outdated and will be removed in future versions + */ + @Deprecated public static final Map> CWES_BY_SANS_TOP_25 = ImmutableMap.of( SANS_TOP_25_INSECURE_INTERACTION, INSECURE_CWE, SANS_TOP_25_RISKY_RESOURCE, RISKY_CWE, @@ -199,6 +204,10 @@ public final class SecurityStandards { return toOwaspTop10(standards); } + /** + * @deprecated SansTop25 report is outdated and will be removed in future versions + */ + @Deprecated public Set getSansTop25() { return toSansTop25(cwe); } diff --git a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java index db6acdf5945..22008fa3dec 100644 --- a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java +++ b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueIndex.java @@ -1006,6 +1006,10 @@ public class IssueIndex { .collect(MoreCollectors.toList(branchUuids.size())); } + /** + * @deprecated SansTop25 report is outdated and will be removed in future versions + */ + @Deprecated public List getSansTop25Report(String projectUuid, boolean isViewOrApp, boolean includeCwe) { SearchSourceBuilder request = prepareNonClosedVulnerabilitiesAndHotspotSearch(projectUuid, isViewOrApp); Stream.of(SANS_TOP_25_INSECURE_INTERACTION, SANS_TOP_25_RISKY_RESOURCE, SANS_TOP_25_POROUS_DEFENSES) diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java index 39da2370148..c13d096064f 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issue/IssuesWsParameters.java @@ -84,6 +84,7 @@ public class IssuesWsParameters { public static final String PARAM_TAGS = "tags"; public static final String PARAM_TYPES = "types"; public static final String PARAM_OWASP_TOP_10 = "owaspTop10"; + @Deprecated public static final String PARAM_SANS_TOP_25 = "sansTop25"; public static final String PARAM_CWE_TOP_25 = "cweTop25"; public static final String PARAM_SONARSOURCE_SECURITY = "sonarsourceSecurity"; -- 2.39.5