Report input attribute addresses on ddwaf_known_addresses (#485)

Author: Anilm3

src/rule.hpp

@@ -165,6 +165,13 @@ class core_rule {
     void get_addresses(std::unordered_map<target_index, std::string> &addresses) const
     {
         expr_->get_addresses(addresses);
+
+        for (const auto &attr : attributes_) {
+            if (std::holds_alternative<rule_attribute::input_target>(attr.value_or_target)) {
+                const auto &input = std::get<rule_attribute::input_target>(attr.value_or_target);
+                addresses.emplace(input.index, input.name);
+            }
+        }
     }
 
 protected:

tests/integration/rules/attributes/test.cpp

@@ -101,7 +101,7 @@ TEST(TestRuleAttributesIntegration, SingleValueOutputAndEvent)
                                   .name = "rule2",
                                   .tags = {{"type", "flow2"}, {"category", "category2"}},
                                   .matches = {{.op = "match_regex",
-                                      .op_value = "^rule2",
+                                      .op_value = "^rule2$",
                                       .highlight = "rule2"sv,
                                       .args = {{.value = "rule2"sv, .address = "value2"}}}}});
 
@@ -709,7 +709,7 @@ TEST(TestRuleAttributesIntegration, AttributesEventsAndSubcontextMatches)
                                   .name = "rule2",
                                   .tags = {{"type", "flow2"}, {"category", "category2"}},
                                   .matches = {{.op = "match_regex",
-                                      .op_value = "^rule2",
+                                      .op_value = "^rule2$",
                                       .highlight = "rule2"sv,
                                       .args = {{
                                           .value = "rule2"sv,
@@ -744,7 +744,7 @@ TEST(TestRuleAttributesIntegration, AttributesEventsAndSubcontextMatches)
                                   .name = "rule2",
                                   .tags = {{"type", "flow2"}, {"category", "category2"}},
                                   .matches = {{.op = "match_regex",
-                                      .op_value = "^rule2",
+                                      .op_value = "^rule2$",
                                       .highlight = "rule2"sv,
                                       .args = {{
                                           .value = "rule2"sv,
@@ -763,4 +763,28 @@ TEST(TestRuleAttributesIntegration, AttributesEventsAndSubcontextMatches)
     ddwaf_context_destroy(context1);
 }
 
+TEST(TestRuleAttributesIntegration, InputAttributesInKnownAddresses)
+{
+    auto *alloc = ddwaf_get_default_allocator();
+    auto rule = read_file<ddwaf_object>("rules.yaml", base_dir);
+    ASSERT_TRUE(rule.type != DDWAF_OBJ_INVALID);
+
+    ddwaf_handle handle = ddwaf_init(&rule, nullptr);
+    ASSERT_NE(handle, nullptr);
+    ddwaf_object_destroy(&rule, alloc);
+
+    uint32_t size;
+    const char *const *addresses = ddwaf_known_addresses(handle, &size);
+    EXPECT_EQ(size, 12);
+
+    std::set<std::string_view> available_addresses{"value1", "value2", "value3", "value4", "value5",
+        "value6", "value7", "value8", "value9", "value10", "output_value9", "output_value10"};
+    while ((size--) != 0U) {
+        EXPECT_NE(available_addresses.find(addresses[size]), available_addresses.end());
+    }
+
+    // Destroying the handle should not invalidate it
+    ddwaf_destroy(handle);
+}
+
 } // namespace

tests/integration/rules/attributes/yaml/rules.yaml

@@ -19,7 +19,7 @@ rules:
         parameters:
           inputs:
             - address: value1
-          regex: ^rule1
+          regex: ^rule1$
     output:
       event: false
       keep: false
@@ -36,7 +36,7 @@ rules:
         parameters:
           inputs:
             - address: value2
-          regex: ^rule2
+          regex: ^rule2$
     output:
       event: true
       keep: false
@@ -53,7 +53,7 @@ rules:
         parameters:
           inputs:
             - address: value3
-          regex: ^rule3
+          regex: ^rule3$
     output:
       event: false
       keep: false
@@ -70,7 +70,7 @@ rules:
         parameters:
           inputs:
             - address: value4
-          regex: ^rule4
+          regex: ^rule4$
     output:
       event: false
       keep: false
@@ -93,7 +93,7 @@ rules:
         parameters:
           inputs:
             - address: value5
-          regex: ^rule5
+          regex: ^rule5$
     output:
       event: false
       keep: true
@@ -112,7 +112,7 @@ rules:
         parameters:
           inputs:
             - address: value6
-          regex: ^rule6
+          regex: ^rule6$
     output:
       event: false
       keep: false
@@ -130,7 +130,7 @@ rules:
         parameters:
           inputs:
             - address: value7
-          regex: ^rule7
+          regex: ^rule7$
     output:
       event: false
       keep: true
@@ -148,10 +148,45 @@ rules:
         parameters:
           inputs:
             - address: value8
-          regex: ^rule8
+          regex: ^rule8$
     output:
       event: false
       keep: false
       attributes:
         result.rule8: 
           address: value8
+  - id: rule9
+    name: rule9
+    tags:
+      type: flow9
+      category: category9
+    conditions:
+      - operator: match_regex
+        parameters:
+          inputs:
+            - address: value9
+          regex: ^rule9$
+    output:
+      event: false
+      keep: true
+      attributes:
+        result.rule9:
+          address: output_value9
+  - id: rule10
+    name: rule10
+    tags:
+      type: flow10
+      category: category10
+    conditions:
+      - operator: match_regex
+        parameters:
+          inputs:
+            - address: value10
+          regex: ^rule10$
+    output:
+      event: false
+      keep: true
+      attributes:
+        result.rule10:
+          address: output_value10
+          key_path: [path, to, scalar]