JS: Deprecate ConsistencyChecking to avoid deprecation warnings

asgerf · asgerf · commit 0ce1fe767d94 · 2024-12-03T14:30:23.000+01:00
diff --git a/javascript/ql/test/library-tests/FlowSummary/test.ql b/javascript/ql/test/library-tests/FlowSummary/test.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import testUtilities.InlineSummaries
 
 DataFlow::CallNode getACall(string name) {
@@ -29,7 +29,7 @@ class BasicBarrierGuard extends DataFlow::CallNode {
   }
 }
 
-class ConsistencyConfig extends ConsistencyConfiguration {
+deprecated class ConsistencyConfig extends ConsistencyConfiguration {
   ConsistencyConfig() { this = "ConsistencyConfig" }
 
   override DataFlow::Node getAnAlert() { Configuration::flow(_, result) }
diff --git a/javascript/ql/test/library-tests/Generators/DataFlow.ql b/javascript/ql/test/library-tests/Generators/DataFlow.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 module TestConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.asExpr().getStringValue() = "source" }
diff --git a/javascript/ql/test/library-tests/Routing/test.ql b/javascript/ql/test/library-tests/Routing/test.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 API::Node testInstance() { result = API::moduleImport("@example/test").getInstance() }
 
diff --git a/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql b/javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql
@@ -1,6 +1,6 @@
 import javascript
 private import semmle.javascript.heuristics.AdditionalSources
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 module TestConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) { node instanceof HeuristicSource }
diff --git a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.ql b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.ql
@@ -1,6 +1,6 @@
 import javascript
 import semmle.javascript.dataflow.InferredTypes
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 DataFlow::CallNode getACall(string name) {
   result.getCalleeName() = name
diff --git a/javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql b/javascript/ql/test/library-tests/frameworks/Nest/Consistency.ql
@@ -1,3 +1,3 @@
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.ReflectedXssQuery as ReflectedXss
 import semmle.javascript.security.dataflow.ServerSideUrlRedirectQuery as ServerSideUrlRedirect
diff --git a/javascript/ql/test/library-tests/frameworks/Vuex/test.ql b/javascript/ql/test/library-tests/frameworks/Vuex/test.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 module TestConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) { node.(DataFlow::CallNode).getCalleeName() = "source" }
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.ql b/javascript/ql/test/library-tests/frameworks/data/test.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.frameworks.data.internal.ApiGraphModels as ApiGraphModels
 
 class TypeModelFromCodeQL extends ModelInput::TypeModel {
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/Consistency.ql
@@ -1,6 +1,6 @@
 import javascript
 import semmle.javascript.security.dataflow.TaintedPathQuery
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 class TaintedPathConsistency extends ConsistencyConfiguration {
   TaintedPathConsistency() { this = "TaintedPathConsistency" }
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-073/Consistency.ql
@@ -1,3 +1,3 @@
 import javascript
 import semmle.javascript.security.dataflow.TemplateObjectInjectionQuery
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-078/Consistency.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.CommandInjectionQuery as CommandInjection
 import semmle.javascript.security.dataflow.IndirectCommandInjectionQuery as IndirectCommandInjection
 import semmle.javascript.security.dataflow.ShellCommandInjectionFromEnvironmentQuery as ShellCommandInjectionFromEnvironment
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/ConsistencyDomBasedXss.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.DomBasedXssQuery
 
 class ConsistencyConfig extends ConsistencyConfiguration {
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ConsistencyExceptionXss.ql
@@ -1,3 +1,3 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.ExceptionXssQuery as ExceptionXss
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ConsistencyReflectedXss.ql
@@ -1,3 +1,3 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.ReflectedXssQuery as ReflectedXss
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/ConsistencyStoredXss.ql
@@ -1,3 +1,3 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.StoredXssQuery as StoredXss
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/ConsistencyUnsafeHtmlConstruction.ql
@@ -1,3 +1,3 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.UnsafeHtmlConstructionQuery as UnsafeHtmlConstruction
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/ConsistencyUnsafeJQueryPlugin.ql
@@ -1,3 +1,3 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.UnsafeJQueryPluginQuery as UnsafeJqueryPlugin
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/ConsistencyXssThroughDom.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.XssThroughDomQuery
 
 class ConsistencyConfig extends ConsistencyConfiguration {
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-089/untyped/Consistency.ql
@@ -1,4 +1,4 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.SqlInjectionQuery as SqlInjection
 import semmle.javascript.security.dataflow.NosqlInjectionQuery as NosqlInjection
diff --git a/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-502/Consistency.ql
@@ -1,3 +1,3 @@
 import javascript
 import semmle.javascript.security.dataflow.UnsafeDeserializationQuery
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/Consistency.ql
@@ -1,3 +1,3 @@
 import javascript
 import semmle.javascript.security.dataflow.ResourceExhaustionQuery
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/Consistency.ql
@@ -1,5 +1,5 @@
 import javascript
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 import semmle.javascript.security.dataflow.PrototypePollutingAssignmentQuery
 
 class Config extends ConsistencyConfiguration {
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql b/javascript/ql/test/query-tests/Security/CWE-918/Consistency.ql
@@ -1,7 +1,7 @@
 import javascript
 import semmle.javascript.security.dataflow.RequestForgeryQuery as RequestForgery
 import semmle.javascript.security.dataflow.ClientSideRequestForgeryQuery as ClientSideRequestForgery
-import testUtilities.ConsistencyChecking
+deprecated import testUtilities.ConsistencyChecking
 
 query predicate resultInWrongFile(DataFlow::Node node) {
   exists(string filePattern |
diff --git a/javascript/ql/test/testUtilities/ConsistencyChecking.qll b/javascript/ql/test/testUtilities/ConsistencyChecking.qll
@@ -1,3 +1,9 @@
+/**
+ * DEPRECATED, but can be imported with a `deprecated import`.
+ *
+ * Will be replaced with standardized inline test expectations in the future.
+ */
+
 import javascript
 
 /**
@@ -7,7 +13,7 @@ import javascript
  *
  * If no configuration is specified, then the default is that the all sinks from a `DataFlow::Configuration` are alerts, and all files are consistency-checked.
  */
-abstract class ConsistencyConfiguration extends string {
+abstract deprecated class ConsistencyConfiguration extends string {
   bindingset[this]
   ConsistencyConfiguration() { any() }
 
@@ -30,7 +36,7 @@ abstract class ConsistencyConfiguration extends string {
  *
  * Is used internally to match a configuration or lack thereof.
  */
-final private class Conf extends string {
+deprecated final private class Conf extends string {
   Conf() {
     this instanceof ConsistencyConfiguration
     or
@@ -65,12 +71,14 @@ private class AssertionComment extends LineComment {
   predicate expectConsistencyError() { this.getText().matches("%[INCONSISTENCY]%") }
 }
 
-private DataFlow::Node getASink() { exists(DataFlow::Configuration cfg | cfg.hasFlow(_, result)) }
+deprecated private DataFlow::Node getASink() {
+  exists(DataFlow::Configuration cfg | cfg.hasFlow(_, result))
+}
 
 /**
  * Gets all the alerts for consistency consistency checking from a configuration `conf`.
  */
-private DataFlow::Node alerts(Conf conf) {
+deprecated private DataFlow::Node alerts(Conf conf) {
   result = conf.(ConsistencyConfiguration).getAnAlert()
   or
   not exists(ConsistencyConfiguration r) and
@@ -83,7 +91,7 @@ private DataFlow::Node alerts(Conf conf) {
  * The `line` can be either the first or the last line of the alert.
  * And if no expression exists at `line`, then an alert on the next line is used.
  */
-private DataFlow::Node getAlert(File file, int line, Conf conf) {
+deprecated private DataFlow::Node getAlert(File file, int line, Conf conf) {
   result = alerts(conf) and
   result.getFile() = file and
   (result.hasLocationInfo(_, _, _, line, _) or result.hasLocationInfo(_, line, _, _, _))
@@ -108,7 +116,7 @@ private AssertionComment getComment(File file, int line) {
 /**
  * Holds if there is a false positive in `file` at `line` for configuration `conf`.
  */
-private predicate falsePositive(File file, int line, AssertionComment comment, Conf conf) {
+deprecated private predicate falsePositive(File file, int line, AssertionComment comment, Conf conf) {
   exists(getAlert(file, line, conf)) and
   comment = getComment(file, line) and
   not comment.shouldHaveAlert()
@@ -117,7 +125,7 @@ private predicate falsePositive(File file, int line, AssertionComment comment, C
 /**
  * Holds if there is a false negative in `file` at `line` for configuration `conf`.
  */
-private predicate falseNegative(File file, int line, AssertionComment comment, Conf conf) {
+deprecated private predicate falseNegative(File file, int line, AssertionComment comment, Conf conf) {
   not exists(getAlert(file, line, conf)) and
   comment = getComment(file, line) and
   comment.shouldHaveAlert()
@@ -126,7 +134,7 @@ private predicate falseNegative(File file, int line, AssertionComment comment, C
 /**
  * Gets a file that should be included for consistency checking for configuration `conf`.
  */
-private File getATestFile(string conf) {
+deprecated private File getATestFile(string conf) {
   not exists(any(ConsistencyConfiguration res).getAFile()) and
   result = any(LineComment comment).getFile() and
   (conf = "" or conf instanceof ConsistencyConfiguration)
@@ -139,7 +147,7 @@ private File getATestFile(string conf) {
  * Or the empty string
  */
 bindingset[file, line]
-private string getSinkDescription(File file, int line, Conf conf) {
+deprecated private string getSinkDescription(File file, int line, Conf conf) {
   not exists(DataFlow::Configuration c | c.hasFlow(_, getAlert(file, line, conf))) and
   result = ""
   or
@@ -153,7 +161,9 @@ private string getSinkDescription(File file, int line, Conf conf) {
  * The consistency issue an unexpected false positive/negative.
  * Or that false positive/negative was expected, and none were found.
  */
-query predicate consistencyIssue(string location, string msg, string commentText, Conf conf) {
+deprecated query predicate consistencyIssue(
+  string location, string msg, string commentText, Conf conf
+) {
   exists(File file, int line |
     file = getATestFile(conf) and location = file.getRelativePath() + ":" + line
   |

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import javascript`
`2`		`-import testUtilities.ConsistencyChecking`
	`2`	`+deprecated import testUtilities.ConsistencyChecking`
`3`	`3`	`import testUtilities.InlineSummaries`
`4`	`4`
`5`	`5`	`DataFlow::CallNode getACall(string name) {`
`@@ -29,7 +29,7 @@ class BasicBarrierGuard extends DataFlow::CallNode {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-class ConsistencyConfig extends ConsistencyConfiguration {`
	`32`	`+deprecated class ConsistencyConfig extends ConsistencyConfiguration {`
`33`	`33`	`ConsistencyConfig() { this = "ConsistencyConfig" }`
`34`	`34`
`35`	`35`	`override DataFlow::Node getAnAlert() { Configuration::flow(_, result) }`