Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent bidi phishing #291

Closed
wants to merge 2 commits into from
Closed

Prevent bidi phishing #291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca31c41
Updating URL Regex
s-rah Oct 13, 2015
a5e42b0
Prevent Bidi Phishing
s-rah Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/ui/LinkedText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

allowedSchemes << QStringLiteral("http")
<< QStringLiteral("https")
Expand All @@ -64,7 +64,11 @@ QString LinkedText::parsed(const QString &input)

if (start > p)
re.append(input.mid(p, start - p).toHtmlEscaped().replace(QLatin1Char('\n'), QStringLiteral("<br/>")));
re.append(QStringLiteral("<a href=\"%1\">%2</a>").arg(QString::fromLatin1(url.toEncoded()).toHtmlEscaped()).arg(match.capturedRef().toString().toHtmlEscaped()));
// Surround link with &#8234; (LEFT-TO-RIGHT EMBEDDING) and &#8236; (POP DIRECTIONAL FORMATTING )
// this will force URI's to be rendered left to right, while preserving the direction of the overall
// text. This prevents phising attacks where the attacker tries obscure the URI by using unicode
// bidi control characters.
re.append(QStringLiteral("<a href=\"%1\">&#8234;%2&#8236;</a>").arg(QString::fromLatin1(url.toEncoded()).toHtmlEscaped()).arg(match.capturedRef().toString().toHtmlEscaped()));
p = match.capturedEnd();
}

Expand Down