Fix mentions being formatted with Markdown #2433
Open
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
Prevents usernames with underscores being formatted with underline. Signed-off-by: Plastikmensch <[email protected]>
Test that usernames with underscores get linked correctly Signed-off-by: Plastikmensch <[email protected]>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -98,7 +98,8 @@ | |||
| private | |||
|
|
|||
| def format_markdown(html) | |||
| html = markdown_formatter.render(html) | |||
| # Force escape usernames in mentions before formatting | |||
| html = markdown_formatter.render(html.gsub(Account::MENTION_RE) { |re| re.gsub('_', '\\_') }) | |||
Check failure
Code scanning / CodeQL
Incomplete string escaping or encoding High
There was a problem hiding this comment.
MENTION_RE doesn't match backslashes, so re cannot contain escaped underscores.
The reason escaping here works is because redcarpet converts escaped underscores to underscores instead of u elements before mentions are processed in rewrite
I haven't looked into why manually escaping usernames doesn't produce a mention, but I think that's expected behaviour.
Tagadda
approved these changes
Oct 23, 2023
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 #2432
Not the best solution, but the easiest I could think of not requiring a major refactor.
This will force escape underscores in mentions.
This will still not link correctly when content type is html, but I consider that a separate issue.