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

Jump to bottom

shibaken: return empty key list if IMDS returns 404 #1358

Merged
merged 2 commits into from
Feb 26, 2021
Merged

shibaken: return empty key list if IMDS returns 404 #1358

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
90772e9
shibaken: return empty key list if IMDS returns 404
jpculp Feb 26, 2021
e7fbd4d
Update changelog to include PR #1358
jpculp Feb 26, 2021
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Add a vmware-dev variant ([#1292], [#1288], [#1290])
* Add Kubernetes static pods support ([#1317])
* Add high-level 'set' subcommand for changing settings using apiclient ([#1278])
* Allow admin container to use SSH public keys from user data ([#1331], [#19])
* Allow admin container to use SSH public keys from user data ([#1331], [#1358], [#19])
tjkirch marked this conversation as resolved.
Show resolved Hide resolved
* Add support for kubelet in standalone mode and TLS auth ([#1338])
* Add https-proxy and no-proxy settings to updog ([#1324])
* Add support for pulling host-containers from ECR Public ([#1296])
Expand Down Expand Up @@ -80,6 +80,7 @@
[#1353]: (https://github.com/bottlerocket-os/bottlerocket/pull/1353)
[#1356]: (https://github.com/bottlerocket-os/bottlerocket/pull/1356)
[#1357]: (https://github.com/bottlerocket-os/bottlerocket/pull/1357)
[#1358]: (https://github.com/bottlerocket-os/bottlerocket/pull/1358)
[#19]: (https://github.com/bottlerocket-os/bottlerocket-admin-container/pull/19)

# v1.0.5 (2021-01-15)
Expand Down
40 changes: 28 additions & 12 deletions sources/api/shibaken/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,23 @@ fn fetch_imds_session_token(client: &Client) -> Result<String> {
Ok(imds_session_token)
}

/// Helper to fetch data from IMDS. Taken from pluto.
fn get_text_from_imds(client: &Client, uri: &str, session_token: &str) -> Result<String> {
client
/// Helper to fetch data from IMDS. Inspired by pluto.
fn fetch_from_imds(client: &Client, uri: &str, session_token: &str) -> Result<Option<String>> {
let response = client
.get(uri)
.header("X-aws-ec2-metadata-token", session_token)
.send()
.context(error::ImdsRequest { method: "GET", uri })?
.error_for_status()
.context(error::ImdsResponse { uri })?
.text()
.context(error::ImdsText { uri })
.context(error::ImdsRequest { method: "GET", uri })?;
if response.status().as_u16() == 404 {
return Ok(None);
}
Ok(Some(
response
.error_for_status()
.context(error::ImdsResponse { uri })?
.text()
.context(error::ImdsText { uri })?,
))
srgothi92 marked this conversation as resolved.
Show resolved Hide resolved
}

/// Returns a list of public keys.
Expand All @@ -81,17 +87,24 @@ fn fetch_public_keys_from_imds() -> Result<Vec<String>> {

info!("Fetching list of available public keys from IMDS");
// Returns a list of available public keys as '0=my-public-key'
let public_key_list =
get_text_from_imds(&client, IMDS_PUBLIC_KEY_BASE_URI, &imds_session_token)?;
debug!("available public keys '{}'", &public_key_list);
let public_key_list = if let Some(public_key_list) =
fetch_from_imds(&client, IMDS_PUBLIC_KEY_BASE_URI, &imds_session_token)?
{
debug!("available public keys '{}'", &public_key_list);
public_key_list
} else {
debug!("no available public keys");
return Ok(Vec::new());
};
srgothi92 marked this conversation as resolved.
Show resolved Hide resolved

info!("Generating uris to fetch text of available public keys");
let public_key_uris = build_public_key_uris(&public_key_list);

info!("Fetching public keys from IMDS");
let mut public_keys = Vec::new();
for uri in public_key_uris {
let public_key_text = get_text_from_imds(&client, &uri, &imds_session_token)?;
let public_key_text = fetch_from_imds(&client, &uri, &imds_session_token)?
.context(error::KeyNotFound { uri })?;
let public_key = public_key_text.trim_end();
// Simple check to see if the text is probably an ssh key.
if public_key.starts_with("ssh") {
Expand Down Expand Up @@ -265,6 +278,9 @@ mod error {
#[snafu(display("Error getting text response from {}: {}", uri, source))]
ImdsText { uri: String, source: reqwest::Error },

#[snafu(display("Error retrieving key from {}", uri))]
KeyNotFound { uri: String },

#[snafu(display("Logger setup error: {}", source))]
Logger { source: log::SetLoggerError },

Expand Down