libddwaf 1.10.0.0.0-x86_64-darwin → 1.11.0.0.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02248ee39e61d34007658043633b2a7120c8450325883eb52f1ab67a542e2fa7'
-  data.tar.gz: fcf423136f88a75ca6419afc49e9565d867bc5d719e82dcb383d9d0064cc1179
+  metadata.gz: 460e66f7b47fca4c5a4a1ccd22635bc909e5cef0ce7a26f2c23d0b412b0dd8cf
+  data.tar.gz: 4d9d11f1070b7c88ae46e8c2829790c1a744eda31dcd75f966f74795a7afa996
 SHA512:
-  metadata.gz: f005a55fe1ace373bb987d791d12f2dfaca132f1fae4899545c7692e5d64727ff05a5c81a785fc4da1b93d314f90dd9bb980012aa96f533532d881db0242f57e
-  data.tar.gz: 40dc280690d2560d128f47621a865703bdeebe5f26a56c1047d301dda45ff8795963f9f5e31febfe3a693d96161702436e8f61ecfed21ff3e680bf07cafa9927
+  metadata.gz: 610cd7b48739f610f0a66e76c50c570e7e3dc897b5575230ba8408787d821abc2af3b8f97ff601532f87c5d7e6db9995e67ca3ca0994550668b75ca98c0c1905
+  data.tar.gz: ce46fcb2a4c54ae66cba44a2df01130e2a01613958d482f3b8d75680eeae217fd0a1d4349bfa07d9f716271681db066754a9324d36235776a89bb4a251e29fe1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2023-08-29 v.1.11.0.0.0
+
+- Update to libddwaf 1.11.0
+- Rename Handle#ruleset_info to Handle#diagnostics. (Breaking change)
+  The schema of the new diagnostics variable can be [here](https://github.com/DataDog/libddwaf/blob/master/schema/diagnostics.json)
+
+
+# 2023-08-28 v.1.10.0.0.0
+
+- Update to libddwaf 1.10.0
+
 # 2023-06-13 v.1.9.0.0.1
 
 - Handle invalid encoding

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

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

data/lib/datadog/appsec/waf.rb

@@ -8,10 +8,10 @@ module Datadog
     module WAF
       module LibDDWAF
         class Error < StandardError
-          attr_reader :ruleset_info
+          attr_reader :diagnostics
 
-          def initialize(msg, ruleset_info: nil)
-            @ruleset_info = ruleset_info
+          def initialize(msg, diagnostics: nil)
+            @diagnostics = diagnostics
           end
         end
 
@@ -216,20 +216,8 @@ module Datadog
 
         typedef Config.by_ref, :ddwaf_config
 
-        class RuleSetInfo < ::FFI::Struct
-          layout :loaded, :uint16,
-                 :failed, :uint16,
-                 :errors, Object,
-                 :version, :string
-        end
-
-        typedef RuleSetInfo.by_ref, :ddwaf_ruleset_info
-        RuleSetInfoNone = Datadog::AppSec::WAF::LibDDWAF::RuleSetInfo.new(::FFI::Pointer::NULL)
-
-        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_init, [:ddwaf_rule, :ddwaf_config, :ddwaf_object], :ddwaf_handle
+        attach_function :ddwaf_update, [:ddwaf_handle, :ddwaf_object, :ddwaf_object], :ddwaf_handle
         attach_function :ddwaf_destroy, [:ddwaf_handle], :void
 
         attach_function :ddwaf_required_addresses, [:ddwaf_handle, UInt32Ptr], :charptrptr
@@ -250,15 +238,10 @@ module Datadog
         attach_function :ddwaf_context_init, [:ddwaf_handle], :ddwaf_context
         attach_function :ddwaf_context_destroy, [:ddwaf_context], :void
 
-        class ResultActions < ::FFI::Struct
-          layout :array, :charptrptr,
-                 :size,  :uint32
-        end
-
         class Result < ::FFI::Struct
-          layout :timeout,          :bool,
-                 :data,             :string,
-                 :actions,          ResultActions,
+          layout :timeout, :bool,
+                 :events, Object,
+                 :actions,          Object,
                  :total_runtime,    :uint64
         end
 
@@ -479,7 +462,7 @@ module Datadog
       }
 
       class Handle
