support mtls

Author: aschey

.github/workflows/test.yml

@@ -2,8 +2,8 @@ on: [push]
 
 name: CI
 env:
-  BINSTALL_VERSION: 1.1.2
-  PROTOC_VERSION: 23.4
+  BINSTALL_VERSION: 1.6.4
+  PROTOC_VERSION: 26.1
 
 jobs:
   rust:

Cargo.lock

@@ -38,7 +38,7 @@ sqlx = { version = "0.7", default-features = false, features = [
     "macros",
     "runtime-tokio",
 ] }
-daemon-slayer = { git = "https://github.com/aschey/daemon-slayer", rev = "23659b534dbb46eb4d9b7d251037a9a67a6ce50e", features = [
+daemon-slayer = { git = "https://github.com/aschey/daemon-slayer", rev = "4a26cca8ae2599596dabdd626409c960b7423b8f", features = [
     "native-notification",
 ] }
 strum = { version = "0.26", features = ["derive"] }

libplatune/management/Cargo.toml

@@ -34,7 +34,7 @@ where
     P: AsRef<Path>,
 {
     let file_path = file_path.as_ref();
-    if file_path.starts_with("http://") {
+    if file_path.starts_with("http://") || file_path.starts_with("https://") {
         // No need to normalize http urls
         return Ok(file_path.to_string_lossy().to_string());
     }

libplatune/management/src/path_util.rs

@@ -211,7 +211,7 @@ impl SearchEngine {
             .await?;
 
         for r in &mut search_entries {
-            r.weights = weights.clone();
+            r.weights.clone_from(&weights)
         }
         search_entries.extend(rest);
         let search_entries = search_entries

libplatune/management/src/search/search_engine.rs

@@ -31,7 +31,7 @@ impl futures::Stream for ProgressStream {
                 None => Poll::Ready(None),
                 Some(progress_val_result) => match progress_val_result {
                     Ok(progress_val) => {
-                        self.last_val = progress_val.clone();
+                        self.last_val.clone_from(&progress_val);
                         Poll::Ready(progress_val)
                     }
                     Err(BroadcastStreamRecvError::Lagged(_)) => Poll::Ready(self.last_val.clone()),

libplatune/management/src/sync/progress_stream.rs

@@ -30,7 +30,7 @@ impl From<TaggedFile> for Tag {
                 let artists = tag.get_strings(&ItemKey::TrackArtist).join("/");
                 let mut album_artists = tag.get_strings(&ItemKey::AlbumArtist).join("/");
                 if album_artists.is_empty() {
-                    album_artists = artists.clone();
+                    album_artists.clone_from(&artists);
                 }
                 Tag {
                     title: tag.title().unwrap_or_default().into_owned(),

libplatune/management/src/sync/tag.rs

@@ -1,8 +1,9 @@
 use std::num::NonZeroUsize;
+use std::{env, fs};
 
 use decal::decoder::{ReadSeekSource, Source};
 use eyre::{Context, Result};
-use stream_download::http::reqwest::Client;
+use stream_download::http::reqwest::{Client, Identity};
 use stream_download::http::HttpStream;
 use stream_download::source::SourceStream;
 use stream_download::storage::adaptive::AdaptiveStorageProvider;
@@ -19,7 +20,18 @@ pub(crate) struct HttpStreamReader {
 
 impl HttpStreamReader {
     pub async fn new(url: String) -> Result<Self> {
-        let stream = HttpStream::<Client>::create(url.parse()?)
+        let mut client_builder = Client::builder();
+        if url.starts_with("https://") {
+            let mtls_cert = env::var("PLATUNE_MTLS_CLIENT_CERT_PATH");
+            let mtls_key = env::var("PLATUNE_MTLS_CLIENT_KEY_PATH");
+            if let (Ok(mtls_cert), Ok(mtls_key)) = (mtls_cert, mtls_key) {
+                let mut cert = fs::read(mtls_cert).wrap_err_with(|| "mtls cert path invalid")?;
+                let mut key = fs::read(mtls_key).wrap_err_with(|| "mtls key path invalid")?;
+                cert.append(&mut key);
+                client_builder = client_builder.identity(Identity::from_pem(&cert)?);
+            }
+        }
+        let stream = HttpStream::new(client_builder.build()?, url.parse()?)
             .await
             .wrap_err_with(|| "Error creating http stream")?;
         let file_len = stream.content_length();

libplatune/player/src/http_stream_reader.rs

@@ -67,7 +67,7 @@ impl Player {
     }
 
     async fn get_source(&self, path: String) -> Option<Box<dyn Source>> {
-        if path.starts_with("http") {
+        if path.starts_with("http://") || path.starts_with("https://") {
             info!("Creating http stream");
 
             HttpStreamReader::new(path.to_owned())

libplatune/player/src/player.rs

@@ -12,8 +12,10 @@ import (
 	"github.com/nathan-fiscaletti/consolesize-go"
 )
 
-const selectAll = "(Select All)"
-const back = "(Back)"
+const (
+	selectAll = "(Select All)"
+	back      = "(Back)"
+)
 
 var filePathCompleter = internal.FilePathCompleter{
 	IgnoreCase: true,
@@ -73,7 +75,8 @@ func (state *cmdState) completerMode(in prompt.Document, returnChan chan []promp
 			suggestions = append(suggestions, prompt.Suggest{
 				Text:           r.Song,
 				CompletionText: completionText,
-				Metadata:       r})
+				Metadata:       r,
+			})
 		}
 		returnChan <- prompt.FilterHasPrefix(suggestions, in.CurrentLineBeforeCursor(), true)
 	}
@@ -93,7 +96,7 @@ func (state *cmdState) completerCmd(in prompt.Document, before []string, returnC
 	}
 }
 
-func (state *cmdState) updateMaxWidths(in prompt.Document, titleRatio float32) {
+func (state *cmdState) updateMaxWidths(titleRatio float32) {
 	size, _ := consolesize.GetConsoleSize()
 	base := float32(size)
 
@@ -132,7 +135,7 @@ func (state *cmdState) completerDefault(in prompt.Document, returnChan chan []pr
 }
 
 func (state *cmdState) dbCompleter(in prompt.Document, rest string, filePathSkipFirst bool, returnChan chan []prompt.Suggest) []prompt.Suggest {
-	state.updateMaxWidths(in, 1./3)
+	state.updateMaxWidths(1. / 3)
 
 	suggestions := filePathCompleter.Complete(in, filePathSkipFirst)
 	if len(suggestions) > 0 && strings.ContainsAny(rest, "/\\") {

platune-cli/cmd/completer.go

@@ -193,6 +193,7 @@ func (state *cmdState) executeEntryType(selected *prompt.Suggest, defaultMode mo
 			state.currentQueue = append(state.currentQueue, lookupResult.Entries...)
 		}
 	} else {
+		state.mode.Set(defaultMode)
 		path := selected.Metadata.(string)
 		state.currentQueue = append(state.currentQueue, &platune.LookupEntry{Path: path})
 	}