mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: announce with query replace bug (#5871)

This commit is contained in:
Zhenyu Qi 2023-08-13 17:27:55 -07:00 committed by GitHub
parent 1a86c65b44
commit 8873f2a50c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtransmission/announce-list.cc
View File

@ -88,6 +88,7 @@ bool tr_announce_list::add(std::string_view announce_url_sv, tr_tracker_tier_t t
tracker.id = next_unique_id(); tracker.id = next_unique_id();
tracker.host_and_port = fmt::format(FMT_STRING("{:s}:{:d}"), announce->host, announce->port); tracker.host_and_port = fmt::format(FMT_STRING("{:s}:{:d}"), announce->host, announce->port);
tracker.sitename = announce->sitename; tracker.sitename = announce->sitename;
tracker.query = announce->query;
if (auto const scrape_str = announce_to_scrape(announce_url_sv); scrape_str) if (auto const scrape_str = announce_to_scrape(announce_url_sv); scrape_str)
{ {
@ -226,7 +227,8 @@ bool tr_announce_list::can_add(tr_url_parsed_t const& announce) const noexcept
auto const tracker_parsed = tr_urlParse(tracker_announce); auto const tracker_parsed = tr_urlParse(tracker_announce);
return tracker_parsed->scheme == announce.scheme && tracker_parsed->host == announce.host && return tracker_parsed->scheme == announce.scheme && tracker_parsed->host == announce.host &&
tracker_parsed->port == announce.port && tracker_parsed->path == announce.path; tracker_parsed->port == announce.port && tracker_parsed->path == announce.path &&
tracker_parsed->query == announce.query;
}; };
return std::none_of(std::begin(trackers_), std::end(trackers_), is_same); return std::none_of(std::begin(trackers_), std::end(trackers_), is_same);
} }

1
libtransmission/announce-list.h
View File

@ -29,6 +29,7 @@ public:
tr_interned_string scrape; tr_interned_string scrape;
tr_interned_string host_and_port; // 'example.org:80' tr_interned_string host_and_port; // 'example.org:80'
tr_interned_string sitename; // 'example' tr_interned_string sitename; // 'example'
tr_interned_string query; // 'name=ferret'
tr_tracker_tier_t tier = 0; tr_tracker_tier_t tier = 0;
tr_tracker_id_t id = 0; tr_tracker_id_t id = 0;

12
tests/libtransmission/announce-list-test.cc
View File

@ -276,6 +276,18 @@ TEST_F(AnnounceListTest, canReplace)
EXPECT_EQ(Announce2, announce_list.at(0).announce.sv()); EXPECT_EQ(Announce2, announce_list.at(0).announce.sv());
} }
TEST_F(AnnounceListTest, canReplaceWithDiffQuery)
{
auto constexpr Tier = tr_tracker_tier_t{ 1 };
auto constexpr Announce1 = "https://www.example.com/1/announce"sv;
auto constexpr Announce2 = "https://www.example.com/2/announce?pass=1999"sv;
auto announce_list = tr_announce_list{};
EXPECT_TRUE(announce_list.add(Announce1, Tier));
EXPECT_TRUE(announce_list.replace(announce_list.at(0).id, Announce2));
EXPECT_EQ(Announce2, announce_list.at(0).announce.sv());
}
TEST_F(AnnounceListTest, canNotReplaceInvalidId) TEST_F(AnnounceListTest, canNotReplaceInvalidId)
{ {
auto constexpr Tier = tr_tracker_tier_t{ 1 }; auto constexpr Tier = tr_tracker_tier_t{ 1 };