libddwaf 1.7.0.0.0 → 1.8.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc99efc2a92fb6a560b3e25c8e8b47ebeee5ff1af3e176b70e881d75ad1ade45
-  data.tar.gz: d121fba8c9f42105f7fef0f40d70670c3d76af98bf935471cf6149ab5e937146
+  metadata.gz: 30f298fcc92fb8b2489965b0b4710e22de5b3350a53a7bcd2cde8b08ba093cbc
+  data.tar.gz: 88e66343e82297fdb2cb5471be19dbd84642128c8e899c77b98f67932688a21a
 SHA512:
-  metadata.gz: ea81a4b721acc2f0bd3d4d46575c89125a0c63660ea80c0afe6f2d54feb1cc1f07aa1e55ea8a4c263dd84319483aa15037f593efe70e220d4ebe0a90232cb168
-  data.tar.gz: cc6e611202a9f8c978932e5a05051c0b60c51c8009ccf9fbc022c977a332fdcaf7d8befa793c7c7685c298dec0e1e753ea656b65bb2da2d83fdf0a5520702935
+  metadata.gz: b6518befb55b60e1ac680a588ebaa30b913e775e54af30d1b99529fefd05d1943c4bc6c09adcaa2683a4a3367c987adda9fdf309f1967d29a8b41ec1a5c152e9
+  data.tar.gz: 561d74e78f7699287a2981599fb448438dadd6f76424d1822adf6f3d2ebe76cfc56f93c19bbac9ee3d4b501040fc0c54e533919d3b57a87a11ad8d13d042bcd5

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

data/sig/datadog/appsec/waf.rbs

@@ -101,6 +101,7 @@ module Datadog
         def self.ddwaf_ruleset_info_free: (RuleSetInfo) -> void
 
         def self.ddwaf_init: (top, Config, RuleSetInfo) -> ::FFI::Pointer
+        def self.ddwaf_update: (::FFI::Pointer, LibDDWAF::Object, RuleSetInfo) -> ::FFI::Pointer
         def self.ddwaf_destroy: (::FFI::Pointer) -> void
 
         def self.ddwaf_required_addresses: (::FFI::Pointer, UInt32Ptr) -> ::FFI::Pointer
@@ -110,9 +111,6 @@ module Datadog
 
         DDWAF_RET_CODE: ::FFI::Enum
 
-        def self.ddwaf_update_rule_data: (::FFI::Pointer, LibDDWAF::Object) -> ::Symbol
-        def self.ddwaf_toggle_rules: (::FFI::Pointer, LibDDWAF::Object) -> ::Symbol
-
         # running
 
         def self.ddwaf_context_init: (::FFI::Pointer) -> ::FFI::Pointer
@@ -168,27 +166,22 @@ module Datadog
       class Handle
         attr_reader handle_obj: ::FFI::Pointer
         attr_reader ruleset_info: Hash[Symbol, untyped]
+        attr_reader config: WAF::LibDDWAF::Config
 
         def initialize: (data rule, ?limits: ::Hash[::Symbol, ::Integer], ?obfuscator: ::Hash[::Symbol, ::String]) -> void
         def finalize: () -> untyped
         def required_addresses: () -> ::Array[::String]
-        def update_rule_data: (::Array[untyped]) -> ::Symbol
-        def toggle_rules: (::Hash[::String, bool]) -> ::Symbol
+        def update: (untyped data) -> Handle
 
         private
 
         @valid: bool
 
+        def new_from_handle: (::FFI::Pointer handle_object, Hash[Symbol, untyped] info, WAF::LibDDWAF::Config config) -> untyped
         def validate!: () -> void
         def invalidate!: () -> void
         def valid?: () -> (nil | bool)
         def valid!: () -> void
-
-        @retained: Array[untyped]
-
-        def retained: () -> Array[untyped]
-        def retain: (top object) -> void
-        def release: (top object) -> void
       end
 
       type result_data = Array[untyped] | nil

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: ruby
 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