Report input attribute addresses on ddwaf_known_addresses, increase macos target and increase version to v1.30.1 (#484)

Author: Anilm3

.github/workflows/build.yml

@@ -65,7 +65,7 @@ jobs:
             ${{ github.workspace }}/packages/*.sha256
 
   macos-build:
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
@@ -76,8 +76,6 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
-      - name: Select Xcode version
-        run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
       - name: Create Build Directory
         run: cmake -E make_directory ${{ github.workspace }}/build ${{ github.workspace }}/packages
       - name: Generating Build Scripts
@@ -87,7 +85,6 @@ jobs:
         run: cmake --build . --config RelWithDebInfo --verbose --target all --target waf_test -j $(getconf _NPROCESSORS_ONLN)
         working-directory: ${{ github.workspace }}/build
       - name: Test
-        if: matrix.arch == 'x86_64'
         run: ${{ github.workspace }}/build/tests/waf_test
         working-directory: ${{ github.workspace }}/tests
       - name: Build Packages
@@ -107,7 +104,7 @@ jobs:
             ${{ github.workspace }}/packages/*.sha256
 
   macos-universal-package:
-    runs-on: macos-13
+    runs-on: macos-14
     needs: [macos-build]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

CHANGELOG.md

@@ -1,5 +1,11 @@
 # libddwaf release
 
+## v1.30.1 ([unstable](https://github.com/DataDog/libddwaf/blob/master/README.md#versioning-semantics))
+
+### Release changelog
+#### Fixes
+- Report input attribute addresses on `ddwaf_known_addresses`, increase macos target and increase version to v1.30.1  ([#484](https://github.com/DataDog/libddwaf/pull/484)) 
+
 ## v1.30.0 ([unstable](https://github.com/DataDog/libddwaf/blob/master/README.md#versioning-semantics))
 This release introduces no new features, however the recently introduced `block_id` action parameter has been renamed to `security_response_id` for consistency.
 

CMakeLists.txt

@@ -5,7 +5,7 @@ file(READ "version" version)
 string(REGEX REPLACE "-(alpha|beta)[0-9]*$" "" mmp_version ${version})
 
 if (APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.7" CACHE STRING "Minimum OS X deployment version")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "14.2.1" CACHE STRING "Minimum OS X deployment version")
 endif()
 
 project(libddwaf VERSION "${mmp_version}")

cmake/objects.cmake

@@ -92,7 +92,6 @@ set(LIBDDWAF_SOURCE
     ${libddwaf_SOURCE_DIR}/src/transformer/css_decode.cpp
     ${libddwaf_SOURCE_DIR}/src/transformer/html_entity_decode.cpp
     ${libddwaf_SOURCE_DIR}/src/transformer/js_decode.cpp
-    ${libddwaf_SOURCE_DIR}/src/libcxx-compat/monotonic_buffer_resource.cpp
     ${libddwaf_SOURCE_DIR}/src/vendor/fmt/format.cc
     ${libddwaf_SOURCE_DIR}/src/vendor/radixlib/radixlib.c
     ${libddwaf_SOURCE_DIR}/src/vendor/lua-aho-corasick/ac_fast.cxx

src/context_allocator.hpp

@@ -7,13 +7,12 @@
 #pragma once
 
 #include <list>
+#include <memory_resource>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#include "memory_resource.hpp"
-
 namespace ddwaf::memory {
 extern thread_local std::pmr::memory_resource *local_memory_resource;
 

src/libcxx-compat/monotonic_buffer_resource.cpp

@@ -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: