Merge pull request #53 from microsoft/jb1/dataflowstack/java

DataFlowStack - Java Impl

Author: ropwareJB

java/ql/lib/qlpack.yml

@@ -7,6 +7,7 @@ library: true
 upgrades: upgrades
 dependencies:
   codeql/dataflow: ${workspace}
+  codeql/dataflowstack: ${workspace}
   codeql/mad: ${workspace}
   codeql/rangeanalysis: ${workspace}
   codeql/regex: ${workspace}

java/ql/lib/semmle/code/java/dataflow/DataFlowStack.qll

@@ -0,0 +1,13 @@
+private import semmle.code.java.dataflow.DataFlow
+private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
+
+private import codeql.dataflowstack.DataFlowStack as DFS
+private import DFS::DataFlowStackMake<JavaDataFlow> as DataFlowStackFactory
+
+module DataFlowStackMake<DataFlowStackFactory::DataFlow::GlobalFlowSig Flow>{
+    import DataFlowStackFactory::FlowStack<Flow>
+}
+
+module BiStackAnalysisMake<DataFlowStackFactory::DataFlow::GlobalFlowSig FlowA, DataFlowStackFactory::DataFlow::GlobalFlowSig FlowB>{
+    import DataFlowStackFactory::BiStackAnalysis<FlowA, FlowB>
+}

java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll

@@ -459,12 +459,15 @@ class DataFlowCall extends TDataFlowCall {
     this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 
-  // #44: Stub Implementation
   /** Gets an argument to this call as a Node. */
-  ArgumentNode getAnArgumentNode(){ none() } // TODO: JB1 return an argument as a DataFlow ArgumentNode
+  ArgumentNode getAnArgumentNode(){
+    result = exprNode(this.asCall().getAnArgument())
+  }
 
   /** Gets the target of the call, as a DataFlowCallable. */
-  DataFlowCallable getARuntimeTarget(){ none() }
+  DataFlowCallable getARuntimeTarget(){
+    result.asCallable() = this.asCall().getCallee()
+  }
 }
 
 /** A source call, that is, a `Call`. */