Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Secret paths shoudn't be hardcoded since vault supports mounting #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Secret paths shoudn't be hardcoded since vault supports mounting #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5218f1
Improved tests for env variables
Sep 29, 2016
6100fb4
Removed hardcoded prefixes
Sep 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ struct RenewOptions {
/// use hashicorp_vault::client::{TokenOptions, VaultDuration};
///
/// let _ = TokenOptions::default()
/// .id("test12345")
/// .id("some_token")
/// .policies(vec!("root"))
/// .default_policy(false)
/// .orphan(true)
Expand Down Expand Up @@ -457,10 +457,10 @@ impl<'a, T> VaultClient<'a, T>
/// # use vault::Client;
/// # fn main() {
/// let host = "http://127.0.0.1:8200";
/// let token = "test12345";
/// let token = "token12345";
/// let client = Client::new(host, token).unwrap();
///
/// let token_to_renew = "test12345";
/// let token_to_renew = "fresh_token";
/// client.renew_token(token_to_renew, None).unwrap();
/// # }
/// ```
Expand All @@ -481,9 +481,10 @@ impl<'a, T> VaultClient<'a, T>
/// ```
/// # extern crate hashicorp_vault as vault;
/// # use vault::{client, Client};
/// # use std::env;
/// # fn main() {
/// let host = "http://127.0.0.1:8200";
/// let token = "test12345";
/// let token = &env::var("VAULT_TOKEN").unwrap(); // We need root token here
/// let client = Client::new(host, token).unwrap();
///
/// // Create a temporary token, and use it to create a new client.
Expand Down Expand Up @@ -564,10 +565,11 @@ impl<'a, T> VaultClient<'a, T>
/// ```
/// # extern crate hashicorp_vault as vault;
/// # use vault::{client, Client};
/// # use std::env;
/// # fn main() {
/// let host = "http://127.0.0.1:8200";
/// let token = "test12345";
/// let client = Client::new(host, token).unwrap();
/// let token = env::var("VAULT_TOKEN").unwrap(); // Must be root token, so we take it from env
/// let client = Client::new(host, &token).unwrap();
///
/// let opts = client::TokenOptions::default()
/// .display_name("test_token")
Expand Down Expand Up @@ -604,12 +606,12 @@ impl<'a, T> VaultClient<'a, T>
/// let host = "http://127.0.0.1:8200";
/// let token = "test12345";
/// let client = Client::new(host, token).unwrap();
/// let res = client.set_secret("hello_set", "world");
/// let res = client.set_secret("secret/hello_set", "world");
/// assert!(res.is_ok());
/// # }
/// ```
pub fn set_secret(&self, key: &str, value: &str) -> Result<()> {
let _ = try!(self.post(&format!("/v1/secret/{}", key)[..],
let _ = try!(self.post(&format!("/v1/{}", key)[..],
Some(&format!("{{\"value\": \"{}\"}}", self.escape(value))[..])));
Ok(())
}
Expand All @@ -628,15 +630,15 @@ impl<'a, T> VaultClient<'a, T>
/// let host = "http://127.0.0.1:8200";
/// let token = "test12345";
/// let client = Client::new(host, token).unwrap();
/// let res = client.set_secret("hello_get", "world");
/// let res = client.set_secret("secret/hello_get", "world");
/// assert!(res.is_ok());
/// let res = client.get_secret("hello_get");
/// let res = client.get_secret("secret/hello_get");
/// assert!(res.is_ok());
/// assert_eq!(res.unwrap(), "world");
/// # }
/// ```
pub fn get_secret(&self, key: &str) -> Result<String> {
let mut res = try!(self.get(&format!("/v1/secret/{}", key)[..], None));
let mut res = try!(self.get(&format!("/v1/{}", key)[..], None));
let decoded: VaultResponse<SecretData> = try!(parse_vault_response(&mut res));
match decoded.data {
Some(data) => Ok(data.value),
Expand All @@ -647,7 +649,7 @@ impl<'a, T> VaultClient<'a, T>
/// Fetch a wrapped secret. Token (one-time use) to fetch secret will be in `wrap_info.token`
/// https://www.vaultproject.io/docs/secrets/cubbyhole/index.html
pub fn get_secret_wrapped(&self, key: &str, wrap_ttl: &str) -> Result<VaultResponse<()>> {
let mut res = try!(self.get(&format!("/v1/secret/{}", key)[..], Some(wrap_ttl)));
let mut res = try!(self.get(&format!("/v1/{}", key)[..], Some(wrap_ttl)));
Ok(try!(parse_vault_response(&mut res)))
}

Expand All @@ -670,21 +672,21 @@ impl<'a, T> VaultClient<'a, T>
/// let host = "http://127.0.0.1:8200";
/// let token = "test12345";
/// let client = Client::new(host, token).unwrap();
/// let res = client.set_secret("hello_delete", "world");
/// let res = client.set_secret("secret/hello_delete", "world");
/// assert!(res.is_ok());
/// let res = client.delete_secret("hello_delete");
/// let res = client.delete_secret("secret/hello_delete");
/// assert!(res.is_ok());
/// # }
/// ```
pub fn delete_secret(&self, key: &str) -> Result<()> {
let _ = try!(self.delete(&format!("/v1/secret/{}", key)[..]));
let _ = try!(self.delete(&format!("/v1/{}", key)[..]));
Ok(())
}

/// Get postgresql secret backend
/// https://www.vaultproject.io/docs/secrets/postgresql/index.html
pub fn get_postgresql_backend(&self, name: &str) -> Result<VaultResponse<PostgresqlLogin>> {
let mut res = try!(self.get(&format!("/v1/postgresql/creds/{}", name)[..], None));
let mut res = try!(self.get(&format!("/v1/{}", name)[..], None));
let decoded: VaultResponse<PostgresqlLogin> = try!(parse_vault_response(&mut res));
Ok(decoded)
}
Expand Down
52 changes: 29 additions & 23 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,58 +33,64 @@ pub use client::error::Error;
#[cfg(test)]
mod tests {
use client::VaultClient as Client;
use std::env;

#[test]
fn it_can_create_a_client() {
let host = "http://127.0.0.1:8200";
let token = "test12345";
let _ = Client::new(host, token).unwrap();
let host = env::var("VAULT_ADDR").unwrap_or("http://127.0.0.1:8200".to_string());
let token = env::var("VAULT_TOKEN").unwrap_or("test12345".to_string());
let _ = Client::new(&host, &token).unwrap();
}


#[test]
fn it_can_query_secrets() {
let host = "http://127.0.0.1:8200";
let token = "test12345";
let client = Client::new(host, token).unwrap();
let res = client.set_secret("hello_query", "world");
let host = env::var("VAULT_ADDR").unwrap_or("http://127.0.0.1:8200".to_string());
let token = env::var("VAULT_TOKEN").unwrap_or("test12345".to_string());

let client = Client::new(&host, &token).unwrap();
let res = client.set_secret("secret/hello_query", "world");
assert!(res.is_ok());
let res = client.get_secret("hello_query").unwrap();
let res = client.get_secret("secret/hello_query").unwrap();
assert_eq!(res, "world");
}

#[test]
fn it_can_write_secrets_with_newline() {
let host = "http://127.0.0.1:8200";
let token = "test12345";
let client = Client::new(host, token).unwrap();
let host = env::var("VAULT_ADDR").unwrap_or("http://127.0.0.1:8200".to_string());
let token = env::var("VAULT_TOKEN").unwrap_or("test12345".to_string());

let res = client.set_secret("hello_set", "world\n");
let client = Client::new(&host, &token).unwrap();
let res = client.set_secret("secret/hello_set", "world\n");
assert!(res.is_ok());
let res = client.get_secret("hello_set").unwrap();
let res = client.get_secret("secret/hello_set").unwrap();
assert_eq!(res, "world\n");
}

#[test]
fn it_returns_err_on_forbidden() {
let host = "http://127.0.0.1:8200";
let token = "test123456";
let client = Client::new(host, token);
let host = env::var("VAULT_ADDR").unwrap_or("http://127.0.0.1:8200".to_string());
let token = "I'ma bad guy";
let client = Client::new(&host, token);

// assert_eq!(Err("Forbidden".to_string()), client);
assert!(client.is_err());
}

#[test]
fn it_can_delete_a_secret() {
let host = "http://127.0.0.1:8200";
let token = "test12345";
let client = Client::new(host, token).unwrap();

let res = client.set_secret("hello_delete", "world");
let host = env::var("VAULT_ADDR").unwrap_or("http://127.0.0.1:8200".to_string());
let token = env::var("VAULT_TOKEN").unwrap_or("test12345".to_string());
let client = Client::new(&host, &token).unwrap();

let res = client.set_secret("secret/hello_delete", "world");
assert!(res.is_ok());
let res = client.get_secret("hello_delete").unwrap();
let res = client.get_secret("secret/hello_delete").unwrap();
assert_eq!(res, "world");
let res = client.delete_secret("hello_delete");
let res = client.delete_secret("secret/hello_delete");
assert!(res.is_ok());
let res = client.get_secret("hello_delete");
let res = client.get_secret("secret/hello_delete");
assert!(res.is_err());
}
}