Merge pull request #1171 from sozu-proxy/fix_state_save_path

fix: Resolve path when saving state

Author: FlorentinDUBOIS

bin/src/command/requests.rs

@@ -3,6 +3,7 @@ use std::{
     env,
     fs::File,
     io::{ErrorKind, Read},
+    path::PathBuf,
 };
 
 use mio::Token;
@@ -198,18 +199,35 @@ fn list_listeners(server: &mut Server, client: &mut ClientSession) {
 }
 
 fn save_state(server: &mut Server, client: &mut ClientSession, path: &str) {
-    debug!("saving state to file {}", path);
-    let mut file = match File::create(path) {
+    let mut path = PathBuf::from(path);
+    if path.is_relative() {
+        match std::env::current_dir() {
+            Ok(cwd) => path = cwd.join(path),
+            Err(error) => {
+                client.finish_failure(format!("Cannot get Sōzu working directory: {error}",));
+                return;
+            }
+        }
+    }
+
+    debug!("saving state to file {}", &path.display());
+    let mut file = match File::create(&path) {
         Ok(file) => file,
         Err(error) => {
-            client.finish_failure(format!("Cannot create file at path {path}: {error}"));
+            client.finish_failure(format!(
+                "Cannot create file at path {}: {error}",
+                path.display()
+            ));
             return;
         }
     };
 
     match server.state.write_requests_to_file(&mut file) {
         Ok(counter) => {
-            client.finish_ok(format!("Saved {counter} config messages to {path}"));
+            client.finish_ok(format!(
+                "Saved {counter} config messages to {}",
+                &path.display()
+            ));
         }
         Err(error) => {
             client.finish_failure(format!("Failed writing state to file: {error}"));

bin/src/ctl/mod.rs

@@ -55,6 +55,8 @@ pub enum CtlError {
     WrongResponse(Response),
     #[error("could not setup the logger: {0}")]
     SetupLogging(LogError),
+    #[error("could not resolve path for {0} : {1}")]
+    ResolvePath(String, std::io::Error),
 }
 
 pub struct CommandManager {

bin/src/ctl/request_builder.rs

@@ -30,7 +30,13 @@ impl CommandManager {
     pub fn save_state(&mut self, path: String) -> Result<(), CtlError> {
         debug!("Saving the state to file {}", path);
 
-        self.send_request(RequestType::SaveState(path).into())
+        let current_directory =
+            std::env::current_dir().map_err(|err| CtlError::ResolvePath(path.to_owned(), err))?;
+
+        let absolute_path = current_directory.join(&path);
+        self.send_request(
+            RequestType::SaveState(String::from(absolute_path.to_string_lossy())).into(),
+        )
     }
 
     pub fn load_state(&mut self, path: String) -> Result<(), CtlError> {