Skip to content

Upgrade libddwaf to 1.30.0, enable extra cap, bump to 1.10.0 #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2025
Merged

Upgrade libddwaf to 1.30.0, enable extra cap, bump to 1.10.0 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d88e24
Upgrade WAF and enable extra capabilities
cataphract Nov 7, 2025
132db97
Bump to 1.10.0
cataphract Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
cmake_policy(SET CMP0068 NEW)
cmake_policy(SET CMP0135 NEW)

set(NGINX_DATADOG_VERSION 1.9.0)
set(NGINX_DATADOG_VERSION 1.10.0)
project(ngx_http_datadog_module VERSION ${NGINX_DATADOG_VERSION})

option(NGINX_DATADOG_ASM_ENABLED "Build with libddwaf" ON)
Expand Down
2 changes: 1 addition & 1 deletion libddwaf
Open in desktop
Submodule libddwaf updated 49 files
+82 −0 CHANGELOG.md
+3 −0 UPGRADING.md
+3 −0 cmake/objects.cmake
+5 −1 schema/actions.json
+6 −24 schema/events.json
+21 −13 schema/result.json
+29 −0 src/builder/checksum_builder.cpp
+19 −0 src/builder/checksum_builder.hpp
+39 −7 src/builder/processor_builder.cpp
+8 −2 src/builder/processor_builder.hpp
+27 −0 src/checksum/base.hpp
+41 −0 src/checksum/luhn_checksum.cpp
+29 −0 src/checksum/luhn_checksum.hpp
+45 −13 src/configuration/actions_parser.cpp
+8 −2 src/configuration/common/configuration.hpp
+5 −3 src/configuration/common/expression_parser.cpp
+23 −3 src/configuration/common/matcher_parser.cpp
+3 −1 src/configuration/common/matcher_parser.hpp
+13 −4 src/configuration/processor_override_parser.cpp
+1 −1 src/configuration/processor_parser.cpp
+1 −1 src/matcher/phrase_match.cpp
+4 −8 src/matcher/regex_match.cpp
+0 −2 src/matcher/regex_match.hpp
+62 −0 src/matcher/regex_match_with_checksum.cpp
+47 −0 src/matcher/regex_match_with_checksum.hpp
+41 −13 src/serializer.cpp
+0 −1 src/transformer/manager.hpp
+37 −2 tests/common/gtest_utils.cpp
+1 −0 tests/common/gtest_utils.hpp
+338 −7 tests/integration/actions/test.cpp
+5 −0 tests/integration/context/test.cpp
+12 −6 tests/integration/exclusion/rule_filter/test.cpp
+52 −49 tests/integration/interface/waf/test.cpp
+1 −0 tests/integration/matchers/regex_match/test.cpp
+190 −0 tests/integration/matchers/regex_match_with_checksum/test.cpp
+24 −0 tests/integration/processors/overrides/ruleset/scanners.json
+535 −10 tests/integration/processors/overrides/test.cpp
+42 −28 tests/integration/rules/custom_rules/test.cpp
+52 −0 tests/unit/checksum/luhn_checksum_test.cpp
+315 −0 tests/unit/configuration/action_parser_test.cpp
+217 −9 tests/unit/configuration/processor_override_parser_test.cpp
+0 −0 tests/unit/matcher/exact_match_test.cpp
+26 −0 tests/unit/matcher/phrase_match_test.cpp
+6 −0 tests/unit/matcher/regex_match_test.cpp
+110 −0 tests/unit/matcher/regex_match_with_checksum_test.cpp
+15 −12 tests/unit/serializer_test.cpp
+2 −1 validator/tests/exclusions/rule_filter/conditional/010_rule_no_exclusions.yaml
+2 −1 validator/tests/rules/actions/001_rule1_match_with_actions.yaml
+1 −1 version
2 changes: 2 additions & 0 deletions src/security/waf_remote_cfg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ class AsmConfigListener : public ProductListener<AsmConfigListener> {
Capability::ASM_REQUEST_BLOCKING,
Capability::ASM_RESPONSE_BLOCKING,
Capability::ASM_EXCLUSIONS,
Capability::ASM_PREPROCESSOR_OVERRIDES,
Capability::ASM_CUSTOM_DATA_SCANNERS,
static_cast<Capability>(static_cast<std::uint64_t>(1)
<< 42) /* ASM_DD_MULTICONFIG */,
static_cast<Capability>(static_cast<std::uint64_t>(1)
Expand Down