Skip to content

Commit b2e3d8b

Browse files
committed
remove some more legacy code that existed to support deprecated code
1 parent 478e0bf commit b2e3d8b

File tree

2 files changed

+0
-104
lines changed

2 files changed

+0
-104
lines changed

javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -523,58 +523,6 @@ abstract class LabeledBarrierGuardNode extends BarrierGuardNode {
523523
override predicate blocks(boolean outcome, Expr e) { none() }
524524
}
525525

526-
// Internal version of AdditionalFlowStep that we can reference without deprecation warnings.
527-
abstract private class LegacyAdditionalFlowStep extends DataFlow::Node {
528-
/**
529-
* Holds if `pred` → `succ` should be considered a data flow edge.
530-
*/
531-
predicate step(DataFlow::Node pred, DataFlow::Node succ) { none() }
532-
533-
/**
534-
* Holds if `pred` → `succ` should be considered a data flow edge
535-
* transforming values with label `predlbl` to have label `succlbl`.
536-
*/
537-
predicate step(
538-
DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
539-
DataFlow::FlowLabel succlbl
540-
) {
541-
none()
542-
}
543-
544-
/**
545-
* EXPERIMENTAL. This API may change in the future.
546-
*
547-
* Holds if `pred` should be stored in the object `succ` under the property `prop`.
548-
* The object `succ` must be a `DataFlow::SourceNode` for the object wherein the value is stored.
549-
*/
550-
predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) { none() }
551-
552-
/**
553-
* EXPERIMENTAL. This API may change in the future.
554-
*
555-
* Holds if the property `prop` of the object `pred` should be loaded into `succ`.
556-
*/
557-
predicate loadStep(DataFlow::Node pred, DataFlow::Node succ, string prop) { none() }
558-
559-
/**
560-
* EXPERIMENTAL. This API may change in the future.
561-
*
562-
* Holds if the property `prop` should be copied from the object `pred` to the object `succ`.
563-
*/
564-
predicate loadStoreStep(DataFlow::Node pred, DataFlow::Node succ, string prop) { none() }
565-
566-
/**
567-
* EXPERIMENTAL. This API may change in the future.
568-
*
569-
* Holds if the property `loadProp` should be copied from the object `pred` to the property `storeProp` of object `succ`.
570-
*/
571-
predicate loadStoreStep(
572-
DataFlow::Node pred, DataFlow::Node succ, string loadProp, string storeProp
573-
) {
574-
none()
575-
}
576-
}
577-
578526
/**
579527
* A data flow edge that should be added to all data flow configurations in
580528
* addition to standard data flow edges.
@@ -697,40 +645,6 @@ module SharedFlowStep {
697645
}
698646
}
699647

700-
/**
701-
* Contributes subclasses of `AdditionalFlowStep` to `SharedFlowStep`.
702-
*/
703-
private class AdditionalFlowStepAsSharedStep extends SharedFlowStep {
704-
override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
705-
any(LegacyAdditionalFlowStep s).step(pred, succ)
706-
}
707-
708-
override predicate step(
709-
DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
710-
DataFlow::FlowLabel succlbl
711-
) {
712-
any(LegacyAdditionalFlowStep s).step(pred, succ, predlbl, succlbl)
713-
}
714-
715-
override predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) {
716-
any(LegacyAdditionalFlowStep s).storeStep(pred, succ, prop)
717-
}
718-
719-
override predicate loadStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {
720-
any(LegacyAdditionalFlowStep s).loadStep(pred, succ, prop)
721-
}
722-
723-
override predicate loadStoreStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {
724-
any(LegacyAdditionalFlowStep s).loadStoreStep(pred, succ, prop)
725-
}
726-
727-
override predicate loadStoreStep(
728-
DataFlow::Node pred, DataFlow::Node succ, string loadProp, string storeProp
729-
) {
730-
any(LegacyAdditionalFlowStep s).loadStoreStep(pred, succ, loadProp, storeProp)
731-
}
732-
}
733-
734648
/**
735649
* A collection of pseudo-properties that are used in multiple files.
736650
*

javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -320,14 +320,6 @@ module TaintTracking {
320320
any(SharedTaintStep step).heuristicStep(pred, succ)
321321
}
322322

323-
/**
324-
* Holds if `pred -> succ` is an edge contributed by an `AdditionalTaintStep` instance.
325-
*/
326-
cached
327-
predicate legacyAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
328-
any(InternalAdditionalTaintStep step).step(pred, succ)
329-
}
330-
331323
/**
332324
* Public taint step relations.
333325
*/
@@ -441,7 +433,6 @@ module TaintTracking {
441433
* Holds if `pred -> succ` is an edge used by all taint-tracking configurations.
442434
*/
443435
predicate sharedTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
444-
Cached::legacyAdditionalTaintStep(pred, succ) or
445436
Cached::genericStep(pred, succ) or
446437
Cached::heuristicStep(pred, succ) or
447438
uriStep(pred, succ) or
@@ -456,15 +447,6 @@ module TaintTracking {
456447
promiseStep(pred, succ)
457448
}
458449

459-
/** Internal version of `AdditionalTaintStep` that won't trigger deprecation warnings. */
460-
abstract private class InternalAdditionalTaintStep extends DataFlow::Node {
461-
/**
462-
* Holds if `pred` → `succ` should be considered a taint-propagating
463-
* data flow edge.
464-
*/
465-
abstract predicate step(DataFlow::Node pred, DataFlow::Node succ);
466-
}
467-
468450
/** Gets a data flow node referring to the client side URL. */
469451
private DataFlow::SourceNode clientSideUrlRef(DataFlow::TypeTracker t) {
470452
t.start() and

0 commit comments

Comments
 (0)