libddwaf 1.5.1.0.0 → 1.6.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d7409fb731162a26f8ab1a510f2aa3282a9d1889afee95cbc4468be3116f5d
-  data.tar.gz: c92a1e8d70a5cdc3a8b2d9e42526418013a0d103aa1f827ba47cb857e137281f
+  metadata.gz: a14d9606c53c7e901f31bc52052569ddf2f5d43929fa87f00dc23b2808c3fee0
+  data.tar.gz: 366d380f4c606912300055fe6be9752518d914ac45fde0d9a7d88ee8adecd5d4
 SHA512:
-  metadata.gz: a256ca93952b9633869b4801212251d04c9d64a84b8276dbc58df0e5aa8249258d4005a2204e3c4db1d2b768f52c9d265731da5c1b0a696a1f812ef7b5662ef1
-  data.tar.gz: e947f17969ddbe0b996835acff0eff24f7870eacbe1a19df3536623c65ccf9b9c5d392d518e318e657ef4da3513f0f885fb9a040c9c3b7e603ddf13b8af88339
+  metadata.gz: 61b7d74bfab9a0ed140b61c1d9c5fc0052c85ce549095b31a8ab1aa17fd9763c8a707123e6443eae58bd1ef0767da7fd7c9d4f5ee78f34882eb7179bef7f8652
+  data.tar.gz: c424feb013a940bdbc1e22f2c1fb3a6e335a0cd043bbf4d4aa87a568c917b36590e344d0a46dd6cb5c2d1fe14e4823bb1e928ae3366e29c1d038912a13c01c42

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2023-02-03 v1.6.2.0.0
+
+- Update to libddwaf 1.6.2
+- Add specs for the getter functions
+
+# 2023-02-01 v1.5.1.0.1
+
+- Fix incorrect size in input string limit
+- Fix object freeing on `update_rule_data` and `toggle_rules`
+
 # 2022-10-04 v1.5.1.0.0
 
 - Update to libddwaf 1.5.1

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

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

data/lib/datadog/appsec/waf.rb

@@ -182,6 +182,7 @@ module Datadog
         attach_function :ddwaf_object_get_unsigned, [:ddwaf_object], :uint64
         attach_function :ddwaf_object_get_signed, [:ddwaf_object], :int64
         attach_function :ddwaf_object_get_index, [:ddwaf_object, :size_t], :ddwaf_object
+        attach_function :ddwaf_object_get_bool, [:ddwaf_object], :bool
 
         ## freeers
 
@@ -203,8 +204,8 @@ module Datadog
           end
 
           class Obfuscator < ::FFI::Struct
-            layout :key_regex,   :pointer, # :charptr
-                   :value_regex, :pointer  # :charptr
+            layout :key_regex,   :pointer, # should be :charptr
+                   :value_regex, :pointer  # should be :charptr
           end
 
           layout :limits,     Limits,
@@ -539,15 +540,21 @@ module Datadog
         end
 
         def update_rule_data(data)
-          res = Datadog::AppSec::WAF::LibDDWAF.ddwaf_update_rule_data(@handle_obj, Datadog::AppSec::WAF.ruby_to_object(data, coerce: false))
+          data_obj = Datadog::AppSec::WAF.ruby_to_object(data, coerce: false)
+          res = Datadog::AppSec::WAF::LibDDWAF.ddwaf_update_rule_data(@handle_obj, data_obj)
 
           RESULT_CODE[res]
+        ensure
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(data_obj) if data_obj
         end
 
         def toggle_rules(map)
-          res = Datadog::AppSec::WAF::LibDDWAF.ddwaf_toggle_rules(@handle_obj, Datadog::AppSec::WAF.ruby_to_object(map, coerce: false))
+          map_obj = Datadog::AppSec::WAF.ruby_to_object(map, coerce: false)
+          res = Datadog::AppSec::WAF::LibDDWAF.ddwaf_toggle_rules(@handle_obj, map_obj)
 
           RESULT_CODE[res]
+        ensure
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(map_obj) if map_obj
         end
 
         private
@@ -627,7 +634,7 @@ module Datadog
 
           max_container_size  = LibDDWAF::DDWAF_MAX_CONTAINER_SIZE
           max_container_depth = LibDDWAF::DDWAF_MAX_CONTAINER_DEPTH
-          max_string_length   = LibDDWAF::DDWAF_MAX_CONTAINER_SIZE
+          max_string_length   = LibDDWAF::DDWAF_MAX_STRING_LENGTH
 
           input_obj = Datadog::AppSec::WAF.ruby_to_object(input,
                                                           max_container_size: max_container_size,

data/sig/datadog/appsec/waf.rbs

@@ -74,6 +74,7 @@ module Datadog
         def self.ddwaf_object_get_unsigned: (LibDDWAF::Object, SizeTPtr) -> ::Integer
         def self.ddwaf_object_get_signed: (LibDDWAF::Object, SizeTPtr) -> ::Integer
         def self.ddwaf_object_get_index: (LibDDWAF::Object, ::Integer) -> LibDDWAF::Object
+        def self.ddwaf_object_get_bool: (LibDDWAF::Object) -> bool
 
         # freeers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.5.1.0.0
+  version: 1.6.2.0.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi