hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-25 00:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from microsoft/powershell-dataflow-fixes

Browse Source 
Powershell: Fix dataflow/SSA consistency errors.
This commit is contained in:
Mathias Vorreiter Pedersen
2024-10-03 12:17:51 +02:00
committed by GitHub
parent c7850b141d 7eac066118
commit c7976d5090
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
powershell/ql/consistency-queries/DataFlowConsistency.ql Normal file
View File

@@ -0,0 +1,11 @@
import semmle.code.powershell.dataflow.DataFlow::DataFlow as DataFlow
private import powershell
private import semmle.code.powershell.dataflow.internal.DataFlowImplSpecific
private import semmle.code.powershell.dataflow.internal.TaintTrackingImplSpecific
private import codeql.dataflow.internal.DataFlowImplConsistency
private module Input implements InputSig<Location, PowershellDataFlow> {
private import PowershellDataFlow
}
import MakeConsistency<Location, PowershellDataFlow, PowershellTaintTracking, Input>

11
powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
View File

@@ -34,7 +34,7 @@ abstract class NodeImpl extends Node {
}
private class ExprNodeImpl extends ExprNode, NodeImpl {
override CfgScope getCfgScope() { none() /* TODO */ }
override CfgScope getCfgScope() { result = this.getExprNode().getExpr().getEnclosingScope() }
override Location getLocationImpl() { result = this.getExprNode().getLocation() }
@@ -42,7 +42,7 @@ private class ExprNodeImpl extends ExprNode, NodeImpl {
}
private class StmtNodeImpl extends StmtNode, NodeImpl {
override CfgScope getCfgScope() { none() /* TODO */ }
override CfgScope getCfgScope() { result = this.getStmtNode().getStmt().getEnclosingScope() }
override Location getLocationImpl() { result = this.getStmtNode().getLocation() }
@@ -69,7 +69,9 @@ module SsaFlow {
Impl::Node asNode(Node n) {
n = TSsaNode(result)
or
result.(Impl::ExprNode).getExpr() = n.asExpr() // TODO: Statement nodes?
result.(Impl::ExprNode).getExpr() = n.asExpr()
or
result.(Impl::ExprNode).getExpr() = n.asStmt()
or
result.(Impl::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
or
@@ -371,7 +373,8 @@ private module ParameterNodes {
override Parameter getParameter() { result = parameter }
override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
exists(CfgScope callable | callable = c.asCfgScope() |
parameter.getDeclaringScope() = c.asCfgScope() and
(
pos.isKeyword(parameter.getName())
or
// Given a function f with parameters x, y we map

2
powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
View File

@@ -344,7 +344,7 @@ class ParameterExt extends TParameterExt {
private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
class Parameter = ParameterExt;
class Expr extends Cfg::CfgNodes::ExprCfgNode {
class Expr extends Cfg::CfgNodes::AstCfgNode {
predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
}