From 7fca907324c4631ec2f6855eef8fe046db82e51b Mon Sep 17 00:00:00 2001 From: Leo Romanovsky Date: Tue, 20 Oct 2026 20:02:19 +0000 Subject: [PATCH] Reject feature flags with invalid allocation exposure settings --- .../src/test/resources/ffe-system-test-data | 2 +- .../api/openfeature/DDEvaluatorTest.java | 4 +++ .../UniversalFlagConfigParser.java | 7 ++++- .../JsonApiUfcResponseParserTest.java | 25 ++++++++------- .../RemoteConfigServiceImplTest.java | 31 +++++++++++++++++++ 5 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data b/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data index 0c467473aa8..f6c8ad87053 160000 --- a/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data +++ b/dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data @@ -1 +1 @@ -Subproject commit 0c467473aa8dc1f1cbfc0ef9a60d5c1c7a8826e6 +Subproject commit f6c8ad870531d041eaef42286899c93ad4d6e0e9 diff --git a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java index 953450807f7..51b2e69b75e 100644 --- a/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java +++ b/products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java @@ -1366,6 +1366,10 @@ private static void validateFlag(final String flagKey, final Flag flag) { if (allocation == null) { continue; } + if (allocation.doLog == null) { + throw new IllegalArgumentException( + "flag \"" + flagKey + "\" contains an allocation without a boolean doLog"); + } validateConditionOperands(flagKey, allocation); if (allocation.splits == null) { continue; diff --git a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java index 27fd3f70c70..c79707f6f71 100644 --- a/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java +++ b/products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/UniversalFlagConfigParser.java @@ -117,6 +117,10 @@ private static void validateFlag(final String flagKey, final Flag flag) { if (allocation == null) { continue; } + if (allocation.doLog == null) { + throw new InvalidFlagException( + "flag \"" + flagKey + "\" contains an allocation without a boolean doLog"); + } validateConditionOperands(flagKey, allocation); if (allocation.splits == null) { continue; @@ -399,7 +403,8 @@ public void toJson(@Nonnull final JsonWriter writer, @Nullable final MapOnly applies to Boolean.class (not primitive boolean), so mandatory primitive-boolean fields diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java index fae2631ce2f..5307e2437cb 100644 --- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java +++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/JsonApiUfcResponseParserTest.java @@ -92,10 +92,11 @@ void preprocessesSemverComparandsAndDropsMalformedFlags() throws Exception { configWithFlags( booleanFlag("no-allocations", ""), booleanFlag( - "no-splits", ",\"allocations\":[{\"key\":\"no-splits\",\"rules\":[]}]"), + "no-splits", + ",\"allocations\":[{\"doLog\":false,\"key\":\"no-splits\",\"rules\":[]}]"), booleanFlag( "null-split", - ",\"allocations\":[{\"key\":\"null-split\",\"rules\":[],\"splits\":[null]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"null-split\",\"rules\":[],\"splits\":[null]}]"), booleanFlag("no-rules", allocation("no-rules", "")), booleanFlag("no-conditions", allocation("no-conditions", "[{}]")), booleanFlag( @@ -174,7 +175,7 @@ void dropsFlagWithMissingSplitShards() throws Exception { configWithFlags( booleanFlag( "missing-shards", - ",\"allocations\":[{\"key\":\"missing-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\"}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"missing-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\"}]}]"), booleanFlag("valid-sibling", "")))); assertNotNull(configuration); @@ -201,7 +202,7 @@ void dropsFlagsWithInvalidConditionOperandsAndShardBounds() throws Exception { "[{\"conditions\":[{\"attribute\":\"role\",\"operator\":\"ONE_OF\",\"value\":\"admin\"}]}]")), booleanFlag( "negative-shard-range", - ",\"allocations\":[{\"key\":\"negative-shard-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":100,\"ranges\":[{\"start\":-1,\"end\":1}]}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"negative-shard-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":100,\"ranges\":[{\"start\":-1,\"end\":1}]}]}]}]"), booleanFlag("valid-sibling", "")))); assertNotNull(configuration); @@ -222,25 +223,25 @@ void dropsFlagsWithInvalidShardBoundsAndConditionOperands() throws Exception { configWithFlags( booleanFlag( "zero-total-shards", - ",\"allocations\":[{\"key\":\"zero-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":0,\"ranges\":[]}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"zero-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":0,\"ranges\":[]}]}]}]"), booleanFlag( "unsigned-total-shards", - ",\"allocations\":[{\"key\":\"unsigned-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":2147483648,\"ranges\":[{\"start\":2147483648,\"end\":2147483649}]}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"unsigned-total-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":2147483648,\"ranges\":[{\"start\":2147483648,\"end\":2147483649}]}]}]}]"), booleanFlag( "too-many-shards", - ",\"allocations\":[{\"key\":\"too-many-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":4294967296,\"ranges\":[]}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"too-many-shards\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":4294967296,\"ranges\":[]}]}]}]"), booleanFlag( "missing-ranges", - ",\"allocations\":[{\"key\":\"missing-ranges\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"missing-ranges\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1}]}]}]"), booleanFlag( "null-shard", - ",\"allocations\":[{\"key\":\"null-shard\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[null]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"null-shard\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[null]}]}]"), booleanFlag( "null-range", - ",\"allocations\":[{\"key\":\"null-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[null]}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"null-range\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[null]}]}]}]"), booleanFlag( "negative-range-end", - ",\"allocations\":[{\"key\":\"negative-range-end\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[{\"start\":0,\"end\":-1}]}]}]}]"), + ",\"allocations\":[{\"doLog\":false,\"key\":\"negative-range-end\",\"rules\":[],\"splits\":[{\"variationKey\":\"on\",\"shards\":[{\"salt\":\"salt\",\"totalShards\":1,\"ranges\":[{\"start\":0,\"end\":-1}]}]}]}]"), booleanFlag( "non-boolean-is-null", allocation( @@ -446,7 +447,7 @@ private static String booleanFlag(final String key, final String allocations) { } private static String allocation(final String key, final String rules) { - return ",\"allocations\":[{\"key\":\"" + return ",\"allocations\":[{\"doLog\":false,\"key\":\"" + key + "\"" + (rules.isEmpty() ? "" : ",\"rules\":" + rules) diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java index f11816a9bc0..54bd06ce981 100644 --- a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java +++ b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/RemoteConfigServiceImplTest.java @@ -49,6 +49,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.NullSource; +import org.junit.jupiter.params.provider.ValueSource; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -100,6 +102,35 @@ void skipsMalformedFlagAllocationsAndKeepsValidFlag() throws Exception { assertEquals("expected", config.flags.get("valid-flag").variations.get("expected").value); } + @ParameterizedTest + @NullSource + @ValueSource(strings = {"null", "\"true\"", "\"false\"", "0", "1", "[]", "{}"}) + void rejectsInvalidDoLogAndKeepsSiblingFlag(final String wireValue) throws Exception { + final String json = configWithSiblingSerialIds("1"); + final String updated = + wireValue == null + ? json.replaceFirst(",\\s*\"doLog\": true", "") + : json.replaceFirst("\"doLog\": true", "\"doLog\": " + wireValue); + + final ServerConfiguration config = deserialize(updated); + + assertFalse(config.flags.containsKey("malformed-flag")); + assertEquals("invalid_flag", config.invalidFlags.get("malformed-flag")); + assertTrue(config.flags.containsKey("valid-flag")); + assertEquals(Integer.valueOf(7), serialIdOf(config)); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void acceptsExplicitDoLog(final boolean doLog) throws Exception { + final String json = configWithSerialId("7").replace("\"doLog\": true", "\"doLog\": " + doLog); + + final ServerConfiguration config = deserialize(json); + + assertEquals(doLog, config.flags.get("valid-flag").allocations.get(0).doLog); + assertEquals(Integer.valueOf(7), serialIdOf(config)); + } + @Test void parsesSplitSerialId() throws Exception { final ServerConfiguration config = deserialize(configWithSerialId("340132"));