-        attr_reader :handle_obj, :ruleset_info, :config
+        attr_reader :handle_obj, :diagnostics, :config
 
         def initialize(rule, limits: {}, obfuscator: {})
           rule_obj = Datadog::AppSec::WAF.ruby_to_object(rule)
@@ -501,24 +484,19 @@ module Datadog
 
           @config = config_obj
 
-          ruleset_info = LibDDWAF::RuleSetInfo.new
+          diagnostics_obj = Datadog::AppSec::WAF::LibDDWAF::Object.new
 
-          @handle_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj, ruleset_info)
+          @handle_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj, diagnostics_obj)
 
-          @ruleset_info = {
-            loaded: ruleset_info[:loaded],
-            failed: ruleset_info[:failed],
-            errors: WAF.object_to_ruby(ruleset_info[:errors]),
-            version: ruleset_info[:version],
-          }
+          @diagnostics = Datadog::AppSec::WAF.object_to_ruby(diagnostics_obj)
 
           if @handle_obj.null?
-            fail LibDDWAF::Error.new('Could not create handle', ruleset_info: @ruleset_info)
+            fail LibDDWAF::Error.new('Could not create handle', diagnostics: @diagnostics)
           end
 
           validate!
         ensure
-          Datadog::AppSec::WAF::LibDDWAF.ddwaf_ruleset_info_free(ruleset_info) if ruleset_info
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(diagnostics_obj) if diagnostics_obj
           Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(rule_obj) if rule_obj
         end
 
@@ -541,29 +519,24 @@ module Datadog
 
         def merge(data)
           data_obj = Datadog::AppSec::WAF.ruby_to_object(data, coerce: false)
-          ruleset_info = LibDDWAF::RuleSetInfo.new
-          new_handle = Datadog::AppSec::WAF::LibDDWAF.ddwaf_update(handle_obj, data_obj, ruleset_info)
+          diagnostics_obj = LibDDWAF::Object.new
+          new_handle = Datadog::AppSec::WAF::LibDDWAF.ddwaf_update(handle_obj, data_obj, diagnostics_obj)
 
           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)
+          diagnostics = Datadog::AppSec::WAF.object_to_ruby(diagnostics_obj)
+          new_from_handle(new_handle, diagnostics, 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
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(diagnostics_obj) if diagnostics_obj
         end
 
         private
 
-        def new_from_handle(handle_object, info, config)
+        def new_from_handle(handle_object, diagnostics, config)
           obj = self.class.allocate
           obj.instance_variable_set(:@handle_obj, handle_object)
-          obj.instance_variable_set(:@ruleset_info, info)
+          obj.instance_variable_set(:@diagnostics, diagnostics)
           obj.instance_variable_set(:@config, config)
           obj
         end
@@ -588,11 +561,11 @@ module Datadog
       end
 
       class Result
-        attr_reader :status, :data, :total_runtime, :timeout, :actions
+        attr_reader :status, :events, :total_runtime, :timeout, :actions
 
-        def initialize(status, data, total_runtime, timeout, actions)
+        def initialize(status, events, total_runtime, timeout, actions)
           @status = status
-          @data = data
+          @events = events
           @total_runtime = total_runtime
           @timeout = timeout
           @actions = actions
@@ -651,18 +624,12 @@ module Datadog
 
           code = Datadog::AppSec::WAF::LibDDWAF.ddwaf_run(@context_obj, input_obj, result_obj, timeout)
 
-          actions = if result_obj[:actions][:size] > 0
-                      result_obj[:actions][:array].get_array_of_string(0, result_obj[:actions][:size])
-                    else
-                      []
-                    end
-
           result = Result.new(
             RESULT_CODE[code],
-            (JSON.parse(result_obj[:data]) if result_obj[:data] != nil),
+            Datadog::AppSec::WAF.object_to_ruby(result_obj[:events]),
             result_obj[:total_runtime],
             result_obj[:timeout],
-            actions,
+            Datadog::AppSec::WAF.object_to_ruby(result_obj[:actions]),
           )
 
           [RESULT_CODE[code], result]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.10.0.0.0
+  version: 1.11.0.0.0
 platform: x86_64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-08-29 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.10.0-darwin-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.11.0-darwin-x86_64/lib/libddwaf.dylib
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause