Cross-Platform .rsp File Support #1016
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
September 20, 2024 15:44
Makes support for .rsp files cross-platform
|
[heart] Martin Reznik reacted to your message:
…________________________________
From: lukaskohl-msft ***@***.***>
Sent: Thursday, October 10, 2024 9:24:08 AM
To: microsoft/binskim ***@***.***>
Cc: Martin Reznik ***@***.***>; Review requested ***@***.***>
Subject: [microsoft/binskim] Cross-Platform .rsp File Support (PR #1016)
Unwrapping/expanding .rsp files used to be supported on Windows only due to FFI calling to shell32.dll. This PR removes FFI in favor of a code native solution.
the sarif-sdk submodule contains a reimplementation of CommandLineToArgvW. Rather than updating sarif-sdk, we've moved the relevant code into the BinSkim codebase, and pointed to the reimplementation instead to slightly lessen our reliance on sarif-sdk, while simultaneously increasing our supported platforms.
Alongside this change, tests were ported and altered over into the BinSkim codebase.
________________________________
You can view, comment on, or merge this pull request online at:
#1016
Commit Summary
* 06c1fac<06c1fac> RSP File Support for Linux
* e076a1d<e076a1d> Argument & RSP support file segmentation
* e157372<e157372> Argument Splitting and RSP Support Tests
File Changes
(3 files<https://github.com/microsoft/binskim/pull/1016/files>)
* M src/BinSkim.Driver/BinSkim.cs<https://github.com/microsoft/binskim/pull/1016/files#diff-31497e69e30b8b3b693a042e83ca6e00c291ad54ba7faf6b6dd48c47a1031517> (2)
* A src/BinSkim.Driver/ExpandArguments.cs<https://github.com/microsoft/binskim/pull/1016/files#diff-d6c363f4cf8cf3d83a4c8d747eeac13c05c2e69399e056f4847a379c0d60d4a1> (57)
* A src/Test.UnitTests.BinSkim.Driver/ExpandArgumentsUnitTests.cs<https://github.com/microsoft/binskim/pull/1016/files#diff-4d6596a28b13ae2fbc9406e29103cb4af98a93e886836ae94ad3812429a9f984> (154)
Patch Links:
* https://github.com/microsoft/binskim/pull/1016.patch
* https://github.com/microsoft/binskim/pull/1016.diff
—
Reply to this email directly, view it on GitHub<#1016>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ADUOOUZUK5CKS63C5IRMY73Z2ZBTRAVCNFSM6AAAAABPWKSNVKVHI2DSMVQWIX3LMV43ASLTON2WKOZSGU3TQMRQGU2TOMQ>.
You are receiving this because your review was requested.Message ID: ***@***.***>
|
mkacmar
reviewed
Oct 15, 2024
|
|
||
| private static bool IsResponseFileArgument(string argument) | ||
| { | ||
| return argument.Length > 1 && argument[0] == '@'; |
There was a problem hiding this comment.
Nitpick: You may want to extract @ into some reasonably named constant.
added 2 commits
October 17, 2024 14:54
Example of an .rsp file: "/example/to/binary/example.exe" # Binary # ---- Libraries ---- "/example/to/libraries/library1.dll" "/example/to/libraries/library2.dll" would result in: "/example/to/binary/example.exe" "/example/to/libraries/library1.dll" "/example/to/libraries/library2.dll"
lukaskohl-msft
force-pushed
the
users/lukaskohl/rsp-linux
branch
from
a22509c
to
54b8982
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+21
to
+37
| foreach (string argument in args) | ||
| { | ||
| string trimArgument = argument.Trim('"'); | ||
| if (!IsResponseFileArgument(trimArgument)) | ||
| { | ||
| expandedArguments.Add(trimArgument); | ||
| continue; | ||
| } | ||
|
|
||
| string responseFile = trimArgument.Substring(1); | ||
|
|
||
| responseFile = environmentVariables.ExpandEnvironmentVariables(responseFile); | ||
| responseFile = fileSystem.PathGetFullPath(responseFile); | ||
|
|
||
| string[] responseFileLines = fileSystem.FileReadAllLines(responseFile); | ||
| ExpandResponseFile(responseFileLines, expandedArguments); | ||
| } |
Check notice
Code scanning / CodeQL
Missed opportunity to use Select Note
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unwrapping/expanding .rsp files used to be supported on Windows only due to FFI calling to
shell32.dll. This PR removes FFI in favor of a code native solution.the
sarif-sdksubmodule contains a reimplementation ofCommandLineToArgvW. Rather than updatingsarif-sdk, we've moved the relevant code into the BinSkim codebase, and pointed to the reimplementation instead to slightly lessen our reliance onsarif-sdk, while simultaneously increasing our supported platforms.Alongside this change, tests were ported and altered over into the BinSkim codebase.