fix: normalize relative paths in agent toolsSettings #2820
Conversation
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
Fixes an issue where relative path patterns in agent toolsSettings (e.g., './denied/**') would not match files accessed with different relative path formats (e.g., 'denied/file.txt'). Changes: - Enhanced canonicalizes_path() to properly normalize relative paths - Added path component resolution for '.' and '..' segments - Ensures consistent path matching for both fs_read and fs_write tools This resolves a security issue where deniedPaths could be bypassed by using different relative path formats.
erbenmo
reviewed
Sep 18, 2025
| let expanded = shellexpand::full_with_context(path_as_str, home_dir, context)?; | ||
|
|
||
| // Convert all relative paths to absolute paths (including glob patterns) | ||
| if !expanded.starts_with("/") && !expanded.starts_with("~") { |
There was a problem hiding this comment.
~ is already expanded I think?
There was a problem hiding this comment.
Consider using Path::new(&expanded).is_relative
|
I noticed a same issue in https://github.com/aws/amazon-q-developer-cli/pull/2926/files My change only applies normalization to fs_read and only to the file being read. I think we should probably use your change since it covers fs_write as well as the allowed_path/denied_path pattern. Can you add some testing in your change? Feel free to take mine |
erbenmo
reviewed
Sep 18, 2025
| let current_dir = os.env.current_dir()?; | ||
| let absolute_path = current_dir.join(expanded.as_ref()); | ||
| // Normalize the path to remove ./ and ../ components | ||
| match absolute_path.canonicalize() { |
There was a problem hiding this comment.
I am wondering should we just always use the normalize_path() method for code simplicity and consistency?
dingfeli
approved these changes
Sep 18, 2025
brandonskiser
approved these changes
Sep 18, 2025
|
This doesn't currently handle this test - |
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.
Fixes an issue where relative path patterns in agent toolsSettings (e.g., './denied/**') would not match files accessed with different relative path formats (e.g., 'denied/file.txt').
Changes:
This resolves a security issue where deniedPaths could be bypassed by using different relative path formats.
*Issue #2818
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.