mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-23 16:24:02 +00:00
Code Issues Releases Wiki Activity

fix: always add announce key even when including announce-list (#5106)

Browse source
This commit is contained in:
Charles Kerr 2023-03-01 13:10:20 -06:00 committed by GitHub
parent 03a23cf797
commit 211e3fc985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libtransmission/makemeta.cc
View file

@ -291,8 +291,12 @@ std::string tr_metainfo_builder::benc(tr_error** error) const
auto top = tr_variant{}; auto top = tr_variant{};
tr_variantInitDict(&top, 8); tr_variantInitDict(&top, 8);
// add the announce-list trackers // add the announce URLs
if (!std::empty(announceList())) if (!std::empty(announceList()))
{
tr_variantDictAddStrView(&top, TR_KEY_announce, announceList().at(0).announce.sv());
}
if (std::size(announceList()) > 1U)
{ {
auto* const announce_list = tr_variantDictAddList(&top, TR_KEY_announce_list, 0); auto* const announce_list = tr_variantDictAddList(&top, TR_KEY_announce_list, 0);
tr_variant* tier_list = nullptr; tr_variant* tier_list = nullptr;

75
tests/libtransmission/makemeta-test.cc
View file

@ -216,6 +216,69 @@ TEST_F(MakemetaTest, singleFile)
testBuilder(builder); testBuilder(builder);
} }
TEST_F(MakemetaTest, announceSingleTracker)
{
auto const files = makeRandomFiles(sandboxDir(), 1);
auto const [filename, payload] = files.front();
auto builder = tr_metainfo_builder{ filename };
// add a tracker
static auto constexpr SingleAnnounce = "udp://tracker.openbittorrent.com:80"sv;
auto trackers = tr_announce_list{};
trackers.add(SingleAnnounce, trackers.nextTier());
builder.setAnnounceList(std::move(trackers));
// generate the torrent and parse it as a variant
EXPECT_EQ(nullptr, builder.makeChecksums().get());
auto top = tr_variant{};
auto const benc = builder.benc();
EXPECT_TRUE(tr_variantFromBuf(&top, TR_VARIANT_PARSE_BENC | TR_VARIANT_PARSE_INPLACE, benc));
// confirm there's an "announce" entry
auto single_announce = std::string_view{};
EXPECT_TRUE(tr_variantDictFindStrView(&top, TR_KEY_announce, &single_announce));
EXPECT_EQ(SingleAnnounce, single_announce);
// confirm there's not an "announce-list" entry
EXPECT_EQ(nullptr, tr_variantDictFind(&top, TR_KEY_announce_list));
tr_variantClear(&top);
}
TEST_F(MakemetaTest, announceMultiTracker)
{
auto const files = makeRandomFiles(sandboxDir(), 1);
auto const [filename, payload] = files.front();
auto builder = tr_metainfo_builder{ filename };
// add the trackers
auto trackers = tr_announce_list{};
for (auto const& url : { "udp://tracker.openbittorrent.com:80"sv, "udp://tracker.publicbt.com:80"sv })
{
trackers.add(url, trackers.nextTier());
}
builder.setAnnounceList(std::move(trackers));
// generate the torrent and parse it as a variant
EXPECT_EQ(nullptr, builder.makeChecksums().get());
auto top = tr_variant{};
auto const benc = builder.benc();
EXPECT_TRUE(tr_variantFromBuf(&top, TR_VARIANT_PARSE_BENC | TR_VARIANT_PARSE_INPLACE, benc));
// confirm there's an "announce" entry
auto single_announce = std::string_view{};
EXPECT_TRUE(tr_variantDictFindStrView(&top, TR_KEY_announce, &single_announce));
EXPECT_EQ(builder.announceList().at(0).announce.sv(), single_announce);
// confirm there's an "announce-list" entry
tr_variant* announce_list_variant = nullptr;
EXPECT_TRUE(tr_variantDictFindList(&top, TR_KEY_announce_list, &announce_list_variant));
EXPECT_NE(nullptr, announce_list_variant);
EXPECT_EQ(std::size(builder.announceList()), tr_variantListSize(announce_list_variant));
tr_variantClear(&top);
}
TEST_F(MakemetaTest, privateAndSourceHasDifferentInfoHash) TEST_F(MakemetaTest, privateAndSourceHasDifferentInfoHash)
{ {
auto const files = makeRandomFiles(sandboxDir(), 1); auto const files = makeRandomFiles(sandboxDir(), 1);
@ -224,16 +287,16 @@ TEST_F(MakemetaTest, privateAndSourceHasDifferentInfoHash)
auto trackers = tr_announce_list{}; auto trackers = tr_announce_list{};
trackers.add("udp://tracker.openbittorrent.com:80"sv, trackers.nextTier()); trackers.add("udp://tracker.openbittorrent.com:80"sv, trackers.nextTier());
builder.setAnnounceList(std::move(trackers)); builder.setAnnounceList(std::move(trackers));
auto baseMetainfo = testBuilder(builder); auto base_metainfo = testBuilder(builder);
builder.setPrivate(true); builder.setPrivate(true);
auto privateMetainfo = testBuilder(builder); auto private_metainfo = testBuilder(builder);
EXPECT_NE(baseMetainfo.infoHash(), privateMetainfo.infoHash()); EXPECT_NE(base_metainfo.infoHash(), private_metainfo.infoHash());
builder.setSource("FOO"); builder.setSource("FOO");
auto privateSourceMetainfo = testBuilder(builder); auto private_source_metainfo = testBuilder(builder);
EXPECT_NE(baseMetainfo.infoHash(), privateSourceMetainfo.infoHash()); EXPECT_NE(base_metainfo.infoHash(), private_source_metainfo.infoHash());
EXPECT_NE(privateMetainfo.infoHash(), privateSourceMetainfo.infoHash()); EXPECT_NE(private_metainfo.infoHash(), private_source_metainfo.infoHash());
} }
} // namespace libtransmission::test } // namespace libtransmission::test