From cfd733c54c26f94fbfb6e249ecc40d9d1194f9c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 Apr 2020 17:56:50 +0400
Subject: [PATCH] Add confirmation box for suspicious urls.

---
 Telegram/SourceFiles/core/click_handler_types.cpp          | 7 ++++++-
 Telegram/SourceFiles/core/ui_integration.cpp               | 5 +++++
 Telegram/SourceFiles/history/history_widget.cpp            | 2 +-
 .../history/view/media/history_view_web_page.cpp           | 3 ++-
 Telegram/SourceFiles/overview/overview_layout.cpp          | 4 +++-
 Telegram/lib_ui                                            | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 6434b56f7..e71db35d9 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -51,9 +51,14 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 		if (UrlRequiresConfirmation(url)
 			&& QGuiApplication::keyboardModifiers() != Qt::ControlModifier) {
 			Core::App().hideMediaView();
-			const auto displayUrl = parsedUrl.isValid()
+			const auto displayed = parsedUrl.isValid()
 				? parsedUrl.toDisplayString()
 				: url;
+			const auto displayUrl = !IsSuspicious(displayed)
+				? displayed
+				: parsedUrl.isValid()
+				? QString::fromUtf8(parsedUrl.toEncoded())
+				: ShowEncoded(displayed);
 			Ui::show(
 				Box<ConfirmBox>(
 					(tr::lng_open_this_link(tr::now)
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index 9e4161b17..07708466a 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -66,6 +66,11 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		const QString &data,
 		const TextParseOptions &options) {
 	switch (type) {
+	case EntityType::Url:
+		return (!data.isEmpty() && UrlClickHandler::IsSuspicious(data))
+			? std::make_shared<HiddenUrlClickHandler>(data)
+			: nullptr;
+
 	case EntityType::CustomUrl:
 		return !data.isEmpty()
 			? std::make_shared<HiddenUrlClickHandler>(data)
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 93dd89b2d..e6eaef39f 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3649,7 +3649,7 @@ void HistoryWidget::botCallbackDone(
 					updateSendAction(item->history(), SendAction::Type::PlayGame);
 				}
 			} else {
-				UrlClickHandler(link).onClick({});
+				UrlClickHandler::Open(link);
 			}
 		}
 	});
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index cfb79881e..e17034226 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -127,7 +127,8 @@ QSize WebPage::countOptimalSize() {
 			}
 			return true;
 		}();
-		_openl = previewOfHiddenUrl
+		_openl = (previewOfHiddenUrl
+			|| UrlClickHandler::IsSuspicious(_data->url))
 			? std::make_shared<HiddenUrlClickHandler>(_data->url)
 			: std::make_shared<UrlClickHandler>(_data->url, true);
 		if (_data->document
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 32bce8c2b..2b85773eb 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -1619,7 +1619,9 @@ const style::RoundCheckbox &Link::checkboxStyle() const {
 Link::LinkEntry::LinkEntry(const QString &url, const QString &text)
 : text(text)
 , width(st::normalFont->width(text))
-, lnk(std::make_shared<UrlClickHandler>(url)) {
+, lnk(UrlClickHandler::IsSuspicious(url)
+	? std::make_shared<HiddenUrlClickHandler>(url)
+	: std::make_shared<UrlClickHandler>(url)) {
 }
 
 } // namespace Layout
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 40084cab9..725d768f0 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 40084cab9577064436e2b381c27f498ac4a210a3
+Subproject commit 725d768f0ff1c22f6b477c28c324c20cbf2419da