libddwaf 1.24.1.1.1 → 1.24.1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd04c19c88c7ceb348c01428cc88c00cc8c2878cef060997b406ae8140abb11
-  data.tar.gz: '06584c7e28bff66f5b4cdc794cadf4e3c542317bfabdae10757e9e9ed06b01b8'
+  metadata.gz: 89f452fa02268a1974c848112cd4e64f8edd8b554ac8213a11b9235b61d11b91
+  data.tar.gz: 1c0f9b2fb00537f199d987eeded1cfe1481f449c10e3aee3ac0b69505d2c3a75
 SHA512:
-  metadata.gz: c640853ce7e66ea7f9debc63fc2479e2f50f9b71f22938b0198116703f1e4445c3157979e3a9f7d2a6cf76441ddfafb5fd1f1349a58f6071369430f3ac1f611f
-  data.tar.gz: 27b2f091feb2bec8034d3fc545cec54680c946e97fd7f238638760cda6a71782eed29953100d362683e92fe2a23480dcfea7da60f5adeac8565da1da9e4b470e
+  metadata.gz: 6d91695b0420253dfd6084c2ac06cd88a88a3688bc252b811b43e25ad416a10607397498189e1a1c6c4416f8ee3960c0195dc387cd081b7b67efb2b28bbee978
+  data.tar.gz: a49843eb2c51806cc8d2f50aadbfce2440e0e9dcfd52a4c352f52106b1e26665577d7011c52cd87f48aa7ad206cb75e0299adfe6da19be1c7d7cececce85dcca

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # 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?`)

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

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

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

@@ -15,15 +15,11 @@ 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_truncated!
+              top_obj&.mark_as_input_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,
@@ -34,6 +30,11 @@ 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
 
@@ -43,22 +44,18 @@ 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_truncated!
+              top_obj&.mark_as_input_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].to_s
+                k = e[0]
                 v = e[1]
 
                 if max_string_length && k.length > max_string_length
-                  k = k[0, max_string_length]
-                  (top_obj || obj).mark_truncated!
+                  k = k.to_s[0, max_string_length]
+                  (top_obj || obj).mark_as_input_truncated!
                 end
                 member = Converter.ruby_to_object(
                   v,
@@ -68,8 +65,13 @@ module Datadog
                   top_obj: top_obj || obj,
                   coerce: coerce
                 )
-                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
+                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
               end
             end
 
@@ -78,20 +80,21 @@ 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] #: String
-              (top_obj || obj).mark_truncated!
+              encoded_val = encoded_val[0, max_string_length]
+              (top_obj || obj).mark_as_input_truncated!
             end
-            res = LibDDWAF.ddwaf_object_stringl(obj, encoded_val, encoded_val.bytesize)
+            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
-            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!
+            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/lib_ddwaf.rb

@@ -137,12 +137,12 @@ module Datadog
             :nbEntries, :uint64,
             :type, :ddwaf_obj_type
 
-          def truncated?
-            @truncated == true
+          def input_truncated?
+            @input_truncated == true
           end
 
-          def mark_truncated!
-            @truncated = true
+          def mark_as_input_truncated!
+            @input_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}.1.1"
+        STRING = "#{BASE_STRING}.2.0"
         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 truncated?: () -> bool
+          def input_truncated?: () -> bool
 
-          def mark_truncated!: () -> bool
+          def mark_as_input_truncated!: () -> bool
         end
 
         # setters

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.24.1.1.1
+  version: 1.24.1.2.0
 platform: ruby
 authors:
 - Datadog, Inc.
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -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: []