pub struct HttpClientOptions {
prefix: Option<String>,
password: Option<String>,
+ password_env: Option<String>,
fingerprint: Option<String>,
interactive: bool,
ticket_cache: bool,
Self {
prefix: None,
password: None,
+ password_env: None,
fingerprint: None,
interactive: false,
ticket_cache: false,
self
}
+ pub fn password_env(mut self, password_env: Option<String>) -> Self {
+ self.password_env = password_env;
+ self
+ }
+
pub fn fingerprint(mut self, fingerprint: Option<String>) -> Self {
self.fingerprint = fingerprint;
self
if let Some((ticket, _token)) = ticket_info {
ticket
} else {
- Self::get_password(&username, options.interactive)?
+ Self::get_password(&username, options.interactive, options.password_env.clone())?
}
};
(*self.fingerprint.lock().unwrap()).clone()
}
- fn get_password(_username: &str, interactive: bool) -> Result<String, Error> {
- use std::env::VarError::*;
- match std::env::var("PBS_PASSWORD") {
- Ok(p) => return Ok(p),
- Err(NotUnicode(_)) => bail!("PBS_PASSWORD contains bad characters"),
- Err(NotPresent) => {
- // Try another method
+ fn get_password(username: &str, interactive: bool, password_env: Option<String>) -> Result<String, Error> {
+ if let Some(password_env) = password_env {
+ use std::env::VarError::*;
+ match std::env::var(&password_env) {
+ Ok(p) => return Ok(p),
+ Err(NotUnicode(_)) => bail!(format!("{} contains bad characters", password_env)),
+ Err(NotPresent) => {
+ // Try another method
+ }
}
}
// If we're on a TTY, query the user for a password
if interactive && tty::stdin_isatty() {
- return Ok(String::from_utf8(tty::read_password("Password: ")?)?);
+ let msg = format!("Password for \"{}\": ", username);
+ return Ok(String::from_utf8(tty::read_password(&msg)?)?);
}
bail!("no password input mechanism available");