fix ssh-cfg propagation to cfg file

bertiqwerty · Nov 12, 2024 · ec00d34 · ec00d34
1 parent 9a9b748
commit ec00d34
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/rvimage/src/rvlib/control/mod.rs b/rvimage/src/rvlib/control/mod.rs
@@ -512,10 +512,10 @@ impl Control {
         let file_path =
             file_selected_idx.and_then(|fsidx| self.paths_navigator.file_path(fsidx).cloned());
         let open_folder = self.opened_folder().cloned();
-        let ssh_cfg = self.cfg_of_opened_folder().map(|cfg| cfg.ssh_cfg());
-        let connection_data = match &ssh_cfg {
-            Some(ssh_cfg) => ConnectionData::Ssh(ssh_cfg.clone()),
-            None => ConnectionData::None,
+        let connection_data = if self.reader.is_some() {
+            ConnectionData::Ssh(self.cfg.ssh_cfg())
+        } else {
+            ConnectionData::None
         };
         let export_folder = self
             .cfg_of_opened_folder()
@@ -526,7 +526,7 @@ impl Control {
             file_path,
             file_selected_idx,
             connection_data,
-            ssh_cfg,
+            Some(self.cfg.ssh_cfg()),
             open_folder,
             export_folder,
             MetaDataFlags {

diff --git a/rvimage/src/rvlib/main_loop.rs b/rvimage/src/rvlib/main_loop.rs
@@ -183,6 +183,7 @@ impl MainEventLoop {
             &mut self.world.data.tools_data_map,
             find_active_tool(&self.tools),
         );
+        self.world.data.meta_data.ssh_cfg = Some(self.ctrl.cfg.ssh_cfg());
         if project_loaded {
             for t in &mut self.tools {
                 self.world = t.deactivate(mem::take(&mut self.world));

diff --git a/rvimage/src/rvlib/menu/cfg_menu.rs b/rvimage/src/rvlib/menu/cfg_menu.rs
@@ -82,6 +82,7 @@ fn settings_popup(ui: &mut Ui, cfg: &mut Cfg, are_tools_active: &mut bool) -> Cl
                     tracing::error!("could not open editor. {:?}", edit::get_editor());
                 }
                 if let Some(cfg_) = trace_ok_err(cfg::read_cfg_gen::<Cfg>(&tmppath)) {
+                    tracing::info!("config updated with new settings");
                     *cfg = cfg_;
                 }
                 if let Err(e) = cfg::write_cfg(cfg) {

diff --git a/rvimage/src/rvlib/ssh.rs b/rvimage/src/rvlib/ssh.rs
@@ -110,13 +110,12 @@ pub fn auth(ssh_cfg: &SshCfg) -> RvResult<Session> {
     let mut sess = Session::new().map_err(to_rv)?;
     sess.set_tcp_stream(tcp);
     sess.handshake().map_err(to_rv)?;
-    sess.userauth_pubkey_file(
-        &ssh_cfg.usr.user,
-        None,
-        Path::new(&ssh_cfg.usr.ssh_identity_file_path),
-        None,
-    )
-    .map_err(to_rv)?;
+    let keyfile = Path::new(&ssh_cfg.usr.ssh_identity_file_path);
+    if !keyfile.exists() {
+        return Err(rverr!("could not find private key file {keyfile:?}"));
+    }
+    sess.userauth_pubkey_file(&ssh_cfg.usr.user, None, keyfile, None)
+        .map_err(to_rv)?;
     assert!(sess.authenticated());
     Ok(sess)
 }
diff --git a/rvimage/src/rvlib/tools_data/coco_io.rs b/rvimage/src/rvlib/tools_data/coco_io.rs
@@ -649,6 +649,7 @@ pub fn read_coco(
         }
         ExportPathConnection::Ssh => {
             if let Some(ssh_cfg) = &meta_data.ssh_cfg {
+                tracing::info!("creating session based on {:?}", meta_data.ssh_cfg);
                 let sess = ssh::auth(ssh_cfg)?;
                 let read_bytes = ssh::download(path_to_str(&coco_file.path)?, &sess)?;
                 let s = String::from_utf8(read_bytes).map_err(to_rv)?;