libddwaf 1.24.1.1.0-arm64-darwin → 1.24.1.2.1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a320cedc5fb4c6d94dc099b6a7bafc64affb79eb93cf1dce2780e86c3ee469
-  data.tar.gz: e8930d8fbd01f9bccb5bec8e5083c1dd9cd46af38e293b847e0fb4783fc9bd34
+  metadata.gz: 5275d4f1ff861c6abb346748bbc7b7071d529b9381a77b513f9c57d1bca5fd0d
+  data.tar.gz: 4b67b98d8c1c0628deb594dfaab853b4dba5d2f72116f60572e1a0b9bd9a97be
 SHA512:
-  metadata.gz: 3fd4185e435715d19d2ed3580286e3837a7560de3324ef9c253605a060ab84959879dbd92c1572d476668a48e796243480e1b803577bce77661dd6886769fabe
-  data.tar.gz: 471a5a438ecb9dcab06a0f6a68271e8429fc67436c1f89112e4ac5a795e3ec300d33e851022323ce12b27a80c0492f28cdb0cb1ac4c17010bc4ffc1f3ec01b9d
+  metadata.gz: 13b0012d3ff0b3def7500a215144b56fc1289a223227261a555eb7e09315a6682d64b93ced8be5b33ad09b503b0e5ac0c04b97c805c96036d9e3cce4164ca851
+  data.tar.gz: 566de2ae665281c21e5471412d89c63ea4927c2a4e2ed97e9b45b8a2563a0f5ea6d53017ff8b2828bf034d39cdcd45bab2285eefb3e5977638a270b67822af49

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Unreleased
 
+# 2025-09-15 v1.24.1.2.1
+
+## Fixed
+
+- Fix conversion of non-string Hash keys with potential size truncation
+
+# 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

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.truncated? || ephemeral_data_obj.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

@@ -15,11 +15,15 @@ module Datadog
             res = LibDDWAF.ddwaf_object_array(obj)
             raise ConversionError, "Could not convert into object: #{val}" if res.null?
 
-            max_index = max_container_size - 1 if max_container_size
             if max_container_depth == 0
-              top_obj&.mark_as_input_truncated!
+              top_obj&.mark_truncated!
             else
               val.each.with_index do |e, i|
+                if max_container_size && i >= max_container_size
+                  (top_obj || obj).mark_truncated!
+                  break val
+                end
+
                 member = Converter.ruby_to_object(
                   e,
                   max_container_size: max_container_size,
@@ -30,11 +34,6 @@ module Datadog
                 )
                 e_res = LibDDWAF.ddwaf_object_array_add(obj, member)
                 raise ConversionError, "Could not add to array object: #{e.inspect}" unless e_res
-
-                if max_index && i >= max_index
-                  (top_obj || obj).mark_as_input_truncated!
-                  break val
-                end
               end
             end
 
@@ -44,18 +43,22 @@ module Datadog
             res = LibDDWAF.ddwaf_object_map(obj)
             raise ConversionError, "Could not convert into object: #{val}" if res.null?
 
-            max_index = max_container_size - 1 if max_container_size
             if max_container_depth == 0
-              top_obj&.mark_as_input_truncated!
+              top_obj&.mark_truncated!
             else
               val.each.with_index do |e, i|
+                if max_container_size && i >= max_container_size
+                  (top_obj || obj).mark_truncated!
+                  break val
+                end
+
                 # for Steep, which doesn't handle |(k, v), i|
-                k = e[0]
+                k = e[0].to_s
                 v = e[1]
 
                 if max_string_length && k.length > max_string_length
-                  k = k.to_s[0, max_string_length]
-                  (top_obj || obj).mark_as_input_truncated!
+                  k = k[0, max_string_length]
+                  (top_obj || obj).mark_truncated!
                 end
                 member = Converter.ruby_to_object(
                   v,
@@ -65,13 +68,8 @@ module Datadog
                   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
-
-                if max_index && i >= max_index
-                  (top_obj || obj).mark_as_input_truncated!
-                  break val
-                end
+                kv_res = LibDDWAF.ddwaf_object_map_addl(obj, k, k.bytesize, member)
+                raise ConversionError, "Could not add to map object: #{e[0].inspect} => #{v.inspect}" unless kv_res
               end
             end
 
@@ -80,21 +78,20 @@ module Datadog
             obj = LibDDWAF::Object.new
             encoded_val = val.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
             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!
+              encoded_val = encoded_val[0, max_string_length] #: String
+              (top_obj || obj).mark_truncated!
             end
-            str = encoded_val.to_s
-            res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
+            res = LibDDWAF.ddwaf_object_stringl(obj, encoded_val, encoded_val.bytesize)
             raise ConversionError, "Could not convert into object: #{val.inspect}" if res.null?
 
             obj
           when Symbol
             obj = LibDDWAF::Object.new
-            if max_string_length
-              val = val.to_s[0, max_string_length]
-              (top_obj || obj).mark_as_input_truncated!
-            end
             str = val.to_s
+            if max_string_length && str.length > max_string_length
+              str = str[0, max_string_length] #: String
+              (top_obj || obj).mark_truncated!
+            end
             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/lib_ddwaf.rb

@@ -137,12 +137,12 @@ module Datadog
             :nbEntries, :uint64,
             :type, :ddwaf_obj_type
 
-          def input_truncated?
-            @input_truncated == true
+          def truncated?
+            @truncated == true
           end
 
-          def mark_as_input_truncated!
-            @input_truncated = true
+          def mark_truncated!
+            @truncated = true
           end
         end
 

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}.1.0"
+        STRING = "#{BASE_STRING}.2.1"
         MINIMUM_RUBY_VERSION = "2.5"
       end
     end

data/lib/libddwaf.rb

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

data/libddwaf.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email = ["dev@datadoghq.com"]
 
   spec.summary = "Datadog WAF"
-  spec.description = <<-EOS.gsub(/^[\s]+/, "")
+  spec.description = <<-EOS.gsub(/^\s+/, "")
     libddwaf packages a WAF implementation in C++, exposed to Ruby
   EOS
 

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

@@ -58,9 +58,9 @@ module Datadog
         end
 
         class Object < ::FFI::Struct[::FFI::AbstractMemory, untyped]
-          def input_truncated?: () -> bool
+          def truncated?: () -> bool
 
-          def mark_as_input_truncated!: () -> bool
+          def mark_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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.24.1.1.0
+  version: 1.24.1.2.1
 platform: arm64-darwin
 authors:
 - Datadog, Inc.
 bindir: bin
 cert_chain: []
-date: 2025-08-15 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi