libddwaf 1.5.1.0.0-java → 1.6.2.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1054077e5a63048aa75da4146cb795e14c7195ec5da4287d91408b04016c23f2
-  data.tar.gz: f149053d529ce5b711431d78aec9692feba59efbf7ce96da341ca4a02a0b4a3c
+  metadata.gz: 570753ae6c8f0a8c8f6ec5b320b976bc2b3ccbedfbe54560a6b9205526898c98
+  data.tar.gz: 0d58c876f3c24136b162bdbb5b887c6b5b90c2feeb62ac8dd619454f772822e5
 SHA512:
-  metadata.gz: 6c0cd009021993f6ed49586425e7619b906c8b1c2361174569a60b19bfd5ba01daf7e078eadbabaca8c8264c48b77689dda9cbef7cf38b5cd4c81d6c25912857
-  data.tar.gz: adef30898cc0e609f7847462aa768311ed626223ad603fa8e2dd8d94f01383b36fc8e19323f9df54c30a7cd51a0334f1e4319728d8963ee56d34ec6fbf730861
+  metadata.gz: 10f4a7dc13804a9b9e98ee8816d0bebd0777c09d0b74279c238c26851e0298cb7afdb05df47ac4ff748796e04cc524486439544b0ab94ffa6bbeac1e73e8d3ab
+  data.tar.gz: 137b0219242ce6e7f7c6c381fdd32c2723fc1e76b9996e55ce32ef177ee949c84940e31c87586f90d925998321a8259a146836ab2b04114407dc9fc7a89d1b18

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,

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: java
 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
@@ -42,10 +42,10 @@ files:
 - lib/datadog/appsec/waf.rb
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.5.1-darwin-arm64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.5.1-darwin-x86_64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.5.1-linux-aarch64/lib/libddwaf.so
-- vendor/libddwaf/libddwaf-1.5.1-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.6.2-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.6.2-darwin-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.6.2-linux-aarch64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.6.2-linux-x86_64/lib/libddwaf.so
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause