Require last stated owner for RRs

Author: k0ekk0ek

src/generic/format.h

@@ -374,14 +374,16 @@ static inline int32_t parse(parser_t *parser)
           else if (token.length == 8 && memcmp(token.data, "$INCLUDE", 8) == 0)
             code = parse_dollar_include(parser, &token);
           else
-            SYNTAX_ERROR(parser, "Invalid control entry");
+            SYNTAX_ERROR(parser, "Unknown control entry");
           continue;
         }
 
         if ((code = parse_owner(parser, &rr, &fields[0], &token)) < 0)
           return code;
         if ((code = take_contiguous(parser, &rr, &fields[0], &token)) < 0)
           return code;
+      } else if (unlikely(!parser->owner->length)) {
+        SYNTAX_ERROR(parser, "No last stated owner");
       }
 
       code = parse_rr(parser, &token);

tests/base32.c

@@ -67,7 +67,7 @@ void base32_syntax(void **state)
 
   for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
     char rr[256];
-    const char rrfmt[] = " NSEC3 1 1 12 aabbccdd ( %s A NS )";
+    const char rrfmt[] = "foo. NSEC3 1 1 12 aabbccdd ( %s A NS )";
     zone_parser_t parser = { 0 };
     zone_name_buffer_t name;
     zone_rdata_buffer_t rdata;

tests/ip4.c

@@ -89,7 +89,7 @@ void ipv4_syntax(void **state)
     zone_options_t options = { 0 };
     int32_t result;
 
-    (void)snprintf(rr, sizeof(rr), " A %s", tests[i].address);
+    (void)snprintf(rr, sizeof(rr), "foo. A %s", tests[i].address);
 
     options.accept.callback = add_rr;
     options.origin.octets = origin;

tests/syntax.c

@@ -564,6 +564,24 @@ static int32_t parse_as_include(const char *text, size_t *count)
   return code;
 }
 
+/*!cmocka */
+void who_dis(void **state)
+{
+  (void)state;
+
+  int32_t code;
+  size_t count = 0;
+  static const char *dat = PAD(" TXT \"dat\"");
+  static const char *dis_n_dat = PAD("dis. TXT \"dis\"\n"
+                                     "     TXT \"dat\"");
+
+  code = parse(dat, &count);
+  assert_int_equal(code, ZONE_SYNTAX_ERROR);
+  code = parse(dis_n_dat, &count);
+  assert_int_equal(code, ZONE_SUCCESS);
+  assert_true(count == 2);
+}
+
 /*!cmocka */
 void quote_no_unquote(void **state)
 {