libddwaf 1.0.12.0.0.beta1-x86_64-linux → 1.0.14.1.0.beta2-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab12980ca6c95ec58d821288140619a2d17f84b433fb497ab796ec0ef04f021
-  data.tar.gz: e14881741eddcb4a472c8ce8642158b5ff0efaa37e9b74dd986f2473a467d301
+  metadata.gz: 8616a45002caed30fa3d02d1c4c7ae83e27fb82b980e34da9facc6d6c42afed0
+  data.tar.gz: 33aa16f33c3d58bf3f12c0ed019ee4d51cd8d2a6c6802309b9f112ae81c5e2de
 SHA512:
-  metadata.gz: 8c3193bbaa560bece066b05fb549c1715b0a15305e298baf00fb1cf916d1c5324fc4c9d68e1c20d3361013eab0538d99754c747eac2262cd6ce5dba7120eb485
-  data.tar.gz: d9f44ab78c539a7cd3a33d9e5ab04f26b3146f7adbdd81316cc7c2653a8a1dc2f50db53c0817be2d079eb41724243f1fe959fb3ed0ae38fe0d48f943a9d85cbe
+  metadata.gz: 31b36b0cc7e029d27d763387fcbe70dabd4ae1ed949f05d8c56e6fff8be3db8d8d0dcfbeaf7e369cf078b33c28ae66a99a1069ee0b0bf8bd03e9fa437f9ac725
+  data.tar.gz: 28acdd24ab5ebbc49234c3647f8c6d5e7080635082064b181809c91419fccc4ad1d6d8c47b815175bf589013edd5e836e51d5d0287a3264ecf8f456c855f4059

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: x86_64-linux
 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-linux-x86_64/include/ddwaf.h
-- vendor/libddwaf/libddwaf-1.0.12-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.0.14-linux-x86_64/include/ddwaf.h
+- vendor/libddwaf/libddwaf-1.0.14-linux-x86_64/lib/libddwaf.so
 homepage: https://github.com/DataDog/libddwaf
 licenses:
 - BSD-3-Clause
@@ -57,9 +57,6 @@ 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:
   - - ">="