mirror of
https://github.com/veeso/termscp.git
synced 2026-09-26 05:51:20 -07:00
fix: print actual reason for failed host params collecting
previously, we didn't show any reason for failed collecting of host params in the auth form, but just a generic message refs #441
This commit is contained in:
Generated
+156
-577
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -72,7 +72,7 @@ serde = { version = "1", features = ["derive"] }
|
|||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
shellexpand = "3"
|
shellexpand = "3"
|
||||||
simplelog = "0.12"
|
simplelog = "0.12"
|
||||||
ssh2-config = "0.7"
|
ssh2-config = "0.8"
|
||||||
tempfile = "3"
|
tempfile = "3"
|
||||||
thiserror = "2"
|
thiserror = "2"
|
||||||
tokio = { version = "1", features = ["rt"] }
|
tokio = { version = "1", features = ["rt"] }
|
||||||
|
|||||||
@@ -33,9 +33,6 @@ ignore = [
|
|||||||
{ id = "RUSTSEC-2026-0195", reason = "owner: termscp maintainers; review by 2026-12-31; upgrade remotefs-webdav/self_update to quick-xml >=0.41" },
|
{ id = "RUSTSEC-2026-0195", reason = "owner: termscp maintainers; review by 2026-12-31; upgrade remotefs-webdav/self_update to quick-xml >=0.41" },
|
||||||
# The SSH stack requires RSA, for which RustSec reports no safe upgrade.
|
# The SSH stack requires RSA, for which RustSec reports no safe upgrade.
|
||||||
{ id = "RUSTSEC-2023-0071", reason = "owner: termscp maintainers; review by 2026-12-31; replace RSA dependency when upstream fix exists" },
|
{ id = "RUSTSEC-2023-0071", reason = "owner: termscp maintainers; review by 2026-12-31; replace RSA dependency when upstream fix exists" },
|
||||||
# russh-keys retains an older russh-cryptovec line and cannot select the
|
|
||||||
# fixed 0.60.3 release without an upstream dependency update.
|
|
||||||
{ id = "RUSTSEC-2026-0153", reason = "owner: termscp maintainers; review by 2026-12-31; upgrade remotefs-ssh/russh-keys to russh-cryptovec >=0.60.3" },
|
|
||||||
# rustls-pemfile is retained by the WebDAV and Kubernetes clients. Both
|
# rustls-pemfile is retained by the WebDAV and Kubernetes clients. Both
|
||||||
# versions are unmaintained but have no reported vulnerability.
|
# versions are unmaintained but have no reported vulnerability.
|
||||||
{ id = "RUSTSEC-2025-0134", reason = "owner: termscp maintainers; review by 2026-12-31; upgrade WebDAV/Kubernetes clients away from rustls-pemfile" },
|
{ id = "RUSTSEC-2025-0134", reason = "owner: termscp maintainers; review by 2026-12-31; upgrade WebDAV/Kubernetes clients away from rustls-pemfile" },
|
||||||
|
|||||||
@@ -24,19 +24,24 @@ impl AuthActivity {
|
|||||||
fn update_form(&mut self, msg: FormMsg) -> Option<Msg> {
|
fn update_form(&mut self, msg: FormMsg) -> Option<Msg> {
|
||||||
match msg {
|
match msg {
|
||||||
FormMsg::Connect => {
|
FormMsg::Connect => {
|
||||||
let Ok(remote_params) = self.collect_remote_host_params() else {
|
let remote_params = match self.collect_remote_host_params() {
|
||||||
|
Ok(remote_params) => remote_params,
|
||||||
|
Err(err) => {
|
||||||
// mount error
|
// mount error
|
||||||
self.mount_error("Invalid remote params parameters");
|
self.mount_error(format!("Invalid remote host parameters: {err}"));
|
||||||
return None;
|
return None;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let Ok(host_bridge_params) = self.collect_host_bridge_params() else {
|
|
||||||
// mount error
|
|
||||||
self.mount_error("Invalid host bridge params parameters");
|
|
||||||
return None;
|
|
||||||
};
|
|
||||||
|
|
||||||
debug!("Remote params: {:?}", remote_params);
|
debug!("Remote params: {:?}", remote_params);
|
||||||
|
|
||||||
|
let host_bridge_params = match self.collect_host_bridge_params() {
|
||||||
|
Ok(host_bridge_params) => host_bridge_params,
|
||||||
|
Err(err) => {
|
||||||
|
// mount error
|
||||||
|
self.mount_error(format!("Invalid host bridge parameters: {err}"));
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
};
|
||||||
debug!("Host bridge params: {:?}", host_bridge_params);
|
debug!("Host bridge params: {:?}", host_bridge_params);
|
||||||
|
|
||||||
self.save_recent();
|
self.save_recent();
|
||||||
|
|||||||
Reference in New Issue
Block a user