libddwaf 1.7.0.0.0-arm64-darwin → 1.9.0.0.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a86102661b2802b6529f9b31ae4aed0ae4177a754909ae8e7946bdd3e20b1e0
-  data.tar.gz: fa1d2e4a3868adf8d276909a4bb428d32166049594f33bfd59f6ce6d4a1ab43b
+  metadata.gz: 18acb731273f2a665f29c35cc0c26439793e05447efa97c947ddf265b689eaa6
+  data.tar.gz: 67e3d1ddad8b95994387bb6dbf6779d230d357b87ce0d9adfcdea284b9c56462
 SHA512:
-  metadata.gz: a4875e3cc1983a73b0b4fc81f04ded91670d438df4fe08dbd6f4221cad7d544a6a4fac4f27d9c7db26d8fc39508018efebc4546ed5912b9160d3a113e2fbe826
-  data.tar.gz: e3d6b96c3e7f2ea57d7ff0e68d741a3cb264c204462f98da7799026cd003202b7a1cce78f4c8d8778e290f6e62df7872feae98aa35c6ad5e422fea2395e16f3f
+  metadata.gz: 9a30225d0d85e0d9986b6047b0f84b3ecb7fe9c308c59ce3df5e61bfc1aa41d242f78dcd7732c50037038bd73ad1c1ef4926e4c473d5aea59f94ebde2ff62472
+  data.tar.gz: 1563fdfa7c38ca57cd6116d92dcb363aefc26e61aedca3077ceeb12cf60809e7d8793d1b25090b543e9b852aae7764787ff956bc1698a6f86c0f0536bbde85bd

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2023-03-03 v1.8.2.0.0
+
+- Update to libddwaf 1.8.2
+- Added Waf::Handle#merge method
+- Remove Waf::Handle#update_rule_data and Waf::Handle#toggle_rules methods
+- Remove WAF::LibDDWAF.ddwaf_required_rule_data_ids method
+
 # 2023-02-03 v1.7.0.0.0
 
 - Update to libddwaf 1.7.0

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

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

data/lib/datadog/appsec/waf.rb

@@ -228,10 +228,10 @@ module Datadog
         attach_function :ddwaf_ruleset_info_free, [:ddwaf_ruleset_info], :void
 
         attach_function :ddwaf_init, [:ddwaf_rule, :ddwaf_config, :ddwaf_ruleset_info], :ddwaf_handle
+        attach_function :ddwaf_update, [:ddwaf_handle, :ddwaf_object, :ddwaf_ruleset_info], :ddwaf_handle
         attach_function :ddwaf_destroy, [:ddwaf_handle], :void
 
         attach_function :ddwaf_required_addresses, [:ddwaf_handle, UInt32Ptr], :charptrptr
-        attach_function :ddwaf_required_rule_data_ids, [:ddwaf_handle, UInt32Ptr], :charptrptr
 
         # updating
 
@@ -242,9 +242,6 @@ module Datadog
                               :ddwaf_match,                 1
         typedef DDWAF_RET_CODE, :ddwaf_ret_code
 
-        attach_function :ddwaf_update_rule_data, [:ddwaf_handle, :ddwaf_object], :ddwaf_ret_code
-        attach_function :ddwaf_toggle_rules, [:ddwaf_handle, :ddwaf_object], :ddwaf_ret_code
-
         # running
 
         typedef :pointer, :ddwaf_context
@@ -478,9 +475,7 @@ module Datadog
       }
 
       class Handle
-        attr_reader :handle_obj
-
-        attr_reader :ruleset_info
+        attr_reader :handle_obj, :ruleset_info, :config
 
         def initialize(rule, limits: {}, obfuscator: {})
           rule_obj = Datadog::AppSec::WAF.ruby_to_object(rule)
@@ -492,7 +487,6 @@ module Datadog
           if config_obj.null?
             fail LibDDWAF::Error, 'Could not create config struct'
           end
-          retain(config_obj)
 
           config_obj[:limits][:max_container_size]  = limits[:max_container_size]  || LibDDWAF::DEFAULT_MAX_CONTAINER_SIZE
           config_obj[:limits][:max_container_depth] = limits[:max_container_depth] || LibDDWAF::DEFAULT_MAX_CONTAINER_DEPTH
@@ -501,6 +495,8 @@ module Datadog
           config_obj[:obfuscator][:value_regex]     = FFI::MemoryPointer.from_string(obfuscator[:value_regex]) if obfuscator[:value_regex]
           config_obj[:free_fn] = Datadog::AppSec::WAF::LibDDWAF::ObjectNoFree
 
+          @config = config_obj
+
           ruleset_info = LibDDWAF::RuleSetInfo.new
 
           @handle_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj, ruleset_info)
@@ -539,26 +535,35 @@ module Datadog
           list.get_array_of_string(0, count[:value])
         end
 
-        def update_rule_data(data)
+        def merge(data)
           data_obj = Datadog::AppSec::WAF.ruby_to_object(data, coerce: false)
-          res = Datadog::AppSec::WAF::LibDDWAF.ddwaf_update_rule_data(@handle_obj, data_obj)
+          ruleset_info = LibDDWAF::RuleSetInfo.new
+          new_handle = Datadog::AppSec::WAF::LibDDWAF.ddwaf_update(handle_obj, data_obj, ruleset_info)
 
-          RESULT_CODE[res]
+          return if new_handle.null?
+
+          info = {
+            loaded: ruleset_info[:loaded],
+            failed: ruleset_info[:failed],
+            errors: WAF.object_to_ruby(ruleset_info[:errors]),
+            version: ruleset_info[:version],
+          }
+          new_from_handle(new_handle, info, config)
         ensure
           Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(data_obj) if data_obj
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_ruleset_info_free(ruleset_info) if ruleset_info
         end
 
-        def toggle_rules(map)
-          map_obj = Datadog::AppSec::WAF.ruby_to_object(map, coerce: false)
-          res = Datadog::AppSec::WAF::LibDDWAF.ddwaf_toggle_rules(@handle_obj, map_obj)
+        private
 
-          RESULT_CODE[res]
-        ensure
-          Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(map_obj) if map_obj
+        def new_from_handle(handle_object, info, config)
+          obj = self.class.allocate
+          obj.instance_variable_set(:@handle_obj, handle_object)
+          obj.instance_variable_set(:@ruleset_info, info)
+          obj.instance_variable_set(:@config, config)
+          obj
         end
 
-        private
-
         def validate!
           @valid = true
         end
@@ -576,18 +581,6 @@ module Datadog
 
           fail LibDDWAF::Error, "Attempt to use an invalid instance: #{inspect}"
         end
-
-        def retained
-          @retained ||= []
-        end
-
-        def retain(object)
-          retained << object
-        end
-
-        def release(object)
-          retained.delete(object)
-        end
       end
 
       class Result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.7.0.0.0
+  version: 1.9.0.0.0
 platform: arm64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-05-17 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.7.0-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.9.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.7
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Datadog WAF