Light, fluffy, and always free - The AWS Local Emulator alternative
fix(glue): bound DeleteSchemaVersions ranges before expanding them (#3508)
Niels Kootstra76c1907214db
diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.java b/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.javaindex 7f98154ec0..2e23153325 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.java@@ -725,8 +725,16 @@ public class GlueSchemaRegistryService {throw new AwsException("InvalidInputException","Invalid version range: " + token, 400);}- for (long v = start; v <= end; v++) {- versions.add(v);+ // Bound the range before expanding it so a request such as 1-9223372036854775807+ // is rejected outright instead of materialising every version number.+ long rangeSize = end - start;+ if (rangeSize >= MAX_DELETE_SCHEMA_VERSIONS) {+ throw new AwsException("InvalidInputException",+ "Versions expression cannot expand to more than "+ + MAX_DELETE_SCHEMA_VERSIONS + " versions", 400);+ }+ for (long offset = 0; offset <= rangeSize; offset++) {+ versions.add(start + offset);}} else {versions.add(Long.parseLong(token));diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.javaindex e644d02a05..3ea0757383 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.java@@ -693,6 +693,27 @@ class GlueSchemaRegistryServiceTest {assertEquals("InvalidInputException", ex.getErrorCode());}+ @Test+ void deleteSchemaVersionsRejectsHugeRangeBeforeExpansion() {+ preCreateRegistry();+ service.createSchema(new RegistryId("reg", null), "a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);++ AwsException ex = assertThrows(AwsException.class, () ->+ service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1-9223372036854775807", REGION));++ assertEquals("InvalidInputException", ex.getErrorCode());+ }++ @Test+ void deleteSchemaVersionsAcceptsRangeOfExactlyTwentyFiveVersions() {+ preCreateRegistry();+ service.createSchema(new RegistryId("reg", null), "a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);++ var results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1-25", REGION);++ assertEquals(25, results.size());+ }+@Testvoid deleteSchemaVersionsReportsErrorsForMissingVersions() {preCreateRegistry();