Skip to content

fix: Don't return JSON auth config for partial registry name match #6323

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

Merged
eddumelendez merged 1 commit into from
Jan 10, 2023
Merged

fix: Don't return JSON auth config for partial registry name match #6323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private Map.Entry<String, JsonNode> findAuthNode(final JsonNode config, final St
final Iterator<Map.Entry<String, JsonNode>> fields = auths.fields();
while (fields.hasNext()) {
final Map.Entry<String, JsonNode> entry = fields.next();
if (entry.getKey().contains("://" + reposName) || entry.getKey().equals(reposName)) {
if (entry.getKey().endsWith("://" + reposName) || entry.getKey().equals(reposName)) {
return entry;
}
}
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/java/org/testcontainers/utility/RegistryAuthLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,20 @@ public void lookupAuthConfigWithJsonKeyCredentials() throws URISyntaxException {
assertThat(authConfig.getPassword()).as("Password is set").isNotNull();
}

@Test
public void lookupAuthConfigWithJsonKeyCredentialsPartialMatchShouldGiveNoResult() throws URISyntaxException {
// contains entry for registry.example.com
final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-json-key.json");

final AuthConfig authConfig = authLocator.lookupAuthConfig(
DockerImageName.parse("registry.example.co/org/repo"), // partial match of registry name
new AuthConfig()
);

assertThat(authConfig.getUsername()).as("auth config username").isNull();
assertThat(authConfig.getPassword()).as("auth config password").isNull();
}

@Test
public void lookupAuthConfigUsingStore() throws URISyntaxException {
final RegistryAuthLocator authLocator = createTestAuthLocator("config-with-store.json");
Expand Down