libddwaf 1.0.12.0.0.beta1-arm64-darwin → 1.0.14.1.0.beta2-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d70b2edd22fb80213b0641b198218dd199ad5a99d96088ac3957c2986cb68eee
-  data.tar.gz: 85e3dba0be12b138124b2f80e53e12ebe6dfb2c110cbcc697f505e8d50d21354
+  metadata.gz: 1d5fae533d4c8a9ec811840df19ba277b114e6e66c8489de3db2ac84dd2d2177
+  data.tar.gz: f916b256e8d34ed876c070c3f3517eae457346c088532a4e845228b77a79bb8b
 SHA512:
-  metadata.gz: ea9c170ab64410a4de81e2522ff1f5b2a59b7e9ed4557cf71e1034fdd6b37d76483efc78713cb1684bf7e1d19a37bd53fbc5b4d9a0c1345898381ea93b3f4bbf
-  data.tar.gz: 114f33f5789decc71ffbf073d5cf12635209465c173832680f9064ff1ebd53bf120dd2a243bf6d02a8aab60e86911b1c5afb8da491141d8538dc1eb54d1861fd
+  metadata.gz: '0925b525d354135edf5e2dddf4bb002a130d6180529fdd7af04e1f2f15c1f364068b7fcf6ed4f6994541d953054491d485ca403c038e0aa0cd4e48d0c8647689'
+  data.tar.gz: 7d3a36e9fefc8ca3c45298e589692a10f5a3d943a5ec3e83c985eb148058a57e4df4bc7a3587b20b7ccf5e8e7a7fe0c50527c88130f84763d0e8a66380e62224

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

@@ -2,10 +2,9 @@ module Datadog
   module Security
     module WAF
       module VERSION
-        BASE_STRING = '1.0.12'
-        STRING = "#{BASE_STRING}.0.0.beta1"
+        BASE_STRING = '1.0.14'
+        STRING = "#{BASE_STRING}.1.0.beta2"
         MINIMUM_RUBY_VERSION = '2.1'
-        MAXIMUM_RUBY_VERSION = '3.1'
       end
     end
   end

data/lib/datadog/security/waf.rb

@@ -15,10 +15,10 @@ module Datadog
             os_name = java.lang.System.get_property('os.name')
 
             os = case os_name
-                when /linux/i then 'linux'
-                when /mac/i   then 'darwin'
-                else raise Error, "unsupported JRuby os.name: #{os_name.inspect}"
-                end
+                 when /linux/i then 'linux'
+                 when /mac/i   then 'darwin'
+                 else raise Error, "unsupported JRuby os.name: #{os_name.inspect}"
+                 end
 
             return os
           end
@@ -55,8 +55,8 @@ module Datadog
 
         class Version < ::FFI::Struct
           layout :major, :uint16,
-                :minor, :uint16,
-                :patch, :uint16
+                 :minor, :uint16,
+                 :patch, :uint16
         end
 
         typedef Version.by_ref, :ddwaf_version
@@ -76,17 +76,17 @@ module Datadog
 
         class ObjectValueUnion < ::FFI::Union
           layout :stringValue, :charptr,
-                :uintValue,   :uint64,
-                :intValue,    :int64,
-                :array,       :pointer
+                 :uintValue,   :uint64,
+                 :intValue,    :int64,
+                 :array,       :pointer
         end
 
         class Object < ::FFI::Struct
           layout :parameterName,       :charptr,
-                :parameterNameLength, :uint64,
-                :valueUnion,          ObjectValueUnion,
-                :nbEntries,           :uint64,
-                :type,                DDWAF_OBJ_TYPE
+                 :parameterNameLength, :uint64,
+                 :valueUnion,          ObjectValueUnion,
+                 :nbEntries,           :uint64,
+                 :type,                DDWAF_OBJ_TYPE
         end
 
         typedef Object.by_ref, :ddwaf_object
@@ -118,8 +118,8 @@ module Datadog
 
         class Config < ::FFI::Struct
           layout :maxArrayLength, :uint64,
-                :maxMapDepth,    :uint64,
-                :maxTimeStore,   :uint64
+                 :maxMapDepth,    :uint64,
+                 :maxTimeStore,   :uint64
         end
 
         typedef Config.by_ref, :ddwaf_config
@@ -127,6 +127,8 @@ module Datadog
         attach_function :ddwaf_init, [:ddwaf_rule, :ddwaf_config], :ddwaf_handle
         attach_function :ddwaf_destroy, [:ddwaf_handle], :void
 
+        attach_function :ddwaf_required_addresses, [:ddwaf_handle, :pointer], :pointer
+
         # running
 
         typedef :pointer, :ddwaf_context
@@ -136,7 +138,6 @@ module Datadog
         attach_function :ddwaf_context_init, [:ddwaf_handle, :ddwaf_object_free_fn], :ddwaf_context
         attach_function :ddwaf_context_destroy, [:ddwaf_context], :void
 
-
         DDWAF_RET_CODE = enum :ddwaf_err_internal,         -4,
                               :ddwaf_err_invalid_object,   -3,
                               :ddwaf_err_invalid_argument, -2,
@@ -147,9 +148,9 @@ module Datadog
 
         class Result < ::FFI::Struct
           layout :action,           DDWAF_RET_CODE,
-                :data,             :string,
-                :perfData,         :string,
-                :perfTotalRuntime, :uint32 # in us
+                 :data,             :string,
+                 :perfData,         :string,
+                 :perfTotalRuntime, :uint32 # in us
         end
 
         typedef Result.by_ref, :ddwaf_result
@@ -161,11 +162,11 @@ module Datadog
         # logging
 
         DDWAF_LOG_LEVEL = enum :ddwaf_log_trace,
-                              :ddwaf_log_debug,
-                              :ddwaf_log_info,
-                              :ddwaf_log_warn,
-                              :ddwaf_log_error,
-                              :ddwaf_log_off
+                               :ddwaf_log_debug,
+                               :ddwaf_log_info,
+                               :ddwaf_log_warn,
+                               :ddwaf_log_error,
+                               :ddwaf_log_off
 
         callback :ddwaf_log_cb, [DDWAF_LOG_LEVEL, :string, :string, :uint, :charptr, :uint64], :void
 
@@ -351,11 +352,16 @@ module Datadog
             fail LibDDWAF::Error, 'Could not create context'
           end
 
-          ObjectSpace.define_finalizer(self, Context.finalizer(context_obj))
+          @input_objs = []
+
+          ObjectSpace.define_finalizer(self, Context.finalizer(context_obj, @input_objs))
         end
 
-        def self.finalizer(context_obj)
+        def self.finalizer(context_obj, input_objs)
           proc do |object_id|
+            input_objs.each do |input_obj|
+              Datadog::Security::WAF::LibDDWAF.ddwaf_object_free(input_obj)
+            end
             Datadog::Security::WAF::LibDDWAF.ddwaf_context_destroy(context_obj)
           end
         end
@@ -382,6 +388,9 @@ module Datadog
             fail LibDDWAF::Error, "Could not create result object"
           end
 
+          # retain C objects in memory for subsequent calls to run
+          @input_objs << input_obj
+
           code = Datadog::Security::WAF::LibDDWAF.ddwaf_run(@context_obj, input_obj, result_obj, timeout)
 
           result = Result.new(
@@ -393,7 +402,6 @@ module Datadog
 
           [ACTION_MAP_OUT[code], result]
         ensure
-          Datadog::Security::WAF::LibDDWAF.ddwaf_object_free(input_obj) if input_obj
           Datadog::Security::WAF::LibDDWAF.ddwaf_result_free(result_obj) if result_obj
         end
       end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.0.12.0.0.beta1
+  version: 1.0.14.1.0.beta2
 platform: arm64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: 'libddwaf packages a WAF implementation in C++, exposed to Ruby
 
   '
@@ -41,8 +41,8 @@ files:
 - lib/datadog/security/waf.rb
 - lib/datadog/security/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.0.12-darwin-arm64/include/ddwaf.h
-- vendor/libddwaf/libddwaf-1.0.12-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.0.14-darwin-arm64/include/ddwaf.h
+- vendor/libddwaf/libddwaf-1.0.14-darwin-arm64/lib/libddwaf.dylib
 homepage: https://github.com/DataDog/libddwaf
 licenses:
 - BSD-3-Clause
@@ -57,16 +57,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Datadog WAF