tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check tg link host characters in check_link.

Browse Source
This commit is contained in:
levlam 2021-06-03 17:17:36 +03:00
parent ce2202b1cc
commit 2fb9df33d2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
td/telegram/LinkManager.cpp
View File

@ -498,6 +498,11 @@ Result<string> LinkManager::check_link(Slice link) {
if (query.size() > 1 && query[1] == '?') { if (query.size() > 1 && query[1] == '?') {
query.remove_prefix(1); query.remove_prefix(1);
} }
for (auto c : http_url.host_) {
if (!is_alnum(c) && c != '-' && c != '_') {
return Status::Error("Unallowed characters in URL host");
}
}
return PSTRING() << (is_tg ? "tg" : "ton") << "://" << http_url.host_ << query; return PSTRING() << (is_tg ? "tg" : "ton") << "://" << http_url.host_ << query;
} }

7
test/link.cpp
View File

@ -22,7 +22,7 @@ static void check_link(td::string url, td::string expected) {
TEST(Link, check_link) { TEST(Link, check_link) {
check_link("sftp://google.com", ""); check_link("sftp://google.com", "");
check_link("tg://google.com", "tg://google.com/"); check_link("tg://google_com", "tg://google_com/");
check_link("tOn://google", "ton://google/"); check_link("tOn://google", "ton://google/");
check_link("httP://google.com?1#tes", "http://google.com/?1#tes"); check_link("httP://google.com?1#tes", "http://google.com/?1#tes");
check_link("httPs://google.com/?1#tes", "https://google.com/?1#tes"); check_link("httPs://google.com/?1#tes", "https://google.com/?1#tes");
@ -37,11 +37,12 @@ TEST(Link, check_link) {
check_link("tg:https://google.com", ""); check_link("tg:https://google.com", "");
check_link("tg:test@google.com", ""); check_link("tg:test@google.com", "");
check_link("tg:google.com:80", ""); check_link("tg:google.com:80", "");
check_link("tg:google.com", "tg://google.com/"); check_link("tg:google-com", "tg://google-com/");
check_link("tg:google.com", "");
check_link("tg:google.com:0", ""); check_link("tg:google.com:0", "");
check_link("tg:google.com:a", ""); check_link("tg:google.com:a", "");
check_link("tg:[2001:db8:0:0:0:ff00:42:8329]", ""); check_link("tg:[2001:db8:0:0:0:ff00:42:8329]", "");
check_link("tg:127.0.0.1", "tg://127.0.0.1/"); check_link("tg:127.0.0.1", "");
check_link("http://[2001:db8:0:0:0:ff00:42:8329]", "http://[2001:db8:0:0:0:ff00:42:8329]/"); check_link("http://[2001:db8:0:0:0:ff00:42:8329]", "http://[2001:db8:0:0:0:ff00:42:8329]/");
check_link("http://localhost", ""); check_link("http://localhost", "");
check_link("http://..", "http://../"); check_link("http://..", "http://../");