Handle AssetIds with invalid URI characters #1140
Merged
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
Fixes #1134 Rewrite the URI encoding for AssetId to be more robust by using the built in URI escaping when using `pathSegments` instead of `path`. Delete a duplicate of the AssetId test file.
|
We had talked about just throwing away any file path that had an invalid character, but I think this is probably the better fix. |
jakemac53
reviewed
Mar 9, 2018
| @@ -1,71 +0,0 @@ | |||
| // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | |||
There was a problem hiding this comment.
were the rest of these all dupes?
There was a problem hiding this comment.
no, the other ones in this directory are testing build_runner stuff.
| final scheme = isLib ? 'package' : 'asset'; | ||
| final pathSegments = isLib ? originalSegments.skip(1) : originalSegments; | ||
| return new Uri( | ||
| scheme: scheme, pathSegments: [id.package]..addAll(pathSegments)); |
There was a problem hiding this comment.
so pathSegments escapes and path doesn't?
There was a problem hiding this comment.
path escapes some stuff, but not everything. It leaves delimiters, even when they are invalid.
https://github.com/dart-lang/sdk/blob/80a571d5460bbc734e709d7437af2c7df11e582a/sdk/lib/core/uri.dart#L85
pathSegments escapes everything which is, I think, what we want.
jakemac53
approved these changes
Mar 9, 2018
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 #1134
Rewrite the URI encoding for AssetId to be more robust by using the
built in URI escaping when using
pathSegmentsinstead ofpath.Delete a duplicate of the AssetId test file.