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

Password from option

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-01 11:35:26 +01:00
parent 39334f6451
commit 968678503f
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main.rs
View File

@@ -60,12 +60,17 @@ fn main() {
let mut address: Option<String> = None; // None let mut address: Option<String> = None; // None
let mut port: u16 = 22; // Default port let mut port: u16 = 22; // Default port
let mut username: Option<String> = None; // Default username let mut username: Option<String> = None; // Default username
let password: Option<String>; // Default password let mut password: Option<String> = None; // Default password
let mut protocol: FileTransferProtocol = FileTransferProtocol::Sftp; // Default protocol let mut protocol: FileTransferProtocol = FileTransferProtocol::Sftp; // Default protocol
let mut ticks: Duration = Duration::from_millis(10); let mut ticks: Duration = Duration::from_millis(10);
//Process options //Process options
// FIXME: there is no way to provide password from CLI atm
let mut opts = Options::new(); let mut opts = Options::new();
opts.optopt(
"P",
"password",
"Provide password from CLI (use at your own risk)",
"<password>",
);
opts.optopt("T", "ticks", "Set UI ticks; default 10ms", "<ms>"); opts.optopt("T", "ticks", "Set UI ticks; default 10ms", "<ms>");
opts.optflag("v", "version", ""); opts.optflag("v", "version", "");
opts.optflag("h", "help", "Print this menu"); opts.optflag("h", "help", "Print this menu");
@@ -89,6 +94,10 @@ fn main() {
); );
std::process::exit(255); std::process::exit(255);
} }
// Match password
if let Some(passwd) = matches.opt_str("P") {
password = Some(String::from(passwd));
}
// Match ticks // Match ticks
if let Some(val) = matches.opt_str("T") { if let Some(val) = matches.opt_str("T") {
match val.parse::<usize>() { match val.parse::<usize>() {
@@ -135,20 +144,22 @@ fn main() {
// Initialize client if necessary // Initialize client if necessary
let mut start_activity: NextActivity = NextActivity::Authentication; let mut start_activity: NextActivity = NextActivity::Authentication;
if let Some(address) = address { if let Some(address) = address {
// Ask password if password.is_none() {
password = match rpassword::read_password_from_tty(Some("Password: ")) { // Ask password if unspecified
Ok(p) => { password = match rpassword::read_password_from_tty(Some("Password: ")) {
if p.len() > 0 { Ok(p) => {
Some(p) if p.len() > 0 {
} else { Some(p)
None } else {
None
}
} }
} Err(_) => {
Err(_) => { eprintln!("Could not read password from prompt");
eprintln!("Could not read password from prompt"); std::process::exit(255);
std::process::exit(255); }
} };
}; }
// In this case the first activity will be FileTransfer // In this case the first activity will be FileTransfer
start_activity = NextActivity::FileTransfer; start_activity = NextActivity::FileTransfer;
manager.set_filetransfer_params(address, port, protocol, username, password); manager.set_filetransfer_params(address, port, protocol, username, password);