From 8efd77fce292ded8211760db30e5927dd52c5cf4 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Mon, 13 Jan 2025 15:47:13 +0000 Subject: [PATCH] Initial private torrents support --- crates/bencode/src/serde_bencode_de.rs | 22 +++++++++++++---- crates/bencode/src/serde_bencode_ser.rs | 7 ++---- crates/librqbit/src/create_torrent_file.rs | 1 + crates/librqbit/src/session.rs | 26 +++++++++++++++----- crates/librqbit/src/tests/test_util.rs | 1 + crates/librqbit/src/upnp_server_adapter.rs | 1 + crates/librqbit_core/src/torrent_metainfo.rs | 8 ++++++ 7 files changed, 50 insertions(+), 16 deletions(-) diff --git a/crates/bencode/src/serde_bencode_de.rs b/crates/bencode/src/serde_bencode_de.rs index 83bef6d..cc170bf 100644 --- a/crates/bencode/src/serde_bencode_de.rs +++ b/crates/bencode/src/serde_bencode_de.rs @@ -218,14 +218,26 @@ impl<'de> serde::de::Deserializer<'de> for &mut BencodeDeserializer<'de> { } } - fn deserialize_bool(self, _visitor: V) -> Result + fn deserialize_bool(self, visitor: V) -> Result where V: serde::de::Visitor<'de>, { - Err( - Error::new_from_kind(ErrorKind::NotSupported("bencode doesn't support booleans")) - .set_context(self), - ) + if !self.buf.starts_with(b"i") { + return Err(Error::custom_with_de( + "expected bencode int to represent bool", + self, + )); + } + let value = self.parse_integer()?; + if value > 1 { + return Err(Error::custom_with_de( + format!("expected 0 or 1 for boolean, but got {value}"), + self, + )); + } + visitor + .visit_bool(value == 1) + .map_err(|e: Self::Error| e.set_context(self)) } fn deserialize_i8(self, visitor: V) -> Result diff --git a/crates/bencode/src/serde_bencode_ser.rs b/crates/bencode/src/serde_bencode_ser.rs index 98a4a27..8e3859b 100644 --- a/crates/bencode/src/serde_bencode_ser.rs +++ b/crates/bencode/src/serde_bencode_ser.rs @@ -218,11 +218,8 @@ impl<'ser, W: std::io::Write> Serializer for &'ser mut BencodeSerializer { type SerializeStruct = SerializeStruct<'ser, W>; type SerializeStructVariant = Impossible<(), SerError>; - fn serialize_bool(self, _: bool) -> Result { - Err(SerError::custom_with_ser( - "bencode doesn't support booleans", - self, - )) + fn serialize_bool(self, value: bool) -> Result { + self.write_number(if value { 1 } else { 0 }) } fn serialize_i8(self, v: i8) -> Result { diff --git a/crates/librqbit/src/create_torrent_file.rs b/crates/librqbit/src/create_torrent_file.rs index 18ea5dc..6ee895e 100644 --- a/crates/librqbit/src/create_torrent_file.rs +++ b/crates/librqbit/src/create_torrent_file.rs @@ -163,6 +163,7 @@ async fn create_torrent_raw<'a>( attr: None, sha1: None, symlink_path: None, + private: false, }) } diff --git a/crates/librqbit/src/session.rs b/crates/librqbit/src/session.rs index a22b53f..5acc511 100644 --- a/crates/librqbit/src/session.rs +++ b/crates/librqbit/src/session.rs @@ -1008,6 +1008,8 @@ impl Session { name, } = add_res; + let private = metadata.as_ref().map_or(false, |m| m.info.private); + let make_peer_rx = || { self.make_peer_rx( info_hash, @@ -1015,6 +1017,7 @@ impl Session { !opts.paused && !opts.list_only, opts.force_tracker_interval, opts.initial_peers.clone().unwrap_or_default(), + private, ) .context("error creating peer stream") }; @@ -1284,12 +1287,14 @@ impl Session { t: &Arc, announce: bool, ) -> anyhow::Result { + let is_private = t.with_metadata(|m| m.info.private).unwrap_or(false); self.make_peer_rx( t.info_hash(), t.shared().trackers.iter().cloned().collect(), announce, t.shared().options.force_tracker_interval, t.shared().options.initial_peers.clone(), + is_private, )? .context("no peer source") } @@ -1298,17 +1303,26 @@ impl Session { fn make_peer_rx( self: &Arc, info_hash: Id20, - trackers: Vec, + mut trackers: Vec, announce: bool, force_tracker_interval: Option, initial_peers: Vec, + is_private: bool, ) -> anyhow::Result> { let announce_port = if announce { self.tcp_listen_port } else { None }; - let dht_rx = self - .dht - .as_ref() - .map(|dht| dht.get_peers(info_hash, announce_port)) - .transpose()?; + let dht_rx = if is_private { + None + } else { + self.dht + .as_ref() + .map(|dht| dht.get_peers(info_hash, announce_port)) + .transpose()? + }; + + if is_private && trackers.len() > 1 { + warn!("private trackers are not fully implemented, so using only the first tracker"); + trackers.resize_with(1, Default::default); + } let tracker_rx_stats = PeerRxTorrentInfo { info_hash, diff --git a/crates/librqbit/src/tests/test_util.rs b/crates/librqbit/src/tests/test_util.rs index 9df9866..1130b8c 100644 --- a/crates/librqbit/src/tests/test_util.rs +++ b/crates/librqbit/src/tests/test_util.rs @@ -134,6 +134,7 @@ async fn debug_server() -> anyhow::Result<()> { Ok(()) } +#[allow(dead_code)] pub fn spawn_debug_server() -> tokio::task::JoinHandle> { tokio::spawn(debug_server()) } diff --git a/crates/librqbit/src/upnp_server_adapter.rs b/crates/librqbit/src/upnp_server_adapter.rs index 1885a6e..b32e571 100644 --- a/crates/librqbit/src/upnp_server_adapter.rs +++ b/crates/librqbit/src/upnp_server_adapter.rs @@ -430,6 +430,7 @@ mod tests { attr: None, sha1: None, symlink_path: None, + private: false, }, comment: None, created_by: None, diff --git a/crates/librqbit_core/src/torrent_metainfo.rs b/crates/librqbit_core/src/torrent_metainfo.rs index 80db56a..024635a 100644 --- a/crates/librqbit_core/src/torrent_metainfo.rs +++ b/crates/librqbit_core/src/torrent_metainfo.rs @@ -50,6 +50,10 @@ pub fn torrent_from_bytes<'de, BufType: Deserialize<'de> + From<&'de [u8]>>( torrent_from_bytes_ext(buf).map(|r| r.meta) } +fn is_false(b: &bool) -> bool { + !*b +} + /// A parsed .torrent file. #[derive(Serialize, Deserialize, Debug, Clone)] pub struct TorrentMetaV1 { @@ -117,6 +121,9 @@ pub struct TorrentMetaV1Info { // Multi-file mode #[serde(skip_serializing_if = "Option::is_none")] pub files: Option>>, + + #[serde(skip_serializing_if = "is_false", default)] + pub private: bool, } #[derive(Clone, Copy)] @@ -377,6 +384,7 @@ where attr: self.attr.clone_to_owned(within_buffer), sha1: self.sha1.clone_to_owned(within_buffer), symlink_path: self.symlink_path.clone_to_owned(within_buffer), + private: self.private, } } }