Light, fluffy, and always free - The AWS Local Emulator alternative
fix(ecr): validate scanning batch repository names (#6587)
Jimmy Liu Jiaad92d5f2c120
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrJsonHandler.javaindex dc3dc8796a..ace183a37d 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrJsonHandler.java@@ -48,7 +48,8 @@ public class EcrJsonHandler {private static final Set<String> MODEL_CHECKED = Set.of("PutRegistryPolicy", "GetRegistryPolicy", "DeleteRegistryPolicy","PutReplicationConfiguration", "DescribeRegistry",- "PutRegistryScanningConfiguration", "GetRegistryScanningConfiguration");+ "PutRegistryScanningConfiguration", "GetRegistryScanningConfiguration",+ "BatchGetRepositoryScanningConfiguration");public Response handle(String action, JsonNode request, String region) {if (MODEL_CHECKED.contains(action)) {diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.javaindex 91b29cc4d4..1da5dddc41 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java@@ -408,11 +408,6 @@ public class EcrService implements ResourceProvider {public BatchScanningConfigurationResult batchGetRepositoryScanningConfiguration(List<String> repositoryNames, String registryId, String region) {- if (repositoryNames == null || repositoryNames.isEmpty()) {- return new BatchScanningConfigurationResult(describeRepositories(repositoryNames, registryId, region),- List.of());- }-String account = effectiveAccount(registryId);List<Repository> repositories = new ArrayList<>();List<ScanningConfigurationFailure> failures = new ArrayList<>();diff --git a/src/main/resources/aws/ecr-request-shapes.json b/src/main/resources/aws/ecr-request-shapes.jsonindex fc9ce215fa..b38304d432 100644--- a/src/main/resources/aws/ecr-request-shapes.json+++ b/src/main/resources/aws/ecr-request-shapes.json@@ -10,9 +10,19 @@"PutReplicationConfiguration": "PutReplicationConfigurationRequest","DescribeRegistry": "DescribeRegistryRequest","PutRegistryScanningConfiguration": "PutRegistryScanningConfigurationRequest",- "GetRegistryScanningConfiguration": "GetRegistryScanningConfigurationRequest"+ "GetRegistryScanningConfiguration": "GetRegistryScanningConfigurationRequest",+ "BatchGetRepositoryScanningConfiguration": "BatchGetRepositoryScanningConfigurationRequest"},"shapes": {+ "BatchGetRepositoryScanningConfigurationRequest": {+ "type": "structure",+ "required": [+ "repositoryNames"+ ],+ "members": {+ "repositoryNames": "ScanningConfigurationRepositoryNameList"+ }+ },"DeleteRegistryPolicyRequest": {"type": "structure","members": {}@@ -157,6 +167,12 @@"max": 256,"pattern": "^(?:[a-z0-9]+(?:[._-][a-z0-9]*)*/)*[a-z0-9]*(?:[._-][a-z0-9]*)*$"},+ "RepositoryName": {+ "type": "string",+ "min": 2,+ "max": 256,+ "pattern": "[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*(\\/[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*)*"+ },"ScanFrequency": {"type": "string","enum": [@@ -172,6 +188,12 @@"ENHANCED"]},+ "ScanningConfigurationRepositoryNameList": {+ "type": "list",+ "min": 1,+ "max": 25,+ "member": "RepositoryName"+ },"ScanningRepositoryFilter": {"type": "structure","required": [diff --git a/src/test/java/io/github/hectorvent/floci/services/ecr/EcrRegistrySettingsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ecr/EcrRegistrySettingsIntegrationTest.javaindex bbb97065a9..f6aff55d22 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecr/EcrRegistrySettingsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecr/EcrRegistrySettingsIntegrationTest.java@@ -4,13 +4,25 @@ import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.InjectMock;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.RestAssured;import io.restassured.response.ValidatableResponse;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;+import software.amazon.awssdk.regions.Region;+import software.amazon.awssdk.services.ecr.EcrClient;+import software.amazon.awssdk.services.ecr.model.InvalidParameterException;++import java.net.URI;+import java.util.Collections;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasSize;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.mockito.Mockito.when;/**@@ -105,6 +117,35 @@ class EcrRegistrySettingsIntegrationTest {.body("__type", equalTo("InvalidParameterException"));}+ @Test+ void repositoryScanningBatchRejectsInvalidNames() {+ String region = "eu-west-3";+ for (String body : new String[] {+ "{}", "{\"repositoryNames\":[]}", "{\"repositoryNames\":[\"a\"]}",+ "{\"repositoryNames\":[\"Invalid Name\"]}",+ "{\"repositoryNames\":[" + String.join(",", Collections.nCopies(26, "\"valid-name\"")) + "]}"+ }) {+ call("BatchGetRepositoryScanningConfiguration", body, region).statusCode(400)+ .body("__type", equalTo("InvalidParameterException"));+ }+ }++ @Test+ void repositoryScanningBatchSdkRejectsMalformedName() {+ try (EcrClient client = EcrClient.builder()+ .endpointOverride(URI.create("http://localhost:" + RestAssured.port))+ .httpClientBuilder(UrlConnectionHttpClient.builder())+ .region(Region.EU_WEST_3)+ .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("000000000000", "test")))+ .build()) {+ InvalidParameterException error = assertThrows(InvalidParameterException.class,+ () -> client.batchGetRepositoryScanningConfiguration(b -> b.repositoryNames("Invalid Name")));+ assertEquals(400, error.statusCode());+ assertEquals(1, client.batchGetRepositoryScanningConfiguration(b -> b.repositoryNames("sdk-missing"))+ .failures().size());+ }+ }+@Testvoid repositoryScanningBatchKeepsValidResultsWhenAnotherNameIsMissing() {String region = "eu-west-3";diff --git a/tools/aws/regen_ecr_shapes.py b/tools/aws/regen_ecr_shapes.pyindex dd4b8c4e37..057527e2e2 100644--- a/tools/aws/regen_ecr_shapes.py+++ b/tools/aws/regen_ecr_shapes.py@@ -25,6 +25,7 @@ OPERATIONS = ("PutRegistryPolicy", "GetRegistryPolicy", "DeleteRegistryPolicy","PutReplicationConfiguration", "DescribeRegistry","PutRegistryScanningConfiguration", "GetRegistryScanningConfiguration",+ "BatchGetRepositoryScanningConfiguration",)