libddwaf 1.2.1.0.0.beta1-x86_64-linux → 1.3.0.0.0.beta1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef97eb6550b7997fb3faa4df9cad2d72cb9f0dbf49984a29ab0285a5c017de24
-  data.tar.gz: 9d54ccb0e16368c384e5c426ceb7ea45d559fdf3df7ab49e5b825f2da860ee40
+  metadata.gz: 7bc5c9fe7ea4ddb3f702f4110ae11431fd30f5a8074cbb3a6281c405fea762f7
+  data.tar.gz: f6ed9eec1185c8892abf39a5fec037c4c57c2ba0c5df28ca746cae02ed64619f
 SHA512:
-  metadata.gz: d76c4ef63aa06f7cf6258214b82fbaacf717457fdb06685a037a9bf941bc0c98a8adf84739f36a94e2aebe38962b537158353eab3472792d7cf6f7cc2115b02c
-  data.tar.gz: d29fcb5ea96f44ba6b3b19108b6c3be2a84da0ce23be58d8dcf86dc4c39dd88954f418bd485abae3d13b46de594610e0749c5f470b1adf5a83ffa79f0084e7f3
+  metadata.gz: 30797f5c179c9d4026ecff9240a6b622b74de731622eaf87d0efc9915e83b048df1942ad716ba48224ed44371e7fdc7af2afa120aecd491f6f1e83866b2b9857
+  data.tar.gz: b1507f2871b2b73cb24e595acdbf9b233203307ea9eae05759d47b486a1cf2f4d3b78a029572f2f2df030f5394d3548d51dc13fe2c09db29a18307567a781e8c

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

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

data/lib/datadog/appsec/waf.rb

@@ -151,8 +151,19 @@ module Datadog
         typedef Object.by_ref, :ddwaf_rule
 
         class Config < ::FFI::Struct
-          layout :maxArrayLength, :uint64,
-                 :maxMapDepth,    :uint64
+          class Limits < ::FFI::Struct
+            layout :max_container_size,  :uint32,
+                   :max_container_depth, :uint32,
+                   :max_string_length,   :uint32
+          end
+
+          class Obfuscator < ::FFI::Struct
+            layout :key_regex,   :string,
+                   :value_regex, :string
+          end
+
+          layout :limits,     Limits,
+                 :obfuscator, Obfuscator
         end
 
         typedef Config.by_ref, :ddwaf_config
@@ -339,8 +350,9 @@ module Datadog
       class Handle
         attr_reader :handle_obj
 
-        DEFAULT_MAX_ARRAY_LENGTH = 0
-        DEFAULT_MAX_MAP_DEPTH = 0
+        DEFAULT_MAX_CONTAINER_SIZE  = 0
+        DEFAULT_MAX_CONTAINER_DEPTH = 0
+        DEFAULT_MAX_STRING_LENGTH   = 0
 
         def initialize(rule, config = {})
           rule_obj = Datadog::AppSec::WAF.ruby_to_object(rule)
@@ -353,8 +365,9 @@ module Datadog
             fail LibDDWAF::Error, 'Could not create config struct'
           end
 
-          config_obj[:maxArrayLength] = config[:max_array_length] || DEFAULT_MAX_ARRAY_LENGTH
-          config_obj[:maxMapDepth]    = config[:max_map_depth]    || DEFAULT_MAX_MAP_DEPTH
+          config_obj[:limits][:max_container_size]  = config[:max_container_size]  || DEFAULT_MAX_CONTAINER_SIZE
+          config_obj[:limits][:max_container_depth] = config[:max_container_depth] || DEFAULT_MAX_CONTAINER_DEPTH
+          config_obj[:limits][:max_string_length]   = config[:max_string_length]   || DEFAULT_MAX_STRING_LENGTH
 
           ruleset_info = LibDDWAF::RuleSetInfoNone
 

data/vendor/libddwaf/{libddwaf-1.2.1-linux-x86_64 → libddwaf-1.3.0-linux-x86_64}/include/ddwaf.h

@@ -17,8 +17,8 @@ extern "C"
 #include <stddef.h>
 
 #define DDWAF_MAX_STRING_LENGTH 4096
-#define DDWAF_MAX_MAP_DEPTH 20
-#define DDWAF_MAX_ARRAY_LENGTH 256
+#define DDWAF_MAX_CONTAINER_DEPTH 20
+#define DDWAF_MAX_CONTAINER_SIZE 256
 #define DDWAF_RUN_TIMEOUT 5000
 
 /**
@@ -114,10 +114,22 @@ struct _ddwaf_object
  **/
 struct _ddwaf_config
 {
-    /** Maximum length of ddwaf::object arrays. */
-    uint64_t maxArrayLength;
-    /** Maximum depth of ddwaf::object maps. */
-    uint64_t maxMapDepth;
+    struct {
+        /** Maximum size of ddwaf::object containers. */
+        uint32_t max_container_size;
+        /** Maximum depth of ddwaf::object containers. */
+        uint32_t max_container_depth;
+        /** Maximum length of ddwaf::object strings. */
+        uint32_t max_string_length;
+    } limits;
+
+    /** Obfuscator regexes - the strings are owned by the caller */
+    struct {
+        /** Regular expression for key-based obfuscation */
+        const char *key_regex;
+        /** Regular expression for value-based obfuscation */
+        const char *value_regex;
+    } obfuscator;
 };
 
 /**

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.2.1.0.0.beta1
+  version: 1.3.0.0.0.beta1
 platform: x86_64-linux
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -41,8 +41,8 @@ files:
 - lib/datadog/appsec/waf.rb
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.2.1-linux-x86_64/include/ddwaf.h
-- vendor/libddwaf/libddwaf-1.2.1-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.3.0-linux-x86_64/include/ddwaf.h
+- vendor/libddwaf/libddwaf-1.3.0-linux-x86_64/lib/libddwaf.so
 homepage: https://github.com/DataDog/libddwaf
 licenses:
 - BSD-3-Clause