Fix URL sanitizer for long URLs #16026
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
microsoft-github-policy-service
bot
added
the
Issue-Bug
lhecker
commented
Sep 24, 2023
Comment on lines
+20
to
+27
| template<> | ||
| struct fmt::formatter<winrt::hstring, wchar_t> : fmt::formatter<fmt::wstring_view, wchar_t> | ||
| { | ||
| auto format(const winrt::hstring& str, auto& ctx) | ||
| { | ||
| return fmt::formatter<fmt::wstring_view, wchar_t>::format({ str.data(), str.size() }, ctx); | ||
| } | ||
| }; |
There was a problem hiding this comment.
It seems like we don't have any fmt::format call that uses FMT_COMPILE on hstring arguments, or any fmt::format that uses >1 hstring argument. The above one seems to be a first.
...because it appears as if right now we implicitly cast all hstring arguments to C-strings during formatting. This new custom formatter ensures they're treated like string-views (and it allows the above code to compile).
There was a problem hiding this comment.
i love this. does it make the transition to 10.1.1 any easier?
DHowett
approved these changes
Sep 25, 2023
zadjii-msft
approved these changes
Sep 28, 2023
lhecker
added
the
AutoMerge
microsoft-github-policy-service
bot
deleted the
dev/lhecker/16017-fix-url-sanitizer
branch
microsoft-github-policy-service
bot
added
Area-TerminalControl
DHowett
pushed a commit
that referenced
this pull request
Sep 29, 2023
f1aa699 was fundamentally incorrect as it used `IdnToAscii` and `IdnToUnicode` on the entire URL, even though these functions only work on domain names. This commit fixes the issue by using the WinRT `Url` class and its `AbsoluteUri` and `AbsoluteCanonicalUri` getters. The algorithm still works the same way though. Closes #16017 * ``"`e]8;;https://www.xn--fcbook-3nf5b.com/`e\test`e]8;;`e\"`` still shows as two URLs in the popup ✅ * Shows the given URI if it's canonical and not an IDN ✅ * Works with >100 char long file:// URIs ✅ (cherry picked from commit 198c11f) Service-Card-Id: 90642843 Service-Version: 1.18
DHowett
pushed a commit
that referenced
this pull request
Sep 29, 2023
f1aa699 was fundamentally incorrect as it used `IdnToAscii` and `IdnToUnicode` on the entire URL, even though these functions only work on domain names. This commit fixes the issue by using the WinRT `Url` class and its `AbsoluteUri` and `AbsoluteCanonicalUri` getters. The algorithm still works the same way though. Closes #16017 ## Validation Steps Performed * ``"`e]8;;https://www.xn--fcbook-3nf5b.com/`e\test`e]8;;`e\"`` still shows as two URLs in the popup ✅ * Shows the given URI if it's canonical and not an IDN ✅ * Works with >100 char long file:// URIs ✅ (cherry picked from commit 198c11f) Service-Card-Id: 90642844 Service-Version: 1.19
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.
f1aa699 was fundamentally incorrect as it used
IdnToAsciiandIdnToUnicodeon the entire URL, even though these functions only workon domain names. This commit fixes the issue by using the WinRT
Urlclass and its
AbsoluteUriandAbsoluteCanonicalUrigetters.The algorithm still works the same way though.
Closes #16017
Validation Steps Performed
"`e]8;;https://www.xn--fcbook-3nf5b.com/`e\test`e]8;;`e\"still shows as two URLs in the popup ✅