libddwaf 1.24.1.2.0-arm64-darwin → 1.24.1.2.1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f155da2ea617fe7e28baf77011df01a78a2c2e197eb56cf16b1cc9ff4bec38c7
-  data.tar.gz: 46c22163bc429fd740671fbfe7e98faf83547d975ddd312a5629c3dfe44f191e
+  metadata.gz: 5275d4f1ff861c6abb346748bbc7b7071d529b9381a77b513f9c57d1bca5fd0d
+  data.tar.gz: 4b67b98d8c1c0628deb594dfaab853b4dba5d2f72116f60572e1a0b9bd9a97be
 SHA512:
-  metadata.gz: b516dc2cfc8c780946beedbc4d3e82f8ad7e3c1381319305416fcca9a421db2930f27d7773f061bcba8b53f1b7d377a7234754c76845bd7d2d6b1f0c573c75a9
-  data.tar.gz: 9f0752b9016faf3ccd283481ef0224646b57f37b0226f59786898c72adbda7bd1ce3cbc97881616d9ba79c50bb5959709c80265ee18cc1df1d22a852dd303c5d
+  metadata.gz: 13b0012d3ff0b3def7500a215144b56fc1289a223227261a555eb7e09315a6682d64b93ced8be5b33ad09b503b0e5ac0c04b97c805c96036d9e3cce4164ca851
+  data.tar.gz: 566de2ae665281c21e5471412d89c63ea4927c2a4e2ed97e9b45b8a2563a0f5ea6d53017ff8b2828bf034d39cdcd45bab2285eefb3e5977638a270b67822af49

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

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

@@ -83,7 +83,7 @@ module Datadog
             Converter.object_to_ruby(result_obj[:derivatives])
           )
 
-          if persistent_data_obj.input_truncated? || ephemeral_data_obj.input_truncated?
+          if persistent_data_obj.truncated? || ephemeral_data_obj.truncated?
             result.mark_input_truncated!
           end
 

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

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.24.1.2.0
+  version: 1.24.1.2.1
 platform: arm64-darwin
 authors:
 - Datadog, Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-02 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -69,7 +68,6 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Datadog WAF
 test_files: []