libddwaf 1.25.1.0.1-x86_64-linux → 1.25.1.1.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36ec60e121f929ccbef3adc22d81d5fafdb0b236ef79d0b028b0327eb2ea040
-  data.tar.gz: 341d0723c2803f33b6fc5e1858e180412f07c1aedda3b83f10b66a9a5f0bbfa9
+  metadata.gz: 71671f701c7f58c826e83a62f0470a2b449e7d659cfd30fcaad92f52162b46c1
+  data.tar.gz: ee250d0784c98ea3f08d0ae963ce0f6b80f6e300ce1a214bc2c93b4ebe141328
 SHA512:
-  metadata.gz: 6f3ce7eecf84e5d2c38b083813e44b90f9a1d31b22da2e2b08c1e2058fa8b542fc7c1e2cfbbce04ef2c9ab34b491eafe26e7f511ce472922a6a54fb2ac33137f
-  data.tar.gz: 9feb93b60cc1724a071ae856a008007f8ae8c9bc5825084c371bc19d746346d6411c6e38ab19763b06f09815f22c04d4f222c9b27947a6191345d1fe37a7b633
+  metadata.gz: 03434db73b64a7709cd085ced0e3edffd1c12fd0c0afc04744e8bfc1d564cf6590c11e86eb8b3b045a3e27b1750ed473df2e2faf3b763660e915f46d27fb8266
+  data.tar.gz: f32ab29f00644c0d1f35d93bd6f44c7315a2ba0a097129d567aafee532a257d8c111fc5adcf859482a8c3e10271275af2d91d67e7f42eba59843b8957a9f013c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Unreleased
 
+# 2025-09-24 v1.25.1.1.0
+
+## Changed
+
+- Change coersion of the values in WAF rules to use `libddwaf` primitives
+
 # 2025-09-18 v1.25.1.0.1
 
 ## Fixed

data/lib/datadog/appsec/waf/context.rb

@@ -7,9 +7,9 @@ module Datadog
       # See https://github.com/DataDog/libddwaf/blob/10e3a1dfc7bc9bb8ab11a09a9f8b6b339eaf3271/BINDING_IMPL_NOTES.md?plain=1#L125-L158
       class Context
         EMPTY_RESULT = {
-          "events" => [],     #: ::Array[WAF::output]
-          "actions" => {},    #: ::Hash[::String, WAF::output]
-          "attributes" => {}, #: ::Hash[::String, WAF::output]
+          "events" => [],     #: WAF::events
+          "actions" => {},    #: WAF::actions
+          "attributes" => {}, #: WAF::attributes
           "duration" => 0,
           "timeout" => false,
           "keep" => false

data/lib/datadog/appsec/waf/converter.rb

@@ -164,13 +164,13 @@ module Datadog
           when :ddwaf_obj_float
             obj[:valueUnion][:f64]
           when :ddwaf_obj_array
-            (0...obj[:nbEntries]).each.with_object([]) do |i, a| #$ ::Array[WAF::output]
+            (0...obj[:nbEntries]).each.with_object([]) do |i, a| #$ ::Array[WAF::opaque]
               ptr = obj[:valueUnion][:array] + i * LibDDWAF::Object.size
               e = Converter.object_to_ruby(LibDDWAF::Object.new(ptr))
               a << e
             end
           when :ddwaf_obj_map
-            (0...obj[:nbEntries]).each.with_object({}) do |i, h| #$ ::Hash[::String, WAF::output]
+            (0...obj[:nbEntries]).each.with_object({}) do |i, h| #$ ::Hash[::String, WAF::opaque]
               ptr = obj[:valueUnion][:array] + i * Datadog::AppSec::WAF::LibDDWAF::Object.size
               o = Datadog::AppSec::WAF::LibDDWAF::Object.new(ptr)
               l = o[:parameterNameLength]

data/lib/datadog/appsec/waf/handle_builder.rb

@@ -58,7 +58,7 @@ module Datadog
         def add_or_update_config(config, path:)
           ensure_pointer_presence!
 
-          config_obj = Converter.ruby_to_object(config)
+          config_obj = Converter.ruby_to_object(config, coerce: false)
           diagnostics_obj = LibDDWAF::Object.new
 
           LibDDWAF.ddwaf_builder_add_or_update_config(@builder_ptr, path, path.length, config_obj, diagnostics_obj)

data/lib/datadog/appsec/waf/version.rb

@@ -5,7 +5,7 @@ module Datadog
         BASE_STRING = "1.25.1"
         # NOTE: Every change to the `BASE_STRING` should be accompanied
         #       by a reset of the patch version in the `STRING` below.
-        STRING = "#{BASE_STRING}.0.1"
+        STRING = "#{BASE_STRING}.1.0"
         MINIMUM_RUBY_VERSION = "2.5"
       end
     end

data/sig/datadog/appsec/waf/context.rbs

@@ -4,12 +4,12 @@ module Datadog
       class Context
         @context_ptr: ::FFI::Pointer
 
-        @retained: Array[top]
+        @retained: Array[untyped]
 
         EMPTY_RESULT: {
-          "events" => ::Array[WAF::output],
-          "actions" => ::Hash[::String, WAF::output],
-          "attributes" => ::Hash[::String, WAF::output],
+          "events" => WAF::events,
+          "actions" => WAF::actions,
+          "attributes" => WAF::attributes,
           "duration" => ::Integer,
           "timeout" => bool,
           "keep" => bool

data/sig/datadog/appsec/waf/converter.rbs

@@ -11,7 +11,7 @@ module Datadog
           ?coerce: bool?
         ) -> LibDDWAF::Object
 
-        def self?.object_to_ruby: (LibDDWAF::Object obj) -> WAF::output
+        def self?.object_to_ruby: (LibDDWAF::Object obj) -> WAF::opaque
       end
     end
   end

data/sig/datadog/appsec/waf/errors.rbs

@@ -11,9 +11,9 @@ module Datadog
       end
 
       class LibDDWAFError < Error
-        attr_reader diagnostics: WAF::output
+        attr_reader diagnostics: WAF::opaque
 
-        def initialize: (::String msg, ?diagnostics: WAF::output?) -> void
+        def initialize: (::String msg, ?diagnostics: WAF::opaque?) -> void
       end
     end
   end

data/sig/datadog/appsec/waf/handle_builder.rbs

@@ -10,7 +10,7 @@ module Datadog
 
         def build_handle: () -> Handle
 
-        def add_or_update_config: (WAF::input config, path: ::String) -> WAF::output
+        def add_or_update_config: (WAF::input config, path: ::String) -> WAF::opaque
 
         def remove_config_at_path: (::String path) -> bool
 

data/sig/datadog/appsec/waf/result.rbs

@@ -2,16 +2,13 @@ module Datadog
   module AppSec
     module WAF
       class Result
-        type list = ::Array[WAF::output]
-        type map = ::Hash[::String, WAF::output]
-
         @status: ::Symbol
 
-        @events: list
+        @events: WAF::events
 
-        @actions: map
+        @actions: WAF::actions
 
-        @attributes: map
+        @attributes: WAF::attributes
 
         @duration: ::Integer
 
@@ -23,19 +20,19 @@ module Datadog
 
         attr_reader status: ::Symbol
 
-        attr_reader events: list
+        attr_reader events: WAF::events
 
-        attr_reader actions: map
+        attr_reader actions: WAF::actions
 
-        attr_reader attributes: map
+        attr_reader attributes: WAF::attributes
 
         attr_reader duration: ::Integer
 
         def initialize: (
           status: ::Symbol,
-          events: list,
-          actions: map,
-          attributes: map,
+          events: WAF::events,
+          actions: WAF::actions,
+          attributes: WAF::attributes,
           duration: ::Integer,
           timeout: bool,
           keep: bool
@@ -49,7 +46,7 @@ module Datadog
 
         def input_truncated?: () -> bool
 
-        def to_h: () -> ::Hash[::Symbol, (::Symbol | WAF::output)]
+        def to_h: () -> ::Hash[::Symbol, (::Symbol | WAF::opaque)]
       end
     end
   end

data/sig/datadog/appsec/waf.rbs

@@ -2,8 +2,45 @@ module Datadog
   module AppSec
     module WAF
       type input = nil | bool | ::String | ::Symbol | ::Integer | ::Float | ::Array[input] | ::Hash[input, input]
-      type output = nil | bool | ::String | ::Integer | ::Float | ::Array[output] | ::Hash[::String, output]
       type known_addresses = ::Array[::String]
+      type result = {
+        "keep" => bool,
+        "events" => events,
+        "actions" => actions,
+        "attributes" => attributes,
+        "timeout" => bool,
+        # NOTE: Schema defines it as a `number`, but we alway get it as `Integer`
+        #       That will be fixed in the libddwaf specs
+        "duration" => ::Integer
+      }
+      type events = ::Array[event]
+      type event = {"rule" => rule, "rule_matches" => ::Array[rule_match]}
+      type rule = {
+        "id" => ::String,
+        "name" => ::String,
+        "tags" => {
+          "type" => ::String,
+          # optional key
+          "category" => ::String?
+        },
+        # optional key
+        "on_match" => ::Array[::String]?
+      }
+      type rule_match = {
+        "operator" => ::String,
+        "operator_value" => ::String,
+        "parameters" => ::Array[rule_match_parameter]
+      }
+      type rule_match_parameter = {
+        "address" => ::String,
+        "key_path" => ::Array[::String | ::Integer],
+        "value" => ::String,
+        "highlight" => ::Array[::String]
+      }
+      type actions = ::Hash[::String, action]
+      type action = ::Hash[::String, ::String]
+      type attributes = ::Hash[::String, opaque]
+      type opaque = nil | bool | ::String | ::Integer | ::Float | ::Array[opaque] | ::Hash[::String, opaque]
 
       self.@logger: ::Logger
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.25.1.0.1
+  version: 1.25.1.1.0
 platform: x86_64-linux
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-18 00:00:00.000000000 Z
+date: 2025-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi