Skip to content

PS: Fix parameter/argument name mapping for named parameters #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chanel-y merged 2 commits into from
Apr 1, 2025
Merged

PS: Fix parameter/argument name mapping for named parameters #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c380fb
PS: Add another missing flow found by Chanel.
MathiasVP Apr 1, 2025
5fa3beb
PS: Normalize parameter keywords and accept test changes.
MathiasVP Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ private module ParameterNodes {
override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
parameter.getEnclosingScope() = c.asCfgScope() and
(
pos.isKeyword(parameter.getName())
pos.isKeyword(parameter.getName().toLowerCase())
or
// Given a function f with parameters x, y we map
// x to the positions:
Expand All @@ -558,7 +558,7 @@ private module ParameterNodes {
parameter.getIndexExcludingPipelines() = i and
f = parameter.getFunction() and
f = ns.getAFunction() and
name = parameter.getName() and
name = parameter.getName().toLowerCase() and
not name = ns.getAName() and
j =
i -
Expand Down
8 changes: 8 additions & 0 deletions powershell/ql/test/library-tests/dataflow/params/test.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ edges
| test.ps1:39:14:39:19 | third | test.ps1:8:32:12:1 | z | provenance | |
| test.ps1:39:24:39:30 | second | test.ps1:8:32:12:1 | y | provenance | |
| test.ps1:39:32:39:37 | first | test.ps1:8:32:12:1 | x | provenance | |
| test.ps1:42:1:45:1 | UserInput | test.ps1:44:10:44:19 | UserInput | provenance | |
| test.ps1:47:10:47:19 | Call to Source | test.ps1:48:46:48:51 | input | provenance | |
| test.ps1:48:46:48:51 | input | test.ps1:42:1:45:1 | UserInput | provenance | |
nodes
| global.ps1:1:1:6:32 | Source1 | semmle.label | Source1 |
| global.ps1:1:1:6:32 | Source2 | semmle.label | Source2 |
Expand Down Expand Up @@ -230,6 +233,10 @@ nodes
| test.ps1:39:14:39:19 | third | semmle.label | third |
| test.ps1:39:24:39:30 | second | semmle.label | second |
| test.ps1:39:32:39:37 | first | semmle.label | first |
| test.ps1:42:1:45:1 | UserInput | semmle.label | UserInput |
| test.ps1:44:10:44:19 | UserInput | semmle.label | UserInput |
| test.ps1:47:10:47:19 | Call to Source | semmle.label | Call to Source |
| test.ps1:48:46:48:51 | input | semmle.label | input |
subpaths
testFailures
#select
Expand All @@ -241,3 +248,4 @@ testFailures
| test.ps1:9:10:9:11 | x | test.ps1:14:10:14:19 | Call to Source | test.ps1:9:10:9:11 | x | $@ | test.ps1:14:10:14:19 | Call to Source | Call to Source |
| test.ps1:10:10:10:11 | y | test.ps1:15:11:15:20 | Call to Source | test.ps1:10:10:10:11 | y | $@ | test.ps1:15:11:15:20 | Call to Source | Call to Source |
| test.ps1:11:10:11:11 | z | test.ps1:16:10:16:19 | Call to Source | test.ps1:11:10:11:11 | z | $@ | test.ps1:16:10:16:19 | Call to Source | Call to Source |
| test.ps1:44:10:44:19 | UserInput | test.ps1:47:10:47:19 | Call to Source | test.ps1:44:10:44:19 | UserInput | $@ | test.ps1:47:10:47:19 | Call to Source | Call to Source |
11 changes: 10 additions & 1 deletion powershell/ql/test/library-tests/dataflow/params/test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,13 @@ ThreeArgs -z $third -y $second $first
ThreeArgs -z $third $second -x $first
ThreeArgs -z $third -x $first $second
ThreeArgs -z $third $first -y $second
ThreeArgs -z $third -y $second $first
ThreeArgs -z $third -y $second $first

function Invoke-InvokeExpressionInjection2
{
param($UserInput)
Sink $UserInput # $ hasValueFlow=1
}

$input = Source "1"
Invoke-InvokeExpressionInjection2 -UserInput $input