Merge pull request #97 from microsoft/powershell-integrate-ssa-into-dataflow

PS: Integrate SSA computations into dataflow
This commit is contained in:
Mathias Vorreiter Pedersen
2024-09-17 10:02:52 +01:00
committed by GitHub
12 changed files with 253 additions and 20 deletions

View File

@@ -70,7 +70,9 @@ import semmle.code.powershell.Pipeline
import semmle.code.powershell.StringConstantExpression
import semmle.code.powershell.MemberExpr
import semmle.code.powershell.InvokeMemberExpression
import semmle.code.powershell.Call
import semmle.code.powershell.SubExpression
import semmle.code.powershell.ErrorExpr
import semmle.code.powershell.ConvertExpr
import semmle.code.powershell.IndexExpr
import semmle.code.powershell.HashTable

View File

@@ -0,0 +1,29 @@
import powershell
abstract private class AbstractCall extends Ast {
abstract Expr getCommand();
abstract Expr getArgument(int i);
Expr getNamedArgument(string name) { none() }
Expr getQualifier() { none() }
}
private class CmdCall extends AbstractCall instanceof Cmd {
final override Expr getCommand() { result = Cmd.super.getCommand() }
final override Expr getArgument(int i) { result = Cmd.super.getArgument(i) }
final override Expr getNamedArgument(string name) { result = Cmd.super.getNamedArgument(name) }
}
private class InvokeMemberCall extends AbstractCall instanceof InvokeMemberExpr {
final override Expr getCommand() { result = super.getMember() }
final override Expr getArgument(int i) { result = InvokeMemberExpr.super.getArgument(i) }
final override Expr getQualifier() { result = InvokeMemberExpr.super.getQualifier() }
}
final class Call = AbstractCall;

View File

