cel-expr · copybara-service · Oct 6, 2024 · Oct 6, 2024
diff --git a/policy/src/main/java/dev/cel/policy/CelPolicyYamlConfigParser.java b/policy/src/main/java/dev/cel/policy/CelPolicyYamlConfigParser.java
@@ -343,7 +343,7 @@ private CelPolicyConfig parseYaml(String source, String description)
                .orElseThrow(
                    () ->
                        new CelPolicyValidationException(
-                            String.format("YAML document is malformed: %s", source)));
+                            String.format("YAML document empty or malformed: %s", source)));
        node = yamlNode;
      } catch (RuntimeException e) {
        throw new CelPolicyValidationException("YAML document is malformed: " + e.getMessage(), e);

diff --git a/policy/src/main/java/dev/cel/policy/CelPolicyYamlParser.java b/policy/src/main/java/dev/cel/policy/CelPolicyYamlParser.java
@@ -73,7 +73,8 @@ private CelPolicy parseYaml() throws CelPolicyValidationException {
                .orElseThrow(
                    () ->
                        new CelPolicyValidationException(
-                            String.format("YAML document is malformed: %s", policySourceString)));
+                            String.format(
+                                "YAML document empty or malformed: %s", policySourceString)));
        node = yamlNode;
      } catch (RuntimeException e) {
        throw new CelPolicyValidationException("YAML document is malformed: " + e.getMessage(), e);

diff --git a/policy/src/test/java/dev/cel/policy/CelPolicyYamlConfigParserTest.java b/policy/src/test/java/dev/cel/policy/CelPolicyYamlConfigParserTest.java
@@ -43,6 +43,11 @@ public final class CelPolicyYamlConfigParserTest {
  private static final CelPolicyConfigParser POLICY_CONFIG_PARSER =
      CelPolicyParserFactory.newYamlConfigParser();

+  @Test
+  public void config_setEmpty() throws Exception {
+    assertThrows(CelPolicyValidationException.class, () -> POLICY_CONFIG_PARSER.parse(""));
+  }
+
  @Test
  public void config_setBasicProperties() throws Exception {
    String yamlConfig = "name: hello\n" + "description: empty\n" + "container: pb.pkg\n";

diff --git a/policy/src/test/java/dev/cel/policy/CelPolicyYamlParserTest.java b/policy/src/test/java/dev/cel/policy/CelPolicyYamlParserTest.java
@@ -43,6 +43,11 @@ public void parseYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) th
    assertThat(policy.policySource().getDescription()).isEqualTo(description);
  }

+  @Test
+  public void parser_setEmpty() throws Exception {
+    assertThrows(CelPolicyValidationException.class, () -> POLICY_PARSER.parse("", ""));
+  }
+
  @Test
  public void parseYamlPolicy_withExplanation() throws Exception {
    String policySource =