libddwaf 1.24.1.0.3-x86_64-darwin → 1.24.1.2.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6086f8024bce863cbf2a9eeb02cd3551c219f529193236d4b991f802c49484
-  data.tar.gz: d14f7abf62b00ffbd0ccdf914f6b60518d29cee11485148d3ad61df672408e07
+  metadata.gz: c307d3853359633c27951b5b01851ff85bcf573e49651877d944eaf6e4d69be6
+  data.tar.gz: 368c663258d6f4645195fce8329986d9db27ff3a8a609dca6e1c9c4e02826a06
 SHA512:
-  metadata.gz: f0d8bd86adb320a3ce6751de9c05d99bacb7cf46c88e0a07bddf70f6a27e8cbb0233de20c0e99262e27f4f2ad82287ac1a40f093bc33eb3c459a62ecaa0195a9
-  data.tar.gz: 7c21be204e222420df8c73dfe35a8c30d63f108fc9c7dde8405af57c5c351b0333d8fb59388a9287d6bcfa84ff4936bacef6f117c6e6917e39895f5963cfbdda
+  metadata.gz: 8e3f47f9e0ce640144c86411db27a6c0390d6a5194da34b182e328307f689532f1d5527815596ebda5028f44a3296f07033f8b33430bc2eb98a1e64ff83acd6c
+  data.tar.gz: d49b9b18b00930368827eedf1db22949857935555bc9bd8a6e3a090d9376ce11f8005451c8f8c03e41556388418f384b92fb138e05fe6dc2fcf96030c30bd839

data/CHANGELOG.md

@@ -1,4 +1,22 @@
-# Unreleased v1.23.0.0.0
+# Unreleased
+
+# 2025-09-02 v1.24.1.2.0
+
+## Added
+
+- Add `WAF::Result#input_truncated?` method that indicates that result is based on truncated input objects (see `LibDDWAF::Object#input_truncated?`)
+
+# 2025-08-15 v1.24.1.1.0
+
+## Added
+
+- Add `LibDDWAF::Object#input_truncated?` method that returns true if the input object was truncated during conversion to libddwaf object
+
+## Changed
+
+- Change `Handle#known_addresses` to cache the result
+
+# 2025-05-20 v1.24.1.0.0
 
 ## Added
 

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

@@ -74,7 +74,7 @@ module Datadog
 
           code = LibDDWAF.ddwaf_run(@context_ptr, persistent_data_obj, ephemeral_data_obj, result_obj, timeout)
 
-          Result.new(
+          result = Result.new(
             RESULT_CODE[code],
             Converter.object_to_ruby(result_obj[:events]),
             result_obj[:total_runtime],
@@ -82,6 +82,12 @@ module Datadog
             Converter.object_to_ruby(result_obj[:actions]),
             Converter.object_to_ruby(result_obj[:derivatives])
           )
+
+          if persistent_data_obj.input_truncated? || ephemeral_data_obj.input_truncated?
+            result.mark_input_truncated!
+          end
+
+          result
         ensure
           LibDDWAF.ddwaf_result_free(result_obj) if result_obj
           LibDDWAF.ddwaf_object_free(ephemeral_data_obj) if ephemeral_data_obj

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

@@ -8,7 +8,7 @@ module Datadog
         module_function
 
         # standard:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
-        def ruby_to_object(val, max_container_size: nil, max_container_depth: nil, max_string_length: nil, coerce: true)
+        def ruby_to_object(val, max_container_size: nil, max_container_depth: nil, max_string_length: nil, top_obj: nil, coerce: true)
           case val
           when Array
             obj = LibDDWAF::Object.new
@@ -16,19 +16,25 @@ module Datadog
             raise ConversionError, "Could not convert into object: #{val}" if res.null?
 
             max_index = max_container_size - 1 if max_container_size
-            unless max_container_depth == 0
+            if max_container_depth == 0
+              top_obj&.mark_as_input_truncated!
+            else
               val.each.with_index do |e, i|
                 member = Converter.ruby_to_object(
                   e,
                   max_container_size: max_container_size,
                   max_container_depth: (max_container_depth - 1 if max_container_depth),
                   max_string_length: max_string_length,
+                  top_obj: top_obj || obj,
                   coerce: coerce
                 )
                 e_res = LibDDWAF.ddwaf_object_array_add(obj, member)
                 raise ConversionError, "Could not add to array object: #{e.inspect}" unless e_res
 
-                break val if max_index && i >= max_index
+                if max_index && i >= max_index
+                  (top_obj || obj).mark_as_input_truncated!
+                  break val
+                end
               end
             end
 
@@ -39,24 +45,33 @@ module Datadog
             raise ConversionError, "Could not convert into object: #{val}" if res.null?
 
             max_index = max_container_size - 1 if max_container_size
-            unless max_container_depth == 0
+            if max_container_depth == 0
+              top_obj&.mark_as_input_truncated!
+            else
               val.each.with_index do |e, i|
                 # for Steep, which doesn't handle |(k, v), i|
                 k = e[0]
                 v = e[1]
 
-                k = k.to_s[0, max_string_length] if max_string_length
+                if max_string_length && k.length > max_string_length
+                  k = k.to_s[0, max_string_length]
+                  (top_obj || obj).mark_as_input_truncated!
+                end
                 member = Converter.ruby_to_object(
                   v,
                   max_container_size: max_container_size,
                   max_container_depth: (max_container_depth - 1 if max_container_depth),
                   max_string_length: max_string_length,
+                  top_obj: top_obj || obj,
                   coerce: coerce
                 )
                 kv_res = LibDDWAF.ddwaf_object_map_addl(obj, k.to_s, k.to_s.bytesize, member)
                 raise ConversionError, "Could not add to map object: #{k.inspect} => #{v.inspect}" unless kv_res
 
-                break val if max_index && i >= max_index
+                if max_index && i >= max_index
+                  (top_obj || obj).mark_as_input_truncated!
+                  break val
+                end
               end
             end
 
@@ -64,15 +79,21 @@ module Datadog
           when String
             obj = LibDDWAF::Object.new
             encoded_val = val.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
-            val = encoded_val[0, max_string_length] if max_string_length
-            str = val.to_s
+            if max_string_length && encoded_val.length > max_string_length
+              encoded_val = encoded_val[0, max_string_length]
+              (top_obj || obj).mark_as_input_truncated!
+            end
+            str = encoded_val.to_s
             res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
             raise ConversionError, "Could not convert into object: #{val.inspect}" if res.null?
 
             obj
           when Symbol
             obj = LibDDWAF::Object.new
-            val = val.to_s[0, max_string_length] if max_string_length
+            if max_string_length
+              val = val.to_s[0, max_string_length]
+              (top_obj || obj).mark_as_input_truncated!
+            end
             str = val.to_s
             res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
             raise ConversionError, "Could not convert into object: #{val.inspect}" if res.null?

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

@@ -37,6 +37,8 @@ module Datadog
         #
         # @return [Array<String>] the list of known addresses
         def known_addresses
+          return @known_addresses if defined?(@known_addresses)
+
           ensure_pointer_presence!
 
           count = LibDDWAF::UInt32Ptr.new
@@ -44,7 +46,7 @@ module Datadog
 
           return [] if count == 0 # list is null
 
-          list.get_array_of_string(0, count[:value])
+          @known_addresses = list.get_array_of_string(0, count[:value]).compact
         end
 
         private

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

@@ -136,6 +136,14 @@ module Datadog
             :valueUnion, ObjectValueUnion,
             :nbEntries, :uint64,
             :type, :ddwaf_obj_type
+
+          def input_truncated?
+            @input_truncated == true
+          end
+
+          def mark_as_input_truncated!
+            @input_truncated = true
+          end
         end
 
         typedef Object.by_ref, :ddwaf_object

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

@@ -15,6 +15,15 @@ module Datadog
           @timeout = timeout
           @actions = actions
           @derivatives = derivatives
+          @input_truncated = false
+        end
+
+        def mark_input_truncated!
+          @input_truncated = true
+        end
+
+        def input_truncated?
+          @input_truncated
         end
 
         def to_h

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

@@ -5,7 +5,7 @@ module Datadog
         BASE_STRING = "1.24.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.3"
+        STRING = "#{BASE_STRING}.2.0"
         MINIMUM_RUBY_VERSION = "2.5"
       end
     end

data/lib/libddwaf.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "datadog/appsec/waf"

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

@@ -2,7 +2,7 @@ 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?, ?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
       end

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

@@ -10,7 +10,7 @@ module Datadog
 
         def build_context: () -> Context
 
-        def known_addresses: () -> ::Array[::String?]
+        def known_addresses: () -> known_addresses
 
         private
 

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

@@ -58,6 +58,9 @@ module Datadog
         end
 
         class Object < ::FFI::Struct[::FFI::AbstractMemory, untyped]
+          def input_truncated?: () -> bool
+
+          def mark_as_input_truncated!: () -> bool
         end
 
         # setters

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

@@ -14,6 +14,8 @@ module Datadog
 
         @derivatives: WAF::data
 
+        @input_truncated: bool
+
         attr_reader status: ::Symbol
 
         attr_reader events: WAF::data
@@ -27,6 +29,10 @@ module Datadog
         attr_reader derivatives: WAF::data
 
         def initialize: (::Symbol status, WAF::data events, ::Float total_runtime, bool timeout, WAF::data actions, WAF::data derivatives) -> void
+
+        def mark_input_truncated!: () -> bool
+
+        def input_truncated?: () -> bool
       end
     end
   end

data/sig/datadog/appsec/waf.rbs

@@ -2,6 +2,8 @@ module Datadog
   module AppSec
     module WAF
       type data = String | Symbol | Integer | Float | TrueClass | FalseClass | Array[data] | Hash[(String | Symbol | nil), data] | nil
+      type known_addresses = ::Array[::String]
+      type diagnostics = ::Hash[::String, untyped]
 
       def self.version: () -> ::String
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.24.1.0.3
+  version: 1.24.1.2.0
 platform: x86_64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-23 00:00:00.000000000 Z
+date: 2025-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi