From e0753fedb9219e1f3998ed385ec4cbc466dac7ba Mon Sep 17 00:00:00 2001
From: Daniel Kamil Kozar <dkk089@gmail.com>
Date: Sat, 11 Feb 2023 03:33:24 +0100
Subject: [PATCH] fix: put "private" and "source" inside the metadata "info"
 key (#4809)

---
 libtransmission/makemeta.cc            | 21 +++++++++++----------
 tests/libtransmission/makemeta-test.cc | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc
index 2f3e3670d..fcd58554c 100644
--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -340,16 +340,6 @@ std::string tr_metainfo_builder::benc(tr_error** error) const
 
     tr_variantDictAddStrView(&top, TR_KEY_encoding, "UTF-8");
 
-    if (is_private_)
-    {
-        tr_variantDictAddInt(&top, TR_KEY_private, 1);
-    }
-
-    if (!std::empty(source))
-    {
-        tr_variantDictAddStr(&top, TR_KEY_source, source_);
-    }
-
     auto* const info_dict = tr_variantDictAddDict(&top, TR_KEY_info, 5);
     auto const base = tr_sys_path_basename(top_);
 
@@ -392,6 +382,17 @@ std::string tr_metainfo_builder::benc(tr_error** error) const
 
     tr_variantDictAddInt(info_dict, TR_KEY_piece_length, pieceSize());
     tr_variantDictAddRaw(info_dict, TR_KEY_pieces, std::data(piece_hashes_), std::size(piece_hashes_));
+
+    if (is_private_)
+    {
+        tr_variantDictAddInt(info_dict, TR_KEY_private, 1);
+    }
+
+    if (!std::empty(source))
+    {
+        tr_variantDictAddStr(info_dict, TR_KEY_source, source_);
+    }
+
     auto ret = tr_variantToStr(&top, TR_VARIANT_FMT_BENC);
     tr_variantClear(&top);
     return ret;
diff --git a/tests/libtransmission/makemeta-test.cc b/tests/libtransmission/makemeta-test.cc
index f62befa82..96c50112b 100644
--- a/tests/libtransmission/makemeta-test.cc
+++ b/tests/libtransmission/makemeta-test.cc
@@ -216,4 +216,24 @@ TEST_F(MakemetaTest, singleFile)
     testBuilder(builder);
 }
 
+TEST_F(MakemetaTest, privateAndSourceHasDifferentInfoHash)
+{
+    auto const files = makeRandomFiles(sandboxDir(), 1);
+    auto const [filename, payload] = files.front();
+    auto builder = tr_metainfo_builder{ filename };
+    auto trackers = tr_announce_list{};
+    trackers.add("udp://tracker.openbittorrent.com:80"sv, trackers.nextTier());
+    builder.setAnnounceList(std::move(trackers));
+    auto baseMetainfo = testBuilder(builder);
+
+    builder.setPrivate(true);
+    auto privateMetainfo = testBuilder(builder);
+    EXPECT_NE(baseMetainfo.infoHash(), privateMetainfo.infoHash());
+
+    builder.setSource("FOO");
+    auto privateSourceMetainfo = testBuilder(builder);
+    EXPECT_NE(baseMetainfo.infoHash(), privateSourceMetainfo.infoHash());
+    EXPECT_NE(privateMetainfo.infoHash(), privateSourceMetainfo.infoHash());
+}
+
 } // namespace libtransmission::test