-
Notifications
You must be signed in to change notification settings - Fork 923
Updated Code to skip files which can trigger outside agent root direc… #5566
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.
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
Open
sanjuyadav24
wants to merge
6
commits into
master
Choose a base branch
from
users/sanjuyadav/coverage_file_vulnerability
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
546af03
Updated Code to skip files which can trigger outside agent root direc…
5f9d46d
Updated Code to skip files which can trigger outside agent root direc…
88969f3
Fixed test cases
d8d7f54
code review changes
65e9dd4
code review changes
3d6b3d6
fixing ci checks
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.Services.Agent.Worker.CodeCoverage | |
| { | ||
| public static class CodeCoverageUtilities | ||
| { | ||
| public static void CopyFilesFromFileListWithDirStructure(List<string> files, ref string destinatonFilePath) | ||
| public static void CopyFilesFromFileListWithDirStructure(List<string> files, ref string destinatonFilePath, List<string> skippedFiles = null) | ||
| { | ||
|
sanjuyadav24 marked this conversation as resolved.
|
||
| string commonPath = null; | ||
| if (files != null) | ||
|
|
@@ -26,22 +26,38 @@ public static void CopyFilesFromFileListWithDirStructure(List<string> files, ref | |
| commonPath = SharedSubstring(files[0], files[files.Count - 1]); | ||
| } | ||
|
|
||
| var canonicalDest = Path.GetFullPath(destinatonFilePath + Path.DirectorySeparatorChar); | ||
|
|
||
| foreach (var file in files) | ||
| { | ||
| string newFile = null; | ||
|
|
||
| if (!string.IsNullOrEmpty(commonPath)) | ||
| // FIX 1: Use Substring instead of Replace to safely remove only the prefix | ||
| if (!string.IsNullOrEmpty(commonPath) && file.StartsWith(commonPath, StringComparison.OrdinalIgnoreCase)) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ignore case is not needed for case-sensitive os IMO, we shuold figure out side effects of it
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. updated |
||
| { | ||
| newFile = file.Replace(commonPath, ""); | ||
| newFile = file.Substring(commonPath.Length); | ||
| } | ||
| else | ||
| { | ||
| newFile = Path.GetFileName(file); | ||
| } | ||
|
|
||
| // FIX 2: Strip leading directory separators to prevent Path.Combine | ||
| // from treating newFile as an absolute path and ignoring destinatonFilePath | ||
| newFile = newFile.TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); | ||
|
|
||
| newFile = Path.Combine(destinatonFilePath, newFile); | ||
| Directory.CreateDirectory(Path.GetDirectoryName(newFile)); | ||
| File.Copy(file, newFile, true); | ||
| var canonicalNewFile = Path.GetFullPath(newFile); | ||
|
|
||
| // FIX 3: Canonicalization boundary check - skip files that resolve outside destination | ||
| if (!canonicalNewFile.StartsWith(canonicalDest, StringComparison.OrdinalIgnoreCase)) | ||
|
sanjuyadav24 marked this conversation as resolved.
Outdated
|
||
| { | ||
| skippedFiles?.Add(file); | ||
| continue; | ||
| } | ||
|
sanjuyadav24 marked this conversation as resolved.
|
||
|
|
||
| Directory.CreateDirectory(Path.GetDirectoryName(canonicalNewFile)); | ||
| File.Copy(file, canonicalNewFile, true); | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we make this error but not fail the task...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this will trigger a warning, not fail the pipeline