Modify deprecated RemoteSource classes to extend DataFlow::Node directly.

egregius313 · egregius313 · commit 3563c7ef03a2 · 2024-02-29T12:03:16.000-05:00
Since `ThreatModelFlowSource` contains `RemoteFlowSource` by default, we
can safely remove the `RemoteSource` from the default of the queries.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/CodeInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/CodeInjectionQuery.qll
@@ -59,7 +59,7 @@ module CodeInjection = TaintTracking::Global<CodeInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /**
  * DEPRECATED: Use `ThreatModelSource` instead.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/CommandInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/CommandInjectionQuery.qll
@@ -69,7 +69,7 @@ module CommandInjection = TaintTracking::Global<CommandInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
@@ -65,7 +65,7 @@ module ConditionalBypass = TaintTracking::Global<ConditionalBypassConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
@@ -71,7 +71,7 @@ module LdapInjection = TaintTracking::Global<LdapInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/MissingXMLValidationQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/MissingXMLValidationQuery.qll
@@ -67,7 +67,7 @@ module MissingXmlValidation = TaintTracking::Global<MissingXmlValidationConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /**
  * A source supported by the current threat model.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
@@ -60,7 +60,7 @@ module ReDoS = TaintTracking::Global<ReDoSConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/RegexInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/RegexInjectionQuery.qll
@@ -59,7 +59,7 @@ module RegexInjection = TaintTracking::Global<RegexInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ResourceInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ResourceInjectionQuery.qll
@@ -58,7 +58,7 @@ module ResourceInjection = TaintTracking::Global<ResourceInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /**
  * DEPRECATED: Use `ThreatModelSource` instead.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/SqlInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/SqlInjectionQuery.qll
@@ -69,7 +69,7 @@ module SqlInjection = TaintTracking::Global<SqlInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /**
  * DEPRECATED: Use `ThreatModelSource` instead.
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
@@ -61,7 +61,7 @@ module TaintedPath = TaintTracking::Global<TaintedPathConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
@@ -63,7 +63,7 @@ module UrlRedirect = TaintTracking::Global<UrlRedirectConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XPathInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XPathInjectionQuery.qll
@@ -69,7 +69,7 @@ module XpathInjection = TaintTracking::Global<XpathInjectionConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
diff --git a/csharp/ql/src/experimental/CWE-099/TaintedWebClientLib.qll b/csharp/ql/src/experimental/CWE-099/TaintedWebClientLib.qll
@@ -73,7 +73,7 @@ module TaintedWebClient = TaintTracking::Global<TaintedWebClientConfig>;
  *
  * A source of remote user input.
  */
-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }
+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }
 
 /** A source supported by the current threat model. */
 class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ module CodeInjection = TaintTracking::Global<CodeInjectionConfig>;`
`59`	`59`	`*`
`60`	`60`	`* A source of remote user input.`
`61`	`61`	`*/`
`62`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`62`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`63`	`63`
`64`	`64`	`/**`
`65`	`65`	* DEPRECATED: Use `ThreatModelSource` instead.
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ module CommandInjection = TaintTracking::Global<CommandInjectionConfig>;`
`69`	`69`	`*`
`70`	`70`	`* A source of remote user input.`
`71`	`71`	`*/`
`72`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`72`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`73`	`73`
`74`	`74`	`/** A source supported by the current threat model. */`
`75`	`75`	`class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ module ConditionalBypass = TaintTracking::Global<ConditionalBypassConfig>;`
`65`	`65`	`*`
`66`	`66`	`* A source of remote user input.`
`67`	`67`	`*/`
`68`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`68`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`69`	`69`
`70`	`70`	`/** A source supported by the current threat model. */`
`71`	`71`	`class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ module LdapInjection = TaintTracking::Global<LdapInjectionConfig>;`
`71`	`71`	`*`
`72`	`72`	`* A source of remote user input.`
`73`	`73`	`*/`
`74`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`74`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`75`	`75`
`76`	`76`	`/** A source supported by the current threat model. */`
`77`	`77`	`class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ module MissingXmlValidation = TaintTracking::Global<MissingXmlValidationConfig>;`
`67`	`67`	`*`
`68`	`68`	`* A source of remote user input.`
`69`	`69`	`*/`
`70`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`70`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`71`	`71`
`72`	`72`	`/**`
`73`	`73`	`* A source supported by the current threat model.`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ module ReDoS = TaintTracking::Global<ReDoSConfig>;`
`60`	`60`	`*`
`61`	`61`	`* A source of remote user input.`
`62`	`62`	`*/`
`63`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`63`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`64`	`64`
`65`	`65`	`/** A source supported by the current threat model. */`
`66`	`66`	`class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ module RegexInjection = TaintTracking::Global<RegexInjectionConfig>;`
`59`	`59`	`*`
`60`	`60`	`* A source of remote user input.`
`61`	`61`	`*/`
`62`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`62`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`63`	`63`
`64`	`64`	`/** A source supported by the current threat model. */`
`65`	`65`	`class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ module ResourceInjection = TaintTracking::Global<ResourceInjectionConfig>;`
`58`	`58`	`*`
`59`	`59`	`* A source of remote user input.`
`60`	`60`	`*/`
`61`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`61`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`62`	`62`
`63`	`63`	`/**`
`64`	`64`	* DEPRECATED: Use `ThreatModelSource` instead.
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ module SqlInjection = TaintTracking::Global<SqlInjectionConfig>;`
`69`	`69`	`*`
`70`	`70`	`* A source of remote user input.`
`71`	`71`	`*/`
`72`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`72`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`73`	`73`
`74`	`74`	`/**`
`75`	`75`	* DEPRECATED: Use `ThreatModelSource` instead.
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ module TaintedPath = TaintTracking::Global<TaintedPathConfig>;`
`61`	`61`	`*`
`62`	`62`	`* A source of remote user input.`
`63`	`63`	`*/`
`64`		`-deprecated class RemoteSource extends Source instanceof RemoteFlowSource { }`
	`64`	`+deprecated class RemoteSource extends DataFlow::Node instanceof RemoteFlowSource { }`
`65`	`65`
`66`	`66`	`/** A source supported by the current threat model. */`
`67`	`67`	`class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }`