libddwaf 1.0.14.0.0.beta1-aarch64-linux → 1.0.14.1.0.beta1-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1c613ee223979093138188318b11b5b2bd9f415d228a17ac6c0aa635b1d275c
-  data.tar.gz: 13af588d6ec04b12cedb2430189b86136f95bec406f42cd3b569a72cf2bbd069
+  metadata.gz: 31bb7748ce782bbd395c6ca15efcb72911f59155530244b9b37fbff9dc6a4d06
+  data.tar.gz: 900e9fc69161610cb971279fa68d9483411012937dc8048ad92435e5aceba7cb
 SHA512:
-  metadata.gz: 310a1bc801047f6747aab1e9e39453d121d5565d99518b5f6cc0651b35e48fb4aab2adfab4424427a78973f56760e6f28652846afe26cc155df027cb95c87b40
-  data.tar.gz: 84a1a1ddde626a30a4ec016321bbb9f6189cbba197fb7322a75f905d14b3c01f76a5deaeaf9aa8ecb4045798935a934af047499b312c340bdf7d0646e6bc58de
+  metadata.gz: 2b14bb5ae9d8ae1b781add16af88e21b84d2fcb21a8df1ae6eae476280df77f21de9294482f75312c2d795593f97476a914ce82e6df38337aaaea253f904a20c
+  data.tar.gz: 02b03591e60134b8ac7f8c297d426aedd4a72a0331635e255b2a57278df184f0fc9fb5dd52cb741df73df4beb8dcf7605b6d7ac9ef7da9721211475b9d5887c1

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

@@ -3,7 +3,7 @@ module Datadog
     module WAF
       module VERSION
         BASE_STRING = '1.0.14'
-        STRING = "#{BASE_STRING}.0.0.beta1"
+        STRING = "#{BASE_STRING}.1.0.beta1"
         MINIMUM_RUBY_VERSION = '2.1'
         MAXIMUM_RUBY_VERSION = '3.2'
       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
@@ -136,7 +136,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 +146,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 +160,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 +350,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 +386,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 +400,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.0.14.0.0.beta1
+  version: 1.0.14.1.0.beta1
 platform: aarch64-linux
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi