libddwaf 1.9.0.0.0-arm64-darwin → 1.10.0.0.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18acb731273f2a665f29c35cc0c26439793e05447efa97c947ddf265b689eaa6
-  data.tar.gz: 67e3d1ddad8b95994387bb6dbf6779d230d357b87ce0d9adfcdea284b9c56462
+  metadata.gz: 48ea46901a764474daf9733ca3655235e4bedf247e1adadb497517809727c294
+  data.tar.gz: 7ed717c36cf6520bad980a427f9f3c9f538d302e3d946fad216f3f9e3330530e
 SHA512:
-  metadata.gz: 9a30225d0d85e0d9986b6047b0f84b3ecb7fe9c308c59ce3df5e61bfc1aa41d242f78dcd7732c50037038bd73ad1c1ef4926e4c473d5aea59f94ebde2ff62472
-  data.tar.gz: 1563fdfa7c38ca57cd6116d92dcb363aefc26e61aedca3077ceeb12cf60809e7d8793d1b25090b543e9b852aae7764787ff956bc1698a6f86c0f0536bbde85bd
+  metadata.gz: 1a52e6ee76024cbb7707f7656b19a13a5d5d75692e411ef37776e037cc291b66b18f285fc5593e565d64936c817165a2616fae3a084f53116de5f86af0429f19
+  data.tar.gz: dab8474352795c1c73fa3fd855c8eca4a6f3eebbda91073e6ec3824b7ab7a2a6b3badcfea707d06bcf051473c60fb4f9970814c23c6de0b2c1b2c9c7a505d9cf

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: arm64-darwin
 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-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.10.0-darwin-arm64/lib/libddwaf.dylib
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Datadog WAF