libddwaf 1.24.1.2.1 → 1.25.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '029b3d9c81bc6161f7080edb546d4de3820769540747788f766638dd28472776'
-  data.tar.gz: 336fa61a91724299d961cbb03f12347cf51c6cf4f72a05e72f9368e077045c60
+  metadata.gz: 3bc1b4115cc939368bc3f3416ebf7f8436b3226f0c9e95f042b6a75e3dbb61db
+  data.tar.gz: 9b0259689d75ab36ac72a5c8c720eecea3786b830c2a6bc8eb472ee28f0310d6
 SHA512:
-  metadata.gz: a658fc7175a4e87599844a60712284743d4a765d700c3584f9a84acb15f2f230613085be8b7a563090fdffe150640cf5af18d547e08880d68b99bf93259f5e95
-  data.tar.gz: a7616a7818f46cdb402fe0e7b111b927e990e4f5e274a191877685070facf0df85ff91f292b7a88b75272905a7069f7b2e285c17099e8fac0911d3b192baf2c8
+  metadata.gz: 55d7175ad3178b8b2866d2f95bafccfda1d6e0c45ee43f30a6efabc15e58744ceaec7ea92837dfba69cc3fe46af7fd6e17ed2446fc49cfe07282f3ff57a810ba
+  data.tar.gz: 2bd16d83de99d38b2ebbb12e1235c1f2121fd54fe9b33962d43cab73a1b5012e1f1d1fb4de5d322599cfd5fe530269374cb6bf0f6a4466a75f53deae4f084129

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Unreleased
 
+# 2025-09-16 v1.25.1.0.0
+
+## Added
+
+- Add `Result#keep?` method
+
+## Changed
+
+- Change `LibDDWAF::Object#input_truncated?` to `LibDDWAF::Object#truncated?` method
+- Change `LibDDWAF::Object#mark_as_input_truncated?` to `LibDDWAF::Object#mark_truncated?` method
+- Change `Result#timeout` to `Result#timeout?` method
+- Change `Result#derivatives` to `Result#attributes` method
+- Change `Result#total_runtime` to `Result#duration` method
+
 # 2025-09-15 v1.24.1.2.1
 
 ## Fixed

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

@@ -69,18 +69,24 @@ module Datadog
             raise ConversionError, "Could not convert ephemeral data: #{ephemeral_data.inspect}"
           end
 
-          result_obj = LibDDWAF::Result.new
+          result_obj = LibDDWAF::Object.new
           raise LibDDWAFError, "Could not create result object" if result_obj.null?
 
           code = LibDDWAF.ddwaf_run(@context_ptr, persistent_data_obj, ephemeral_data_obj, result_obj, timeout)
+          result = Converter.object_to_ruby(result_obj) #: ::Hash[::String, WAF::data]
+
+          if result.nil?
+            raise ConversionError, "Could not convert result into object: #{code}"
+          end
 
           result = Result.new(
-            RESULT_CODE[code],
-            Converter.object_to_ruby(result_obj[:events]),
-            result_obj[:total_runtime],
-            result_obj[:timeout],
-            Converter.object_to_ruby(result_obj[:actions]),
-            Converter.object_to_ruby(result_obj[:derivatives])
+            status: RESULT_CODE[code],
+            events: result["events"],
+            actions: result["actions"],
+            attributes: result["attributes"],
+            duration: result["duration"], #: ::Integer
+            timeout: result["timeout"],   #: bool
+            keep: result["keep"]          #: bool
           )
 
           if persistent_data_obj.truncated? || ephemeral_data_obj.truncated?
@@ -89,7 +95,7 @@ module Datadog
 
           result
         ensure
-          LibDDWAF.ddwaf_result_free(result_obj) if result_obj
+          LibDDWAF.ddwaf_object_free(result_obj) if result_obj
           LibDDWAF.ddwaf_object_free(ephemeral_data_obj) if ephemeral_data_obj
         end
 

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

@@ -170,7 +170,7 @@ module Datadog
               a << e # steep:ignore
             end
           when :ddwaf_obj_map
-            (0...obj[:nbEntries]).each.with_object({}) do |i, h|
+            (0...obj[:nbEntries]).each.with_object({}) do |i, h| #$ ::Hash[::String, WAF::data]
               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/lib_ddwaf.rb

@@ -253,21 +253,9 @@ module Datadog
         attach_function :ddwaf_context_init, [:ddwaf_handle], :ddwaf_context
         attach_function :ddwaf_context_destroy, [:ddwaf_context], :void
 
-        # Ruby representation of ddwaf_result
-        # See https://github.com/DataDog/libddwaf/blob/10e3a1dfc7bc9bb8ab11a09a9f8b6b339eaf3271/include/ddwaf.h#L154-L173
-        class Result < ::FFI::Struct
-          layout :timeout, :bool,
-            :events, Object,
-            :actions, Object,
-            :derivatives, Object,
-            :total_runtime, :uint64
-        end
-
-        typedef Result.by_ref, :ddwaf_result
         typedef :uint64, :timeout_us
 
-        attach_function :ddwaf_run, [:ddwaf_context, :ddwaf_object, :ddwaf_object, :ddwaf_result, :timeout_us], :ddwaf_ret_code, blocking: true
-        attach_function :ddwaf_result_free, [:ddwaf_result], :void
+        attach_function :ddwaf_run, [:ddwaf_context, :ddwaf_object, :ddwaf_object, :ddwaf_object, :timeout_us], :ddwaf_ret_code, blocking: true
 
         # logging
 

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

@@ -4,17 +4,18 @@ module Datadog
   module AppSec
     module WAF
       # Ruby representation of the ddwaf_result of a libddwaf run.
-      # See https://github.com/DataDog/libddwaf/blob/10e3a1dfc7bc9bb8ab11a09a9f8b6b339eaf3271/include/ddwaf.h#L159-L173
+      # See https://github.com/DataDog/libddwaf/blob/8dbee187ff74a0aa25e1bcbdde51677f77930e1b/include/ddwaf.h#L277-L290
       class Result
-        attr_reader :status, :events, :total_runtime, :timeout, :actions, :derivatives
+        attr_reader :status, :events, :actions, :attributes, :duration
 
-        def initialize(status, events, total_runtime, timeout, actions, derivatives)
+        def initialize(status:, events:, actions:, attributes:, duration:, timeout:, keep:)
           @status = status
           @events = events
-          @total_runtime = total_runtime
-          @timeout = timeout
           @actions = actions
-          @derivatives = derivatives
+          @attributes = attributes
+          @duration = duration
+          @timeout = timeout
+          @keep = keep
           @input_truncated = false
         end
 
@@ -22,6 +23,14 @@ module Datadog
           @input_truncated = true
         end
 
+        def timeout?
+          @timeout
+        end
+
+        def keep?
+          @keep
+        end
+
         def input_truncated?
           @input_truncated
         end
@@ -30,10 +39,12 @@ module Datadog
           {
             status: @status,
             events: @events,
-            total_runtime: @total_runtime,
-            timeout: @timeout,
             actions: @actions,
-            derivatives: @derivatives
+            attributes: @attributes,
+            duration: @duration,
+            timeout: @timeout,
+            keep: @keep,
+            input_truncated: @input_truncated
           }
         end
       end

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

@@ -2,10 +2,10 @@ module Datadog
   module AppSec
     module WAF
       module VERSION
-        BASE_STRING = "1.24.1"
+        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}.2.1"
+        STRING = "#{BASE_STRING}.0.0"
         MINIMUM_RUBY_VERSION = "2.5"
       end
     end

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

@@ -2,9 +2,9 @@ module Datadog
   module AppSec
     module WAF
       module Converter
-        def self.ruby_to_object: (top val, ?max_container_size: ::Integer?, ?max_container_depth: ::Integer?, ?max_string_length: ::Integer?, ?top_obj: LibDDWAF::Object?, ?coerce: bool?) -> LibDDWAF::Object
+        def self?.ruby_to_object: (top val, ?max_container_size: ::Integer?, ?max_container_depth: ::Integer?, ?max_string_length: ::Integer?, ?top_obj: LibDDWAF::Object?, ?coerce: bool?) -> LibDDWAF::Object
 
-        def self.object_to_ruby: (LibDDWAF::Object obj) -> WAF::data
+        def self?.object_to_ruby: (LibDDWAF::Object obj) -> WAF::data
       end
     end
   end

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

@@ -139,11 +139,7 @@ module Datadog
         def self.ddwaf_context_init: (::FFI::Pointer) -> ::FFI::Pointer
         def self.ddwaf_context_destroy: (::FFI::Pointer) -> void
 
-        class Result < ::FFI::Struct[::FFI::AbstractMemory, untyped]
-        end
-
-        def self.ddwaf_run: (::FFI::Pointer, Object, Object, Result, ::Integer) -> ::Symbol
-        def self.ddwaf_result_free: (Result) -> void
+        def self.ddwaf_run: (::FFI::Pointer, Object, Object, Object, ::Integer) -> ::Symbol
 
         # logging
 

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

@@ -6,13 +6,15 @@ module Datadog
 
         @events: WAF::data
 
-        @total_runtime: ::Float
+        @actions: WAF::data
 
-        @timeout: bool
+        @attributes: WAF::data
 
-        @actions: WAF::data
+        @duration: ::Integer
 
-        @derivatives: WAF::data
+        @timeout: bool
+
+        @keep: bool
 
         @input_truncated: bool
 
@@ -20,19 +22,31 @@ module Datadog
 
         attr_reader events: WAF::data
 
-        attr_reader total_runtime: ::Float
-
-        attr_reader timeout: bool
-
         attr_reader actions: WAF::data
 
-        attr_reader derivatives: WAF::data
+        attr_reader attributes: WAF::data
+
+        attr_reader duration: ::Integer
 
-        def initialize: (::Symbol status, WAF::data events, ::Float total_runtime, bool timeout, WAF::data actions, WAF::data derivatives) -> void
+        def initialize: (
+          status: ::Symbol,
+          events: WAF::data,
+          actions: WAF::data,
+          attributes: WAF::data,
+          duration: ::Integer,
+          timeout: bool,
+          keep: bool
+        ) -> void
 
         def mark_input_truncated!: () -> bool
 
+        def timeout?: () -> bool
+
+        def keep?: () -> bool
+
         def input_truncated?: () -> bool
+
+        def to_h: () -> ::Hash[::Symbol, WAF::data]
       end
     end
   end

data/sig/datadog/appsec/waf.rbs

@@ -1,18 +1,18 @@
 module Datadog
   module AppSec
     module WAF
-      type data = String | Symbol | Integer | Float | TrueClass | FalseClass | Array[data] | Hash[(String | Symbol | nil), data] | nil
+      type data = nil | bool | ::String | ::Symbol | ::Integer | ::Float | ::Array[data] | ::Hash[(::String | ::Symbol | nil), data]
       type known_addresses = ::Array[::String]
       type diagnostics = ::Hash[::String, untyped]
 
-      def self.version: () -> ::String
+      def self?.version: () -> ::String
 
       self.@logger: ::Logger
       self.@log_callback: LibDDWAF::ddwaf_log_cb
 
-      def self.log_callback: (LibDDWAF::ddwaf_log_level, ::String, ::String, ::Integer, ::FFI::Pointer, ::Integer) -> void
-      def self.logger: () -> ::Logger
-      def self.logger=: (::Logger logger) -> void
+      def self?.log_callback: (LibDDWAF::ddwaf_log_level, ::String, ::String, ::Integer, ::FFI::Pointer, ::Integer) -> void
+      def self?.logger: () -> ::Logger
+      def self?.logger=: (::Logger logger) -> void
     end
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.24.1.2.1
+  version: 1.25.1.0.0
 platform: ruby
 authors:
 - Datadog, Inc.
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -60,10 +61,10 @@ files:
 - sig/datadog/appsec/waf/result.rbs
 - sig/datadog/appsec/waf/version.rbs
 - sig/libddwaf.rbs
-- vendor/libddwaf/libddwaf-1.24.1-darwin-arm64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.24.1-darwin-x86_64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.24.1-linux-aarch64/lib/libddwaf.so
-- vendor/libddwaf/libddwaf-1.24.1-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.25.1-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.25.1-darwin-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.25.1-linux-aarch64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.25.1-linux-x86_64/lib/libddwaf.so
 - vendor/rbs/gem/0/gem.rbs
 - vendor/rbs/jruby/0/jruby.rbs
 homepage: https://github.com/DataDog/libddwaf-rb
@@ -71,6 +72,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.21
+signing_key:
 specification_version: 4
 summary: Datadog WAF
 test_files: []