diff --git a/java-checks-test-sources/default/src/main/java/checks/security/EncryptionAlgorithmCheckSample.java b/java-checks-test-sources/default/src/main/java/checks/security/EncryptionAlgorithmCheckSample.java index 3a74827fb4d..713cc0309e1 100644 --- a/java-checks-test-sources/default/src/main/java/checks/security/EncryptionAlgorithmCheckSample.java +++ b/java-checks-test-sources/default/src/main/java/checks/security/EncryptionAlgorithmCheckSample.java @@ -10,6 +10,7 @@ abstract class EncryptionAlgorithmCheckSample { static final String NO_PADDING = "/NONE/NoPadding"; static final String RSA_NO_PADDING = RSA + NO_PADDING; //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^> + static final String AES_WRAP = "AESWrap"; public void foo(java.util.Properties props) { /* @@ -93,6 +94,26 @@ public void foo(java.util.Properties props) { Cipher.getInstance(algoUpperCase); // Noncompliant // ^^^^^^^^^^^^^ + Cipher.getInstance("AESWrap"); // Compliant + Cipher.getInstance(AES_WRAP); // Compliant + Cipher.getInstance("AESWrap_128"); // Compliant + Cipher.getInstance("AESWrap_192"); // Compliant + Cipher.getInstance("AESWrap_256"); // Compliant + Cipher.getInstance("AESWrapPad"); // Compliant + Cipher.getInstance("AESWrapPad_128"); // Compliant + Cipher.getInstance("AESWrapPad_192"); // Compliant + Cipher.getInstance("AESWrapPad_256"); // Compliant + Cipher.getInstance("AES/KW/NoPadding"); // Compliant + Cipher.getInstance("AES/KWP/NoPadding"); // Compliant + Cipher.getInstance("aeswrap"); // Compliant + Cipher.getInstance("AESWRAP_128"); // Compliant + Cipher.getInstance("aesWrapPad_256"); // Compliant + Cipher.getInstance("AESWrap/ECB/NoPadding"); // Compliant + Cipher.getInstance("aeswrap/ecb/nopadding"); // Compliant + Cipher.getInstance("AESWrapPad/KWP/NoPadding"); // Compliant + Cipher.getInstance("AESWrap_64"); // Noncompliant + Cipher.getInstance("AESWrap_64/ECB/NoPadding"); // Noncompliant + } catch (Exception e) { } } diff --git a/java-checks/src/main/java/org/sonar/java/checks/security/EncryptionAlgorithmCheck.java b/java-checks/src/main/java/org/sonar/java/checks/security/EncryptionAlgorithmCheck.java index 5e620897c2b..e9be77cc1cd 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/security/EncryptionAlgorithmCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/security/EncryptionAlgorithmCheck.java @@ -38,6 +38,8 @@ public class EncryptionAlgorithmCheck extends AbstractMethodDetection { private static final Pattern ALGORITHM_PATTERN = Pattern.compile("([^/]+)/([^/]+)/([^/]+)"); + private static final Pattern KEY_WRAP_PATTERN = Pattern.compile("AESWrap(Pad)?(_(128|192|256))?", Pattern.CASE_INSENSITIVE); + @Override protected MethodMatchers getMethodInvocationMatchers() { return MethodMatchers.create() @@ -77,9 +79,15 @@ protected void onMethodInvocationFound(MethodInvocationTree mit) { } private static Optional getInsecureAlgorithmMessage(String algorithmName) { + if (KEY_WRAP_PATTERN.matcher(algorithmName).matches()) { + return Optional.empty(); + } Matcher matcher = ALGORITHM_PATTERN.matcher(algorithmName); if (matcher.matches()) { String algorithm = matcher.group(1); + if (KEY_WRAP_PATTERN.matcher(algorithm).matches()) { + return Optional.empty(); + } String mode = matcher.group(2); String padding = matcher.group(3);