diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll index 132a5cc2edab3..9762c1142b993 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll @@ -34,7 +34,7 @@ module CommandInjection { * An active threat-model source, considered as a flow source. */ private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource { - ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource } + ActiveThreatModelSourceAsSource() { not this.isClientSideSource() } override string getSourceType() { result = "a user-provided value" } } diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll index 54da0a8709f1d..eaf78fd4c4c97 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CorsMisconfigurationForCredentialsCustomizations.qll @@ -36,7 +36,7 @@ module CorsMisconfigurationForCredentials { * An active threat-model source, considered as a flow source. */ private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource { - ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource } + ActiveThreatModelSourceAsSource() { not this.isClientSideSource() } } /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll index e8e4847bfce83..8350eb38da010 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll @@ -52,7 +52,7 @@ deprecated class LogInjectionConfiguration extends TaintTracking::Configuration * A source of remote user controlled input. */ class RemoteSource extends Source instanceof RemoteFlowSource { - RemoteSource() { not this instanceof ClientSideRemoteFlowSource } + RemoteSource() { not this.isClientSideSource() } } /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll index 03cbd01b630d3..1c056935d4079 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll @@ -34,7 +34,7 @@ module RegExpInjection { * An active threat-model source, considered as a flow source. */ private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource { - ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource } + ActiveThreatModelSourceAsSource() { not this.isClientSideSource() } } private import IndirectCommandInjectionCustomizations diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll index 6d2b5e2ce7b5c..6cc6f6e798c0b 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll @@ -52,7 +52,7 @@ module RequestForgery { not this.(ClientSideRemoteFlowSource).getKind().isPathOrUrl() } - override predicate isServerSide() { not this instanceof ClientSideRemoteFlowSource } + override predicate isServerSide() { not super.isClientSideSource() } } /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll index c62aedd4b5cc0..e24de9f4d6f95 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ResourceExhaustionCustomizations.qll @@ -63,7 +63,7 @@ module ResourceExhaustion { private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource { ActiveThreatModelSourceAsSource() { // exclude source that only happen client-side - not this instanceof ClientSideRemoteFlowSource and + not this.isClientSideSource() and not this = DataFlow::parameterNode(any(PostMessageEventHandler pmeh).getEventParameter()) } } diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll index 0107d36d63d24..dc23b895a4f6a 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll @@ -719,7 +719,7 @@ module TaintedPath { * An active threat-model source, considered as a flow source. */ private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource { - ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource } + ActiveThreatModelSourceAsSource() { not this.isClientSideSource() } } /**