update tests for non-path version

Jami Cogswell · Jami Cogswell · commit f5a2fef7a3b4 · 2022-10-11T16:56:10.000-04:00
diff --git a/java/ql/lib/semmle/code/java/security/InsufficientKeySizeQuery.qll b/java/ql/lib/semmle/code/java/security/InsufficientKeySizeQuery.qll
@@ -60,7 +60,7 @@ class AsymmetricKeyTrackingConfiguration extends TaintTracking2::Configuration {
 //   msg = "Key size should be at least 2048 bits for " + "___" + " encryption."
 // }
 /**
- * Asymmetric (RSA, DSA, DH) key length data flow tracking configuration.
+ * Asymmetric (EC) key length data flow tracking configuration.
  */
 class AsymmetricECCKeyTrackingConfiguration extends TaintTracking2::Configuration {
   AsymmetricECCKeyTrackingConfiguration() { this = "AsymmetricECCKeyTrackingConfiguration" }
diff --git a/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.ql b/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.ql
@@ -7,15 +7,29 @@ class InsufficientKeySizeTest extends InlineExpectationsTest {
 
   override string getARelevantTag() { result = "hasInsufficientKeySize" }
 
+  // * Path-problem
+  // override predicate hasActualResult(Location location, string element, string tag, string value) {
+  //   tag = "hasInsufficientKeySize" and
+  //   exists(DataFlow::PathNode source, DataFlow::PathNode sink |
+  //     exists(AsymmetricKeyTrackingConfiguration config1 | config1.hasFlowPath(source, sink)) or
+  //     exists(AsymmetricECCKeyTrackingConfiguration config2 | config2.hasFlowPath(source, sink)) or
+  //     exists(SymmetricKeyTrackingConfiguration config2 | config2.hasFlowPath(source, sink))
+  //   |
+  //     sink.getNode().getLocation() = location and
+  //     element = sink.getNode().toString() and
+  //     value = ""
+  //   )
+  // }
+  // * Not path-problem
   override predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "hasInsufficientKeySize" and
-    exists(DataFlow::PathNode source, DataFlow::PathNode sink |
-      exists(AsymmetricKeyTrackingConfiguration config1 | config1.hasFlowPath(source, sink)) or
-      exists(AsymmetricECCKeyTrackingConfiguration config2 | config2.hasFlowPath(source, sink)) or
-      exists(SymmetricKeyTrackingConfiguration config2 | config2.hasFlowPath(source, sink))
+    exists(DataFlow::Node source, DataFlow::Node sink |
+      exists(AsymmetricKeyTrackingConfiguration config1 | config1.hasFlow(source, sink)) or
+      exists(AsymmetricECCKeyTrackingConfiguration config2 | config2.hasFlow(source, sink)) or
+      exists(SymmetricKeyTrackingConfiguration config3 | config3.hasFlow(source, sink))
     |
-      sink.getNode().getLocation() = location and
-      element = sink.getNode().toString() and
+      sink.getLocation() = location and
+      element = sink.toString() and
       value = ""
     )
   }
