From d86f21720fc20d4075d55ced86aedd7e4443df7f Mon Sep 17 00:00:00 2001 From: Jonas Wunderlich Date: Fri, 22 Nov 2024 20:26:05 +0100 Subject: [PATCH] fix(account_config): check if path is absolute and canonicalize --- edu-sync/src/config.rs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/edu-sync/src/config.rs b/edu-sync/src/config.rs index 19214fc..447500c 100644 --- a/edu-sync/src/config.rs +++ b/edu-sync/src/config.rs @@ -14,7 +14,7 @@ use edu_ws::{ ws, }; use reqwest::Url; -use serde::{Deserialize, Serialize}; +use serde::{Deserialize, Deserializer, Serialize}; use serde_with::{serde_as, serde_conv, DisplayFromStr}; use thiserror::Error; use tokio::{ @@ -115,6 +115,22 @@ pub fn check_dir(path: &PathBuf) -> Result { std::fs::canonicalize(expanded_path) } +// Custom deserializer function to check if the path is absolute and to +// canonicalize the path +fn deserialize_absolute_path<'de, D>(deserializer: D) -> Result +where + D: Deserializer<'de>, +{ + let path_str = String::deserialize(deserializer)?; + let path = PathBuf::from(path_str); + + if !path.is_absolute() { + return Err(serde::de::Error::custom("Path must be absolute")); + } + + check_dir(&path).map_err(|io_err| serde::de::Error::custom(format!("{io_err}"))) +} + #[derive(Serialize, Deserialize, Debug)] #[serde(rename_all = "kebab-case")] pub struct AccountConfig { @@ -123,6 +139,7 @@ pub struct AccountConfig { #[serde(flatten)] pub id: Id, pub token: Token, + #[serde(deserialize_with = "deserialize_absolute_path")] pub path: PathBuf, #[serde(default)] pub courses: CourseConfigs,