libddwaf 1.9.0.0.0-x86_64-linux → 1.10.0.0.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3d3b079c46398119cc5080962dcde58213ffec27c113e92f110538c81ae3b1
-  data.tar.gz: '0008447ec23dce2e0a1e60f59307f412d9f1e770d6120581340a788e232345c4'
+  metadata.gz: 4d56706dbb5d0523cece21cbf535919cfdd84b5853519fa5510932666f670f94
+  data.tar.gz: 4f496a70dcddbc9be0dbbc2b63c946c5d791411f720f7365d69fb7666b4336b9
 SHA512:
-  metadata.gz: 6923163fbb5fd43e51fab5dabdf7eeb137ad9bd5f58c3988c9a1b00460bfc96c0a37b6c88d2bcf118d84f8541298997ded0cfff6288a709669af1d7b81289de5
-  data.tar.gz: a414075a3e051461a693f9737b67c67a2f9b5ea23e45e4b43ddd4d5465fdb49e810781db041236d0dfaff4e7c16cf381413977e650a2d97f294fa3e2fa5c6e9c
+  metadata.gz: 65ba5e74b5c1d30cebf23b4a4c73f9b7ee60a0f9987242c38381656e9007db031767d19e2f46c4c2669c88bce85308b81789951b0788161b166ffc2425027bd0
+  data.tar.gz: 11136155d2460c0a29b9a92d6e0114c763aa40d06eb718e61c0b325fe54ce2a90a7f9877c19d0063cdd18c9a33738ad3fc31c0e3a4c17fb1ef1554e1b573e50f

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2023-06-13 v.1.9.0.0.1
+
+- Handle invalid encoding
+- Ensure strings passed to libddwaf are not clipped inside a code point
+- Ensure strings passed to libddwaf are UTF-8
+
+# 2023-05-17 v1.9.0.0.0
+
+- Update to libddwaf 1.9.0
+- Support [`custom_rules`](https://github.com/DataDog/libddwaf/pull/154)
+
 # 2023-03-03 v1.8.2.0.0
 
 - Update to libddwaf 1.8.2

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

@@ -2,7 +2,7 @@ module Datadog
   module AppSec
     module WAF
       module VERSION
-        BASE_STRING = '1.9.0'
+        BASE_STRING = '1.10.0'
         STRING = "#{BASE_STRING}.0.0"
         MINIMUM_RUBY_VERSION = '2.1'
       end

data/lib/datadog/appsec/waf.rb

@@ -4,6 +4,7 @@ require 'datadog/appsec/waf/version'
 
 module Datadog
   module AppSec
+    # rubocop:disable Metrics/ModuleLength
     module WAF
       module LibDDWAF
         class Error < StandardError
@@ -281,9 +282,9 @@ module Datadog
 
         attach_function :ddwaf_set_log_cb, [:ddwaf_log_cb, :ddwaf_log_level], :bool
 
-        DEFAULT_MAX_CONTAINER_SIZE  = 0
-        DEFAULT_MAX_CONTAINER_DEPTH = 0
-        DEFAULT_MAX_STRING_LENGTH   = 0
+        DEFAULT_MAX_CONTAINER_SIZE  = 256
+        DEFAULT_MAX_CONTAINER_DEPTH = 20
+        DEFAULT_MAX_STRING_LENGTH   = 16_384 # in bytes, UTF-8 worst case being 4x size in terms of code point)
 
         DDWAF_MAX_CONTAINER_SIZE  = 256
         DDWAF_MAX_CONTAINER_DEPTH = 20
@@ -296,6 +297,7 @@ module Datadog
         LibDDWAF.ddwaf_get_version
       end
 
+      # rubocop:disable Metrics/MethodLength
       def self.ruby_to_object(val, max_container_size: nil, max_container_depth: nil, max_string_length: nil, coerce: true)
         case val
         when Array
@@ -349,7 +351,8 @@ module Datadog
           obj
         when String
           obj = LibDDWAF::Object.new
-          val = val.to_s[0, max_string_length] if max_string_length
+          encoded_val = val.to_s.encode('utf-8', invalid: :replace, undef: :replace)
+          val = encoded_val[0, max_string_length] if max_string_length
           str = val.to_s
           res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
           if res.null?
@@ -405,6 +408,7 @@ module Datadog
           ruby_to_object(''.freeze)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def self.object_to_ruby(obj)
         case obj[:type]
@@ -699,5 +703,6 @@ module Datadog
         end
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.9.0.0.0
+  version: 1.10.0.0.0
 platform: x86_64-linux
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -42,7 +42,7 @@ files:
 - lib/datadog/appsec/waf.rb
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.9.0-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.10.0-linux-x86_64/lib/libddwaf.so
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause