JS: Deprecate tests for deprecated APIs

Mainly adds 'deprecated' in front of a bunch of tests for deprecated APIs.
This commit is contained in:
Asger F
2024-11-28 11:09:55 +01:00
parent 3548544970
commit 4d7401a074
25 changed files with 59 additions and 53 deletions

View File

@@ -10,7 +10,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = DataFlow::Global<TestConfig>;
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -18,6 +18,6 @@ class LegacyConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate flow = TestFlow::flow/2;

View File

@@ -10,7 +10,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -18,6 +18,6 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate flow = TestFlow::flow/2;

View File

@@ -30,7 +30,7 @@ class SimpleBarrierGuardNode extends DataFlow::BarrierGuardNode, DataFlow::Invok
}
}
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -42,6 +42,6 @@ class LegacyConfig extends DataFlow::Configuration {
}
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate flow = TestFlow::flow/2;

View File

@@ -69,7 +69,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = DataFlow::Global<TestConfig>;
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -77,7 +77,7 @@ class LegacyConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate dataflow = TestFlow::flow/2;

View File

@@ -1,7 +1,7 @@
import javascript
// Note: this test has not been ported to ConfigSig, because isAdditionalLoadStep has no equivalent there
class Configuration extends TaintTracking::Configuration {
deprecated class Configuration extends TaintTracking::Configuration {
Configuration() { this = "PromiseFlowTestingConfig" }
override predicate isSource(DataFlow::Node source) {
@@ -34,6 +34,6 @@ class Configuration extends TaintTracking::Configuration {
}
}
from DataFlow::Node pred, DataFlow::Node succ, Configuration cfg
where cfg.hasFlow(pred, succ)
select pred, succ
deprecated query predicate flow(DataFlow::Node source, DataFlow::Node sink) {
any(Configuration cfg).hasFlow(source, sink)
}

View File

@@ -11,7 +11,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = DataFlow::Global<TestConfig>;
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "GeneratorFlowConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -19,7 +19,7 @@ class LegacyConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
class Consistency extends ConsistencyConfiguration {
Consistency() { this = "Consistency" }

View File

@@ -1,6 +1,6 @@
import javascript
private import semmle.javascript.dataflow.internal.StepSummary
import testUtilities.LegacyDataFlowDiff
deprecated import testUtilities.LegacyDataFlowDiff
module ValueFlowConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node source) {
@@ -45,7 +45,7 @@ class LegacyValueConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { ValueFlowConfig::isSink(sink) }
}
query predicate valueFlowDifference =
deprecated query predicate valueFlowDifference =
DataFlowDiff<ValueFlow, LegacyValueConfig>::legacyDataFlowDifference/3;
class LegacyTaintConfig extends TaintTracking::Configuration {
@@ -56,5 +56,5 @@ class LegacyTaintConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TaintConfig::isSink(sink) }
}
query predicate taintFlowDifference =
deprecated query predicate taintFlowDifference =
DataFlowDiff<TaintFlow, LegacyTaintConfig>::legacyDataFlowDifference/3;

View File

@@ -25,7 +25,7 @@ class Consistency extends ConsistencyConfiguration {
override DataFlow::Node getAnAlert() { TestFlow::flowTo(result) }
}
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -33,4 +33,4 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

View File

@@ -18,7 +18,7 @@ class Consistency extends ConsistencyConfiguration {
override DataFlow::Node getAnAlert() { TestFlow::flowTo(result) }
}
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -26,4 +26,4 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

View File

@@ -42,7 +42,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class ExampleConfiguration extends TaintTracking::Configuration {
deprecated class ExampleConfiguration extends TaintTracking::Configuration {
ExampleConfiguration() { this = "ExampleConfiguration" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }

View File

@@ -1,17 +1,21 @@
import javascript
import ExampleConfiguration
query predicate isBarrier(ExampleConfiguration cfg, DataFlow::Node n) { cfg.isBarrier(n) }
deprecated query predicate isBarrier(ExampleConfiguration cfg, DataFlow::Node n) {
cfg.isBarrier(n)
}
query predicate isLabeledBarrier(
deprecated query predicate isLabeledBarrier(
ExampleConfiguration cfg, DataFlow::Node n, DataFlow::FlowLabel label
) {
cfg.isLabeledBarrier(n, label)
}
query predicate isSanitizer(ExampleConfiguration cfg, DataFlow::Node n) { cfg.isSanitizer(n) }
deprecated query predicate isSanitizer(ExampleConfiguration cfg, DataFlow::Node n) {
cfg.isSanitizer(n)
}
query predicate sanitizingGuard(DataFlow::Node g, Expr e, boolean b) {
deprecated query predicate sanitizingGuard(DataFlow::Node g, Expr e, boolean b) {
g.(TaintTracking::SanitizerGuardNode).sanitizes(b, e)
or
g.(TaintTracking::AdditionalSanitizerGuardNode).sanitizes(b, e)
@@ -21,4 +25,4 @@ query predicate taintedSink(DataFlow::Node source, DataFlow::Node sink) {
TestFlow::flow(source, sink)
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, ExampleConfiguration>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, ExampleConfiguration>

View File

@@ -22,7 +22,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node node) { TestConfig::isSource(node) }
@@ -39,7 +39,7 @@ class LegacyConfig extends TaintTracking::Configuration {
}
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
class BasicSanitizerGuard extends TaintTracking::SanitizerGuardNode, DataFlow::CallNode {
BasicSanitizerGuard() { this = getACall("isSafe") }

View File

@@ -52,7 +52,7 @@ module TestFlow = TaintTracking::Global<TestConfig>;
query predicate taint = TestFlow::flow/2;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -60,4 +60,4 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

View File

@@ -33,7 +33,7 @@ query predicate testAttrSourceLocation(HTML::Attribute attrib, Angular2::Templat
top = attrib.getCodeInAttribute()
}
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -41,4 +41,4 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

View File

@@ -10,7 +10,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -18,7 +18,7 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
from DataFlow::Node src, DataFlow::Node sink
where TestFlow::flow(src, sink)

View File

@@ -14,7 +14,7 @@ module TestFlow = DataFlow::Global<TestConfig>;
query predicate dataFlow = TestFlow::flow/2;
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "Config" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -22,7 +22,7 @@ class LegacyConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
DataFlow::SourceNode trackSource(DataFlow::TypeTracker t, DataFlow::SourceNode start) {
t.start() and

View File

@@ -15,7 +15,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -23,7 +23,7 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
from DataFlow::Node source, DataFlow::Node sink
where TestFlow::flow(source, sink)

View File

@@ -13,7 +13,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = DataFlow::Global<TestConfig>;
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "Config" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -23,4 +23,4 @@ class LegacyConfig extends DataFlow::Configuration {
query predicate dataFlow = TestFlow::flow/2;
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

View File

@@ -14,7 +14,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = DataFlow::Global<TestConfig>;
class LegacyConfig extends DataFlow::Configuration {
deprecated class LegacyConfig extends DataFlow::Configuration {
LegacyConfig() { this = "Config" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -22,6 +22,6 @@ class LegacyConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate dataFlow = TestFlow::flow/2;

View File

@@ -15,7 +15,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -23,7 +23,7 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
from DataFlow::Node source, DataFlow::Node sink
where TestFlow::flow(source, sink)

View File

@@ -54,7 +54,7 @@ module TestConfig implements DataFlow::ConfigSig {
module TestFlow = TaintTracking::Global<TestConfig>;
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -62,7 +62,7 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate taintFlow(DataFlow::Node source, DataFlow::Node sink) {
TestFlow::flow(source, sink)

View File

@@ -1,6 +1,6 @@
import javascript
import semmle.javascript.security.dataflow.DomBasedXssQuery
import testUtilities.LegacyDataFlowDiff
deprecated import testUtilities.LegacyDataFlowDiff
deprecated query predicate legacyDataFlowDifference =
DataFlowDiff<DomBasedXssFlow, Configuration>::legacyDataFlowDifference/3;

View File

@@ -17,7 +17,7 @@ class Consistency extends ConsistencyConfiguration {
override DataFlow::Node getAnAlert() { TestFlow::flowTo(result) }
}
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -25,4 +25,4 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

View File

@@ -33,7 +33,7 @@ class Consistency extends ConsistencyConfiguration {
override DataFlow::Node getAnAlert() { TestFlow::flowTo(result) }
}
class LegacyConfig extends TaintTracking::Configuration {
deprecated class LegacyConfig extends TaintTracking::Configuration {
LegacyConfig() { this = "LegacyConfig" }
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -41,7 +41,7 @@ class LegacyConfig extends TaintTracking::Configuration {
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
}
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
query predicate taintFlow(DataFlow::Node source, DataFlow::Node sink) {
TestFlow::flow(source, sink)

View File

@@ -1,6 +1,8 @@
private import javascript
private signature class LegacyConfigSig extends DataFlow::Configuration;
private signature class LegacyConfigSig {
predicate hasFlow(DataFlow::Node source, DataFlow::Node sink);
}
module DataFlowDiff<DataFlow::GlobalFlowSig NewFlow, LegacyConfigSig LegacyConfig> {
query predicate legacyDataFlowDifference(