Rename {Source,Sink}Node to {Source,Sink}Element

github · Jan 8, 2025 · 868caf9 · 868caf9
1 parent 1b31c90
commit 868caf9
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 64 deletions.
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -183,11 +183,11 @@ private module TypesInput implements Impl::Private::TypesInputSig {
     )
   }
 
-  DataFlowType getSourceNodeType(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
+  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
     none()
   }
 
-  DataFlowType getSinkNodeType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowType getSinkType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 private module StepsInput implements Impl::Private::StepsInputSig {

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -130,11 +130,11 @@ private module TypesInput implements Impl::Private::TypesInputSig {
     exists(rk)
   }
 
-  DataFlowType getSourceNodeType(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
+  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
     none()
   }
 
-  DataFlowType getSinkNodeType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowType getSinkType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 private module StepsInput implements Impl::Private::StepsInputSig {

diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSink.qll
@@ -13,7 +13,7 @@ private module Sinks {
 /** Provides the `Range` class used to define the extent of `FlowSink`. */
 module FlowSink {
   /** A flow source. */
-  abstract class Range extends Impl::Public::SinkNode {
+  abstract class Range extends Impl::Public::SinkElement {
     bindingset[this]
     Range() { any() }
 

diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSource.qll
@@ -13,7 +13,7 @@ private module Sources {
 /** Provides the `Range` class used to define the extent of `FlowSource`. */
 module FlowSource {
   /** A flow source. */
-  abstract class Range extends Impl::Public::SourceNode {
+  abstract class Range extends Impl::Public::SourceElement {
     bindingset[this]
     Range() { any() }
 

diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -191,13 +191,15 @@ module Node {
       result = this.getSummaryNode().getSummarizedCallable()
     }
 
-    /** Gets the source node that this node belongs to, if any */
-    FlowSummaryImpl::Public::SourceNode getSourceNode() {
-      result = this.getSummaryNode().getSourceNode()
+    /** Gets the AST source node that this node belongs to, if any */
+    FlowSummaryImpl::Public::SourceElement getSourceElement() {
+      result = this.getSummaryNode().getSourceElement()
     }
 
-    /** Gets the sink node that this node belongs to, if any */
-    FlowSummaryImpl::Public::SinkNode getSinkNode() { result = this.getSummaryNode().getSinkNode() }
+    /** Gets the AST sink node that this node belongs to, if any */
+    FlowSummaryImpl::Public::SinkElement getSinkElement() {
+      result = this.getSummaryNode().getSinkElement()
+    }
 
     /** Holds is this node is a source node of kind `kind`. */
     predicate isSource(string kind) {
@@ -210,9 +212,9 @@ module Node {
     }
 
     override CfgScope getCfgScope() {
-      result = this.getSummaryNode().getSourceNode().getEnclosingCfgScope()
+      result = this.getSummaryNode().getSourceElement().getEnclosingCfgScope()
       or
-      result = this.getSummaryNode().getSinkNode().getEnclosingCfgScope()
+      result = this.getSummaryNode().getSinkElement().getEnclosingCfgScope()
     }
 
     override DataFlowCallable getEnclosingCallable() {
@@ -225,9 +227,9 @@ module Node {
       exists(this.getSummarizedCallable()) and
       result instanceof EmptyLocation
       or
-      result = this.getSourceNode().getLocation()
+      result = this.getSourceElement().getLocation()
       or
-      result = this.getSinkNode().getLocation()
+      result = this.getSinkElement().getLocation()
     }
 
     override string toString() { result = this.getSummaryNode().toString() }

diff --git a/rust/ql/lib/utils/test/InlineFlowTest.qll b/rust/ql/lib/utils/test/InlineFlowTest.qll
@@ -34,7 +34,7 @@ private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
     or
     sourceNode(src, _) and
     exists(CallExprBase call |
-      call = src.(Node::FlowSummaryNode).getSourceNode().getCall() and
+      call = src.(Node::FlowSummaryNode).getSourceElement().getCall() and
       result = call.getArgList().getArg(0).toString()
     )
   }