Updating URL Regex #275
Closed
Updating URL Regex #275
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
The old URL regex had a few issues which were revealed by fuzzing, the biggest being that it accepted non-printable characters (e.g. 0x00 or 0x01) as part of the URL. This created the scenario where a url of https://example.com/[0x00] would be rendered as %2 (and attempting to open the link would give a value like "https://example.com https://example.com " due to some odd iteraction with the regex that I haven't quite worked out. The new regex appears to work with all the iterations I have tried and rejects non-printable characters.
| @@ -41,7 +41,7 @@ LinkedText::LinkedText(QObject *parent) | |||
| : QObject(parent) | |||
| { | |||
| // Select things that look like URLs of some kind and allow QUrl::fromUserInput to validate them | |||
| linkRegex = QRegularExpression(QStringLiteral("([a-z]{3,9}:|www\\.)([^\\s,.);!>]|[,.);!>](?!\\s|$))+"), QRegularExpression::CaseInsensitiveOption); | |||
| linkRegex = QRegularExpression(QStringLiteral("([a-z]{3,9}:|www\\.)([\\p{L}\\p{N}\\-\\._~:=&/?#]+)"), QRegularExpression::CaseInsensitiveOption); | |||
There was a problem hiding this comment.
Hmm, we are losing a (useful?) trick here.
This section would capture all non-whitespace characters, excluding the characters ,.);!> when they are at the end of the URL. The idea is that if you type I use http://ricochet.im/. It's neat., that period doesn't become part of the link.
Is there a way we can duplicate that effect here, by excluding those characters from the first class and adding them to a second one with the negative forward lookahead?
|
Also, nice catch - thanks for taking the time to fuzz this. |
|
Closing in favor of new PR #302 |
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.
The old URL regex had a few issues which were revealed by fuzzing,
the biggest being that it accepted non-printable characters (e.g.
0x00 or 0x01) as part of the URL.
This created the scenario where a url of https://example.com/[0x00]
would be rendered as %2 (and attempting to open the link would give
a value like "https://example.com https://example.com " due to some
odd iteraction with the regex that I haven't quite worked out.
The new regex appears to work with all the iterations I have tried
and rejects non-printable characters.
Below are 2 picks, the first before the change with the old regex, and the second shot with the new regex.
The test strings were: