libddwaf 1.9.0.0.0-java → 1.10.0.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f3cf2534d94511ff8bb3bca6c3f8adc7944840fdcd4b8b6a6a650f9c195fd9
-  data.tar.gz: f621a161f68cf6969909138ac18dfb38c91a5a0dae1a87eba30c78b2b257ec83
+  metadata.gz: 4f22f410eb5a68fe9d23a9c08703e8aa1fce8811c5d411427444a5b4e0ca5555
+  data.tar.gz: ff895b4796b05bda7da88c04aa74399089f1a3a82917af8286b8f5733a132e2d
 SHA512:
-  metadata.gz: 0ce2ea4cdcda41484631b9c99238ddba81bcc728c737dfb9031b509ad444f66ed41ef10cd836d5d11824f75d72dc18202824cada909059e0633ae6708827f998
-  data.tar.gz: d563e57c64429332a3b554b6395a67cae19bd8f5c652a16e1f9fda1e27a1d5b73cac79c57183a1d55e38a33831c0a5fed9aa1d1646b25f5db53abb69f2dec38f
+  metadata.gz: 903cb14667ae70f0cd7c721696433e243491061aea3f607df1ba74efba0a8b034f9ac9ee77ded7b477d120d299032b0727a11baff88e2572460e20382bb6e87a
+  data.tar.gz: d5ee811a7bfcdf1bd6bea1b346ae4a2c8641251fe491239379ef12f9775c3353b8e4cb8f46ce52f7a53327b7458dc614c8cd0c6f2e9dda9b04a8aac0c946fdcc

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: java
 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,10 +42,10 @@ files:
 - lib/datadog/appsec/waf.rb
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.9.0-darwin-arm64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.9.0-darwin-x86_64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.9.0-linux-aarch64/lib/libddwaf.so
-- vendor/libddwaf/libddwaf-1.9.0-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.10.0-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.10.0-darwin-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.10.0-linux-aarch64/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