fix mtls

aschey · Nov 26, 2024 · 285a154 · 285a154
1 parent 79523ec
commit 285a154
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 102 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libplatune/player/Cargo.toml b/libplatune/player/Cargo.toml
@@ -28,7 +28,13 @@ tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1"
 decal = { git = "https://github.com/aschey/decal", rev = "15d1d4fa5aae327c50b9e3cb22ab1b4fd84492ae" }
 reqwest-retry = "0.7.0"
-reqwest = { version = "0.12", features = ["rustls-tls-native-roots"] }
+# The default-tls feature seems to break mtls client auth in some cases
+reqwest = { version = "0.12", default-features = false, features = [
+  "charset",
+  "http2",
+  "macos-system-configuration",
+  "rustls-tls-native-roots",
+] }
 reqwest-middleware = "0.4.0"
 async-trait = "0.1"
 youtube_dl = { git = "https://github.com/aschey/youtube-dl-rs", rev = "2a2533633ad2d6d718baf63e25b9b7d7c2a053d1", features = [

diff --git a/libplatune/player/src/player.rs b/libplatune/player/src/player.rs
@@ -82,7 +82,12 @@ impl Player {
     }
 
     async fn get_source(&mut self, input: Input) -> Option<Box<dyn Source>> {
-        let (reader, cancellation_token) = self.source_resolver.find_match(input).await?.ok()?;
+        let (reader, cancellation_token) = self
+            .source_resolver
+            .find_match(input)
+            .await?
+            .tap_err(|e| error!("error resolving source: {e:?}"))
+            .ok()?;
         self.stream_cancellation_tokens
             .push_back(cancellation_token);
         Some(reader)

diff --git a/libplatune/player/src/resolver/yt_dlp.rs b/libplatune/player/src/resolver/yt_dlp.rs
@@ -93,7 +93,7 @@ impl RegistryEntry<Result<Vec<Input>>> for YtDlpUrlResolver {
                 Ok(vec![input])
             }
             YoutubeDlOutput::Playlist(playlist) => {
-                info!("found playlist: {:?}", playlist);
+                info!("found playlist: {:?}", playlist.title);
                 Ok(playlist
                     .entries
                     .unwrap_or_default()