mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2025-12-18 21:57:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server/lib: can now have custom-files which clients can access if they know the path.

Browse Source
This commit is contained in:
Mark
2023-10-26 16:35:58 +02:00
parent f61f52fdc7
commit 273eac4b43
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
musicdb-lib/src/server/get.rs
View File

@@ -1,6 +1,8 @@
use std::{
fs,
io::BufRead,
io::{BufReader, Read, Write},
path::Path,
sync::{Arc, Mutex},
};
@@ -118,16 +120,24 @@ pub fn handle_one_connection_as_get(
writeln!(connection.get_mut(), "no data")?;
}
}
"song-file-blocking" => {
if let Some(bytes) =
request
.next()
.and_then(|id| id.parse().ok())
.and_then(|id| {
let db = db.lock().unwrap();
db.get_song(&id).and_then(|song| song.cached_data_now(&db))
})
{
"custom-file" => {
if let Some(bytes) = request.next().and_then(|path| {
let db = db.lock().unwrap();
let mut parent = match &db.custom_files {
None => None,
Some(None) => Some(db.lib_directory.clone()),
Some(Some(p)) => Some(p.clone()),
};
// check for malicious paths
if Path::new(path).is_absolute() {
parent = None;
}
if let Some(parent) = parent {
fs::read(parent.join(path)).ok()
} else {
None
}
}) {
writeln!(connection.get_mut(), "len: {}", bytes.len())?;
connection.get_mut().write_all(&bytes)?;
} else {