libddwaf 1.7.0.0.0-x86_64-darwin → 1.8.2.0.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6036d798d24992fa793e69fcefd621d448de78c3a20fd25cf3f1bd40f676a4f2
-  data.tar.gz: e59bd2920b42f8ac3f4918cd056dfdb9893947c597955b03b73038232b9b1f0a
+  metadata.gz: 192230eb7277c8c2e0407fad725e1d53cc322c201aef53bc6b83253abc9cb334
+  data.tar.gz: ed4ddd1838d98e7efc178e1bc14fcbc44b2d796b7467feb9de46940d2feb1a84
 SHA512:
-  metadata.gz: b84a32afd2ed4602defb2fb5e4fb42d51a00a6983cd905d79c2f871e9573f59bbbf87ff21fee472280a1bfedb7322536b4a66e50a795d1e58c1a669e6979b8b5
-  data.tar.gz: b1fbaefaf814d6caec1ce158c2ffc2f4ad91b78a52951474a6fab57e7622cb6c7d2e75d3e3e215135cfcb2a711db605ca6bb37038cc27262b6b20f760eb92204
+  metadata.gz: 638c819b2b4f881b41a783bbf87cdcf5dabfd2aa9f9b8a0c7115cb5efcfe9a53f7fd816139763e2b2241a90d48626cf9db995d16e2d9306b6a03b42dbab0e86d
+  data.tar.gz: 5de45a95559462efcfb1c9c16ae4e1e40803747a66b9235e813f0ea4e06d63f81b6e4ec03c846fa3f78a01dd0e124fa9fe4baa70eb43564f6a543a5f5b7ec761

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.8.2'
         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.8.2.0.0
 platform: x86_64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-06 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-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.8.2-darwin-x86_64/lib/libddwaf.dylib
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause