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.

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

agents: added check that metadata_url ends with / #765

Merged
merged 1 commit into from
Feb 6, 2023
Merged
Changes from all commits
Commits
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
32 changes: 31 additions & 1 deletion bottlerocket/agents/src/tuf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ pub fn tuf_repo_urls(
tuf_repo: &TufRepoConfig,
resources: &Resources,
) -> ProviderResult<(Url, Url)> {
let metadata_url = Url::parse(&tuf_repo.metadata_url).context(
let mut tuf_repo_metadata_url = tuf_repo.metadata_url.clone();
if !tuf_repo_metadata_url.ends_with('/') {
tuf_repo_metadata_url.push('/');
}
let metadata_url = Url::parse(&tuf_repo_metadata_url).context(
resources,
format!(
"Failed to parse TUF repo's metadata URL '{}'",
Expand Down Expand Up @@ -97,3 +101,29 @@ where

Ok(path)
}

#[test]
fn metadata_url_no_slash_join() {
let tuf_repo = TufRepoConfig {
metadata_url: String::from("https://foo.bar/baz"),
targets_url: String::from("https://foo.bar/targets"),
};
let (metadata_url, _) = tuf_repo_urls(&tuf_repo, &Resources::Clear).unwrap();
assert_eq!(
metadata_url.join("metadata").unwrap().as_str(),
"https://foo.bar/baz/metadata"
)
}

#[test]
fn metadata_url_slash_join() {
let tuf_repo = TufRepoConfig {
metadata_url: String::from("https://foo.bar/baz/"),
targets_url: String::from("https://foo.bar/targets"),
};
let (metadata_url, _) = tuf_repo_urls(&tuf_repo, &Resources::Clear).unwrap();
assert_eq!(
metadata_url.join("metadata").unwrap().as_str(),
"https://foo.bar/baz/metadata"
)
}