wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

magnet links: unescape hash parameter (#1925)

This commit is contained in:
Jan Berkel 2017-04-19 06:52:35 +02:00 committed by Arvid Norberg
parent 87592d50f2
commit cdf066c4e1
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/magnet_uri.cpp
View File

@ -216,12 +216,18 @@ namespace libtorrent {
} }
string_view btih = url_has_argument(uri, "xt"); string_view btih = url_has_argument(uri, "xt");
std::string unescaped_btih;
if (btih.empty()) if (btih.empty())
{ {
ec = errors::missing_info_hash_in_uri; ec = errors::missing_info_hash_in_uri;
return; return;
} }
if (btih.find('%') != string_view::npos)
{
unescaped_btih = unescape_string(btih, ec);
if (ec) return;
btih = unescaped_btih;
}
if (btih.substr(0, 9) != "urn:btih:") if (btih.substr(0, 9) != "urn:btih:")
{ {
ec = errors::missing_info_hash_in_uri; ec = errors::missing_info_hash_in_uri;

26
test/test_magnet.cpp
View File

@ -224,6 +224,32 @@ TORRENT_TEST(magnet)
p2 = s->abort(); p2 = s->abort();
} }
TORRENT_TEST(parse_escaped_hash_parameter)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn%3Abtih%3Acdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd", p, ec);
TEST_CHECK(!ec);
TEST_EQUAL(aux::to_hex(p.info_hash), "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd");
}
TORRENT_TEST(parse_escaped_hash_parameter_in_hex)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc%64", p, ec);
TEST_CHECK(!ec);
TEST_EQUAL(aux::to_hex(p.info_hash), "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd");
}
TORRENT_TEST(parse_invalid_escaped_hash_parameter)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn%%3A", p, ec);
TEST_EQUAL(ec, error_code(errors::invalid_escaped_string));
}
TORRENT_TEST(parse_missing_hash) TORRENT_TEST(parse_missing_hash)
{ {
// parse_magnet_uri // parse_magnet_uri