libddwaf 1.6.2.0.0-java → 1.8.2.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 570753ae6c8f0a8c8f6ec5b320b976bc2b3ccbedfbe54560a6b9205526898c98
-  data.tar.gz: 0d58c876f3c24136b162bdbb5b887c6b5b90c2feeb62ac8dd619454f772822e5
+  metadata.gz: 53207eed2e7a1a916dbcf5d5b576d3b1cf02c738cd40f9dc7c212f98e65e9387
+  data.tar.gz: 308f95d4ced684517fed36e9b182c3d74ccfb4fe491cee90b3b4c65089d54a09
 SHA512:
-  metadata.gz: 10f4a7dc13804a9b9e98ee8816d0bebd0777c09d0b74279c238c26851e0298cb7afdb05df47ac4ff748796e04cc524486439544b0ab94ffa6bbeac1e73e8d3ab
-  data.tar.gz: 137b0219242ce6e7f7c6c381fdd32c2723fc1e76b9996e55ce32ef177ee949c84940e31c87586f90d925998321a8259a146836ab2b04114407dc9fc7a89d1b18
+  metadata.gz: cc1c8a7280caeb0f62768bd5cb00ee4027ba61497043342c2c0274456c877f68ebfca0536a152b854ef840b1a7f105f7f08cf4e3ce2da7e62e197dcb9daa2075
+  data.tar.gz: 829785af1276edd8d0db64baf8e105272965d0d47f688999e786d6a72f618db97858982fd47c53401bdb88d2ff34ab0c737d35242800bbb0d140e6ad0031a035

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 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
+
 # 2023-02-03 v1.6.2.0.0
 
 - Update to libddwaf 1.6.2

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

@@ -2,7 +2,7 @@ module Datadog
   module AppSec
     module WAF
       module VERSION
-        BASE_STRING = '1.6.2'
+        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.6.2.0.0
+  version: 1.8.2.0.0
 platform: java
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-06 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.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
+- vendor/libddwaf/libddwaf-1.8.2-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.8.2-darwin-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.8.2-linux-aarch64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.8.2-linux-x86_64/lib/libddwaf.so
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause