Make the /resolve_magnet HTTP endpoint return an actual torrent file, not info
This commit is contained in:
parent
cd0f38f0fb
commit
d54b67d2dc
6 changed files with 132 additions and 23 deletions
|
|
@ -1,4 +1,5 @@
|
|||
mod bencode_value;
|
||||
pub mod raw_value;
|
||||
mod serde_bencode_de;
|
||||
mod serde_bencode_ser;
|
||||
|
||||
|
|
|
|||
28
crates/bencode/src/raw_value.rs
Normal file
28
crates/bencode/src/raw_value.rs
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
use serde::Serialize;
|
||||
|
||||
pub struct RawValue<T>(pub T);
|
||||
|
||||
pub(crate) const TAG: &str = "::librqbit_bencode::RawValue";
|
||||
|
||||
impl<T> Serialize for RawValue<T>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: serde::Serializer,
|
||||
{
|
||||
struct Wrapper<'a>(&'a [u8]);
|
||||
|
||||
impl<'a> Serialize for Wrapper<'a> {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: serde::Serializer,
|
||||
{
|
||||
serializer.serialize_bytes(self.0)
|
||||
}
|
||||
}
|
||||
|
||||
serializer.serialize_newtype_struct(TAG, &Wrapper(self.0.as_ref()))
|
||||
}
|
||||
}
|
||||
|
|
@ -10,6 +10,7 @@ pub struct BencodeDeserializer<'de> {
|
|||
// This is a f**ing hack
|
||||
pub is_torrent_info: bool,
|
||||
pub torrent_info_digest: Option<[u8; 20]>,
|
||||
pub torrent_info_bytes: Option<&'de [u8]>,
|
||||
}
|
||||
|
||||
impl<'de> BencodeDeserializer<'de> {
|
||||
|
|
@ -20,6 +21,7 @@ impl<'de> BencodeDeserializer<'de> {
|
|||
parsing_key: false,
|
||||
is_torrent_info: false,
|
||||
torrent_info_digest: None,
|
||||
torrent_info_bytes: None,
|
||||
}
|
||||
}
|
||||
pub fn into_remaining(self) -> &'de [u8] {
|
||||
|
|
@ -542,9 +544,11 @@ impl<'a, 'de> serde::de::MapAccess<'de> for MapAccess<'a, 'de> {
|
|||
if self.de.is_torrent_info && self.de.field_context.as_slice() == [ByteBuf(b"info")] {
|
||||
let len = self.de.buf.as_ptr() as usize - buf_before.as_ptr() as usize;
|
||||
let mut hash = Sha1::new();
|
||||
hash.update(&buf_before[..len]);
|
||||
let torrent_info_bytes = &buf_before[..len];
|
||||
hash.update(torrent_info_bytes);
|
||||
let digest = hash.finish();
|
||||
self.de.torrent_info_digest = Some(digest)
|
||||
self.de.torrent_info_digest = Some(digest);
|
||||
self.de.torrent_info_bytes = Some(torrent_info_bytes);
|
||||
}
|
||||
self.de.field_context.pop();
|
||||
Ok(value)
|
||||
|
|
|
|||
|
|
@ -328,12 +328,18 @@ impl<'ser, W: std::io::Write> Serializer for &'ser mut BencodeSerializer<W> {
|
|||
|
||||
fn serialize_newtype_struct<T>(
|
||||
self,
|
||||
_name: &'static str,
|
||||
_value: &T,
|
||||
name: &'static str,
|
||||
value: &T,
|
||||
) -> Result<Self::Ok, Self::Error>
|
||||
where
|
||||
T: ?Sized + serde::Serialize,
|
||||
{
|
||||
if name == crate::raw_value::TAG {
|
||||
self.hack_no_bytestring_prefix = true;
|
||||
value.serialize(&mut *self)?;
|
||||
self.hack_no_bytestring_prefix = false;
|
||||
return Ok(());
|
||||
}
|
||||
Err(SerError::custom_with_ser(
|
||||
"bencode doesn't support newtype structs",
|
||||
self,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue