libddwaf 1.30.0.0.1-aarch64-linux → 1.30.0.1.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02594612a51764ecbe10e415981518b68d928835b504fcba490421973b0e1385'
-  data.tar.gz: 214f7da6173c96939c0a4ce7da4e1b9b699355c31bd1ecc1505d16c72c9ebb8b
+  metadata.gz: 9de78da9a9a968ff60082db468c27dc6fe91ce75935a0bbc4743095450b51a5e
+  data.tar.gz: 9d572b8dc18d6fa5d3a930e5da0434973a73155cbfbdd96fe7f4a69e2f7aedec
 SHA512:
-  metadata.gz: 9a0194383210d47924469879e4f5c2b4cef81bc874dbe165a6d75f89545a94e9ac817817ca4fe7088871eb4b858256acfcec77859591d6693825542926db3a7e
-  data.tar.gz: 6e54c0473a6463fcb2ed395c08435fc1c7b60d08dc2d17a23327a622786cf4030297eb9a7f92e4493b71d52eff8de0b0a038191feeefffaa9c42a86e3bb65920
+  metadata.gz: f46193c941b2e1f53fc86d9fa9b30bfe33be6f88e446de94e8268842c2da36d860df8606112d3877eae32751abc8452f1ca3ee591c3edb818b4b7a2db3c7e139
+  data.tar.gz: 50189195de9d2805ee21fa7669cfa57c838d37f7ad20f1e3e53156feb21c050288e090396e91fda9ccdaad425a69a904f589d479c976be0d96fbef4b873cb82c

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

@@ -6,6 +6,7 @@ module Datadog
       # Module responsible for Ruby-to-C and C-to-Ruby conversions
       module Converter
         INT64_MIN = -(2**63)
+        UINT32_MAX = 2**32 - 1
         UINT64_MAX = 2**64 - 1
 
         module_function
@@ -14,8 +15,8 @@ module Datadog
         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
-            res = LibDDWAF.ddwaf_object_array(obj)
+            container = LibDDWAF::Object.new
+            res = LibDDWAF.ddwaf_object_array(container)
             raise ConversionError, "Could not convert into object: #{val}" if res.null?
 
             if max_container_depth == 0
@@ -23,7 +24,7 @@ module Datadog
             else
               val.each.with_index do |e, i|
                 if max_container_size && i >= max_container_size
-                  (top_obj || obj).mark_truncated!
+                  (top_obj || container).mark_truncated!
                   break val
                 end
 
@@ -32,18 +33,19 @@ module Datadog
                   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,
+                  top_obj: top_obj || container,
                   coerce: coerce
                 )
-                e_res = LibDDWAF.ddwaf_object_array_add(obj, member)
+                e_res = LibDDWAF.ddwaf_object_array_add(container, member)
                 raise ConversionError, "Could not add to array object: #{e.inspect}" unless e_res
               end
             end
 
-            obj
+            container_complete = true
+            container
           when Hash
-            obj = LibDDWAF::Object.new
-            res = LibDDWAF.ddwaf_object_map(obj)
+            container = LibDDWAF::Object.new
+            res = LibDDWAF.ddwaf_object_map(container)
             raise ConversionError, "Could not convert into object: #{val}" if res.null?
 
             if max_container_depth == 0
@@ -51,7 +53,7 @@ module Datadog
             else
               val.each.with_index do |e, i|
                 if max_container_size && i >= max_container_size
-                  (top_obj || obj).mark_truncated!
+                  (top_obj || container).mark_truncated!
                   break val
                 end
 
@@ -61,21 +63,32 @@ module Datadog
 
                 if max_string_length && k.length > max_string_length
                   k = k[0, max_string_length]
-                  (top_obj || obj).mark_truncated!
+                  (top_obj || container).mark_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,
+                  top_obj: top_obj || container,
                   coerce: coerce
                 )
-                kv_res = LibDDWAF.ddwaf_object_map_addl(obj, k, k.bytesize, member)
+                kv_res = LibDDWAF.ddwaf_object_map_addl(container, k, k.bytesize, member)
                 raise ConversionError, "Could not add to map object: #{e[0].inspect} => #{v.inspect}" unless kv_res
               end
             end
 
+            container_complete = true
+            container
+          when JSONString
+            length = val.bytesize
+            raise ConversionError, "JSON string exceeds the native length limit" if length > UINT32_MAX
+
+            obj = LibDDWAF::Object.new
+            unless LibDDWAF.ddwaf_object_from_json(obj, val, length)
+              raise ConversionError, "Could not convert JSON string"
+            end
+
             obj
           when String
             obj = LibDDWAF::Object.new
@@ -146,6 +159,8 @@ module Datadog
           else
             Converter.ruby_to_object("")
           end
+        ensure
+          LibDDWAF.ddwaf_object_free(container) if container && !container_complete
         end
         # standard:enable Metrics/MethodLength,Metrics/CyclomaticComplexity
 

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

@@ -161,6 +161,7 @@ module Datadog
         attach_function :ddwaf_object_bool, [:ddwaf_object, :bool], :ddwaf_object
         attach_function :ddwaf_object_null, [:ddwaf_object], :ddwaf_object
         attach_function :ddwaf_object_float, [:ddwaf_object, :double], :ddwaf_object
+        attach_function :ddwaf_object_from_json, [:ddwaf_object, :charptr, :uint32], :bool
 
         attach_function :ddwaf_object_array, [:ddwaf_object], :ddwaf_object
         attach_function :ddwaf_object_array_add, [:ddwaf_object, :ddwaf_object], :bool

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

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

data/lib/datadog/appsec/waf.rb

@@ -13,6 +13,10 @@ require "datadog/appsec/waf/version"
 module Datadog
   module AppSec
     module WAF
+      # A marker class representing string containing JSON.
+      # If given as an address value will trigger parsing into native WAF objects
+      JSONString = Class.new(String)
+
       module_function
 
       def version

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

@@ -2,6 +2,12 @@ module Datadog
   module AppSec
     module WAF
       module Converter
+        INT64_MIN: Integer
+
+        UINT32_MAX: Integer
+
+        UINT64_MAX: Integer
+
         def self?.ruby_to_object: (
           top val,
           ?max_container_size: ::Integer?,

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

@@ -78,6 +78,7 @@ module Datadog
         def self.ddwaf_object_bool: (LibDDWAF::Object, bool) -> ::FFI::Pointer
         def self.ddwaf_object_float: (LibDDWAF::Object, ::Float) -> ::FFI::Pointer
         def self.ddwaf_object_null: (LibDDWAF::Object) -> ::FFI::Pointer
+        def self.ddwaf_object_from_json: (LibDDWAF::Object, String, Integer) -> bool
 
         def self.ddwaf_object_array: (LibDDWAF::Object) -> ::FFI::Pointer
         def self.ddwaf_object_array_add: (LibDDWAF::Object, LibDDWAF::Object) -> bool

data/sig/datadog/appsec/waf.rbs

@@ -42,6 +42,9 @@ module Datadog
       type attributes = ::Hash[::String, opaque]
       type opaque = nil | bool | ::String | ::Integer | ::Float | ::Array[opaque] | ::Hash[::String, opaque]
 
+      class JSONString < String
+      end
+
       self.@logger: ::Logger
 
       self.@log_callback: LibDDWAF::ddwaf_log_cb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.30.0.0.1
+  version: 1.30.0.1.0
 platform: aarch64-linux
 authors:
 - Datadog, Inc.
 bindir: bin
 cert_chain: []
-date: 2026-02-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Datadog WAF
 test_files: []