@@ -15,6 +15,8 @@ class Cmd extends @command, CmdBase {
CmdElement getElement(int i) { command_command_element(this, i, result) }
Expr getCommand() { result = this.getElement(0) }
StringConstExpr getCmdName() { result = this.getElement(0) }
Expr getArgument(int i) {
@@ -40,3 +42,20 @@ class Cmd extends @command, CmdBase {
Redirection getARedirection() { result = this.getRedirection(_) }
}
/**
* An argument to a command.
*
* The argument may be named or positional.
*/
class Argument extends Expr {
Cmd cmd;
Argument() { cmd.getArgument(_) = this or cmd.getNamedArgument(_) = this }
Cmd getCmd() { result = cmd }
int getIndex() { cmd.getArgument(result) = this }
string getName() { cmd.getNamedArgument(result) = this }
}

View File

@@ -0,0 +1,7 @@
import powershell
class ErrorExpr extends @error_expression, Expr {
final override SourceLocation getLocation() { error_expression_location(this, result) }
final override string toString() { result = "error" }
}

View File

@@ -3,7 +3,7 @@ import powershell
class InvokeMemberExpr extends @invoke_member_expression, MemberExprBase {
override SourceLocation getLocation() { invoke_member_expression_location(this, result) }
Expr getBase() { invoke_member_expression(this, result, _) }
Expr getQualifier() { invoke_member_expression(this, result, _) }
CmdElement getMember() { invoke_member_expression(this, _, result) }

View File

@@ -166,6 +166,37 @@ module ExprNodes {
predicate isImplicitWrite() { e.isImplicit() }
}
/** A control-flow node that wraps an argument expression. */
class ArgumentCfgNode extends ExprCfgNode {
override string getAPrimaryQlClass() { result = "ArgumentCfgNode" }
override Argument e;
final override Argument getExpr() { result = super.getExpr() }
}
private class InvokeMemberChildMapping extends ExprChildMapping, InvokeMemberExpr {
override predicate relevantChild(Ast n) { n = this.getQualifier() or n = this.getAnArgument() }
}
/** A control-flow node that wraps an `InvokeMemberExpr` expression. */
class InvokeMemberCfgNode extends ExprCfgNode {
override string getAPrimaryQlClass() { result = "InvokeMemberCfgNode" }
override InvokeMemberChildMapping e;
final override InvokeMemberExpr getExpr() { result = super.getExpr() }
final ExprCfgNode getQualifier() { e.hasCfgChild(e.getQualifier(), this, result) }
}
/** A control-flow node that wraps a qualifier expression. */
class QualifierCfgNode extends ExprCfgNode {
QualifierCfgNode() { this = any(InvokeMemberCfgNode invoke).getQualifier() }
InvokeMemberCfgNode getInvokeMember() { this = result.getQualifier() }
}
}
module StmtNodes {

View File

@@ -17,4 +17,23 @@ Scope scopeOf(Ast n) {
class Scope extends Ast, @script_block {
/** Gets the outer scope, if any. */
Scope getOuterScope() { result = scopeOf(this) }
/**
* Gets the `i`'th paramter in this scope.
*
* This may be both function paramters and parameter block parameters.
*/
Parameter getParameter(int i) {
exists(Function func |
func.getBody() = this and
result = func.getParameter(i)
)
}
/**
* Gets a paramter in this scope.
*
* This may be both function paramters and parameter block parameters.
*/
Parameter getAParameter() { result = this.getParameter(_) }
}

View File

@@ -2,8 +2,10 @@ private import codeql.util.Boolean
private import codeql.util.Unit
private import powershell
private import semmle.code.powershell.Cfg
private import semmle.code.powershell.dataflow.Ssa
private import DataFlowPublic
private import DataFlowDispatch
private import SsaImpl as SsaImpl
/** Gets the callable in which this node occurs. */
DataFlowCallable nodeGetEnclosingCallable(Node n) { result = n.(NodeImpl).getEnclosingCallable() }
@@ -39,9 +41,40 @@ private class ExprNodeImpl extends ExprNode, NodeImpl {
override string toStringImpl() { result = this.getExprNode().toString() }
}
/** Gets the SSA definition node corresponding to parameter `p`. */
pragma[nomagic]
SsaImpl::DefinitionExt getParameterDef(Parameter p) {
exists(EntryBasicBlock bb, int i |
SsaImpl::parameterWrite(bb, i, p) and
result.definesAt(p, bb, i, _)
)
}
/** Provides logic related to SSA. */
module SsaFlow {
// TODO
private module Impl = SsaImpl::DataFlowIntegration;
private ParameterNodeImpl toParameterNode(SsaImpl::ParameterExt p) {
result = TNormalParameterNode(p.asParameter())
}
Impl::Node asNode(Node n) {
n = TSsaNode(result)
or
result.(Impl::ExprNode).getExpr() = n.asExpr()
or
result.(Impl::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
or
n = toParameterNode(result.(Impl::ParameterNode).getParameter())
}
predicate localFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
Impl::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
}
predicate localMustFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
Impl::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
}
}
/** Provides predicates related to local data flow. */
@@ -54,19 +87,6 @@ module LocalFlow {
predicate localMustFlowStep(Node node1, Node node2) { none() }
}
/** An argument of a call (including qualifier arguments and block arguments). */
private class Argument extends CfgNodes::ExprCfgNode {
private CfgNodes::StmtNodes::CmdCfgNode call;
private ArgumentPosition arg;
Argument() { none() }
/** Holds if this expression is the `i`th argument of `c`. */
predicate isArgumentOf(CfgNodes::StmtNodes::CmdCfgNode c, ArgumentPosition pos) {
c = call and pos = arg
}
}
/** Provides logic related to captured variables. */
module VariableCapture {
// TODO
@@ -78,8 +98,11 @@ private module Cached {
cached
newtype TNode =
TExprNode(CfgNodes::ExprCfgNode n) or
TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
TNormalParameterNode(Parameter p) or
TExprPostUpdateNode(CfgNodes::ExprCfgNode n) {
none() // TODO
n instanceof CfgNodes::ExprNodes::ArgumentCfgNode or
n instanceof CfgNodes::ExprNodes::QualifierCfgNode
}
cached
@@ -117,6 +140,60 @@ import Cached
/** Holds if `n` should be hidden from path explanations. */
predicate nodeIsHidden(Node n) { none() }
/** An SSA node. */
abstract class SsaNode extends NodeImpl, TSsaNode {
SsaImpl::DataFlowIntegration::SsaNode node;
SsaImpl::DefinitionExt def;
SsaNode() {
this = TSsaNode(node) and
def = node.getDefinitionExt()
}
SsaImpl::DefinitionExt getDefinitionExt() { result = def }
/** Holds if this node should be hidden from path explanations. */
abstract predicate isHidden();
override Location getLocationImpl() { result = node.getLocation() }
override string toStringImpl() { result = node.toString() }
}
/** An (extended) SSA definition, viewed as a node in a data flow graph. */
class SsaDefinitionExtNode extends SsaNode {
override SsaImpl::DataFlowIntegration::SsaDefinitionExtNode node;
/** Gets the underlying variable. */
Variable getVariable() { result = def.getSourceVariable() }
override predicate isHidden() {
not def instanceof Ssa::WriteDefinition
or
def = getParameterDef(_)
}
override CfgScope getCfgScope() { result = def.getBasicBlock().getScope() }
}
class SsaDefinitionNodeImpl extends SsaDefinitionExtNode {
Ssa::Definition ssaDef;
SsaDefinitionNodeImpl() { ssaDef = def }
override Location getLocationImpl() { result = ssaDef.getLocation() }
override string toStringImpl() { result = ssaDef.toString() }
}
class SsaInputNode extends SsaNode {
override SsaImpl::DataFlowIntegration::SsaInputNode node;
override predicate isHidden() { any() }
override CfgScope getCfgScope() { result = node.getDefinitionExt().getBasicBlock().getScope() }
}
private module ParameterNodes {
abstract class ParameterNodeImpl extends NodeImpl {
abstract Parameter getParameter();
@@ -130,7 +207,30 @@ private module ParameterNodes {
)
}
}
// TODO
/**
* The value of a normal parameter at function entry, viewed as a node in a data
* flow graph.
*/
class NormalParameterNode extends ParameterNodeImpl, TNormalParameterNode {
Parameter parameter;
NormalParameterNode() { this = TNormalParameterNode(parameter) }
override Parameter getParameter() { result = parameter }
override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
exists(CfgScope callable, int i |
callable = c.asCfgScope() and pos.isPositional(i) and callable.getParameter(i) = parameter
)
}
override CfgScope getCfgScope() { result.getAParameter() = parameter }
override Location getLocationImpl() { result = parameter.getLocation() }
override string toStringImpl() { result = parameter.toString() }
}
}
import ParameterNodes
@@ -252,7 +352,19 @@ abstract class PostUpdateNodeImpl extends Node {
}
private module PostUpdateNodes {
// TODO
class ExprPostUpdateNode extends PostUpdateNodeImpl, NodeImpl, TExprPostUpdateNode {
private CfgNodes::ExprCfgNode e;
ExprPostUpdateNode() { this = TExprPostUpdateNode(e) }
override ExprNode getPreUpdateNode() { e = result.getExprNode() }
override CfgScope getCfgScope() { result = e.getExpr().getEnclosingScope() }
override Location getLocationImpl() { result = e.getLocation() }
override string toStringImpl() { result = "[post] " + e.toString() }
}
}
private import PostUpdateNodes
@@ -276,7 +388,7 @@ class NodeRegion instanceof Unit {
predicate contains(Node n) { none() }
/** Gets a best-effort total ordering. */
int totalOrder() { none() }
int totalOrder() { result = 1 }
}
/**

View File

@@ -10,7 +10,7 @@ query predicate cmdExpr(CmdExpr cmd, Expr e) {
}
query predicate invokeMemoryExpression(InvokeMemberExpr invoke, Expr e, int i, Expr arg) {
e = invoke.getBase() and
e = invoke.getQualifier() and
arg = invoke.getArgument(i)
}

View File

@@ -0,0 +1,8 @@
$a1 = Source
Sink $a1
$b = GetBool
if($b) {
$a2 = Source
}
Sink $a2

View File

@@ -0,0 +1,6 @@
import powershell
import semmle.code.powershell.dataflow.DataFlow
from DataFlow::Node pred, DataFlow::Node succ
where DataFlow::localFlowStep(pred, succ)
select pred, succ