JS: Avoid some uses of deprecated guard classes in tests

Author: asgerf

javascript/ql/test/library-tests/LabelledBarrierGuards/LabelledBarrierGuards.ql

@@ -20,19 +20,15 @@ module TestConfig implements DataFlow::StateConfigSig {
     )
   }
 
-  additional predicate isBarrierGuard(DataFlow::BarrierGuardNode node) {
-    node instanceof IsTypeAGuard or
-    node instanceof IsSanitizedGuard
-  }
-
   predicate isBarrier(DataFlow::Node node, DataFlow::FlowLabel lbl) {
-    node = DataFlow::MakeLegacyBarrierGuardLabeled<isBarrierGuard/1>::getABarrierNode(lbl)
+    node = DataFlow::MakeLabeledBarrierGuard<IsTypeAGuard>::getABarrierNode(lbl) or
+    node = DataFlow::MakeLabeledBarrierGuard<IsSanitizedGuard>::getABarrierNode(lbl)
   }
 }
 
 module TestFlow = TaintTracking::GlobalWithState<TestConfig>;
 
-class LegacyConfig extends TaintTracking::Configuration {
+deprecated class LegacyConfig extends TaintTracking::Configuration {
   LegacyConfig() { this = "LegacyConfig" }
 
   override predicate isSource(DataFlow::Node node, DataFlow::FlowLabel lbl) {
@@ -44,21 +40,18 @@ class LegacyConfig extends TaintTracking::Configuration {
   }
 
   override predicate isSanitizerGuard(TaintTracking::SanitizerGuardNode node) {
-    TestConfig::isBarrierGuard(node)
+    node instanceof IsTypeAGuardLegacy or
+    node instanceof IsSanitizedGuardLegacy
   }
 }
 
 /**
  * A condition that checks what kind of value the input is. Not enough to
  * sanitize the value, but later sanitizers only need to handle the relevant case.
  */
-class IsTypeAGuard extends TaintTracking::LabeledSanitizerGuardNode, DataFlow::CallNode {
+class IsTypeAGuard extends DataFlow::CallNode {
   IsTypeAGuard() { this.getCalleeName() = "isTypeA" }
 
-  override predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel lbl) {
-    this.blocksExpr(outcome, e, lbl)
-  }
-
   predicate blocksExpr(boolean outcome, Expr e, DataFlow::FlowLabel lbl) {
     e = this.getArgument(0).asExpr() and
     (
@@ -69,12 +62,14 @@ class IsTypeAGuard extends TaintTracking::LabeledSanitizerGuardNode, DataFlow::C
   }
 }
 
-class IsSanitizedGuard extends TaintTracking::LabeledSanitizerGuardNode, DataFlow::CallNode {
-  IsSanitizedGuard() { this.getCalleeName() = "sanitizeA" or this.getCalleeName() = "sanitizeB" }
-
+deprecated class IsTypeAGuardLegacy extends IsTypeAGuard, TaintTracking::LabeledSanitizerGuardNode {
   override predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel lbl) {
     this.blocksExpr(outcome, e, lbl)
   }
+}
+
+class IsSanitizedGuard extends DataFlow::CallNode {
+  IsSanitizedGuard() { this.getCalleeName() = "sanitizeA" or this.getCalleeName() = "sanitizeB" }
 
   predicate blocksExpr(boolean outcome, Expr e, DataFlow::FlowLabel lbl) {
     e = this.getArgument(0).asExpr() and
@@ -87,7 +82,15 @@ class IsSanitizedGuard extends TaintTracking::LabeledSanitizerGuardNode, DataFlo
   }
 }
 
-import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated class IsSanitizedGuardLegacy extends IsSanitizedGuard,
+  TaintTracking::LabeledSanitizerGuardNode
+{
+  override predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel lbl) {
+    this.blocksExpr(outcome, e, lbl)
+  }
+}
+
+deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 from DataFlow::Node source, DataFlow::Node sink
 where TestFlow::flow(source, sink)

javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.ql

@@ -7,39 +7,37 @@ module TestConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node node) { node = getACall("sink").getAnArgument() }
 
-  additional predicate isBarrierGuard(DataFlow::BarrierGuardNode node) {
-    node instanceof BasicBarrierGuard
-  }
-
   predicate isBarrier(DataFlow::Node node) {
-    node = DataFlow::MakeLegacyBarrierGuard<isBarrierGuard/1>::getABarrierNode()
+    node = DataFlow::MakeBarrierGuard<BasicBarrierGuard>::getABarrierNode()
   }
 }
 
 module TestFlow = DataFlow::Global<TestConfig>;
 
-class BasicBarrierGuard extends DataFlow::BarrierGuardNode, DataFlow::CallNode {
+class BasicBarrierGuard extends DataFlow::CallNode {
   BasicBarrierGuard() { this = getACall("isSafe") }
 
-  override predicate blocks(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
-
   predicate blocksExpr(boolean outcome, Expr e) {
     outcome = true and e = this.getArgument(0).asExpr()
   }
 }
 
-class LegacyConfig extends DataFlow::Configuration {
+deprecated class BasicBarrierGuardLegacy extends DataFlow::BarrierGuardNode, BasicBarrierGuard {
+  override predicate blocks(boolean outcome, Expr e) { this.blocksExpr(outcome, e) }
+}
+
+deprecated class LegacyConfig extends DataFlow::Configuration {
   LegacyConfig() { this = "LegacyConfig" }
 
   override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
 
   override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
 
   override predicate isBarrierGuard(DataFlow::BarrierGuardNode node) {
-    TestConfig::isBarrierGuard(node)
+    node instanceof BasicBarrierGuardLegacy
   }
 }
 
-import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
+deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
 
 query predicate flow = TestFlow::flow/2;