vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refuse empty ssh key

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-25 18:22:12 +01:00
parent 9e66207bf7
commit 2e4ff78124
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/activities/setup_activity/callbacks.rs
View File

@@ -102,12 +102,17 @@ impl SetupActivity {
if let Some(cli) = self.config_cli.as_ref() { if let Some(cli) = self.config_cli.as_ref() {
// Prepare text editor // Prepare text editor
env::set_var("EDITOR", cli.get_text_editor()); env::set_var("EDITOR", cli.get_text_editor());
let placeholder: String = format!("# Type private SSH key for {}@{}", username, host); let placeholder: String = format!("# Type private SSH key for {}@{}\n", username, host);
// Write key to file // Write key to file
match edit::edit(placeholder.as_bytes()) { match edit::edit(placeholder.as_bytes()) {
Ok(rsa_key) => { Ok(rsa_key) => {
// Remove placeholder from `rsa_key` // Remove placeholder from `rsa_key`
let rsa_key: String = rsa_key.as_str().replace(placeholder.as_str(), ""); let rsa_key: String = rsa_key.as_str().replace(placeholder.as_str(), "");
if rsa_key.is_empty() {
// Report error: empty key
self.popup = Some(Popup::Alert(Color::Red, format!("SSH Key is empty")));
return;
}
// Add key // Add key
if let Err(err) = if let Err(err) =
self.add_ssh_key(host.as_str(), username.as_str(), rsa_key.as_str()) self.add_ssh_key(host.as_str(), username.as_str(), rsa_key.as_str())