libddwaf 1.0.13.0.0.beta1-arm64-darwin → 1.0.14.2.0.beta1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b744ca706cdadeeb508ada6c36a5ee6f327f29333c7b8532321420142330ce
-  data.tar.gz: 1e8bd313da2cece4a6e77e6a14e8a92bd7466553aeb929e6cf68b421c52cb112
+  metadata.gz: e66d1b5f6d0716114d53088539c65904fe754514c301292b6a3a92193f947fa4
+  data.tar.gz: 49d381f84e13892270e9e7768c511f2a9ea47c806712e9d9d6617a04e7ab6c4a
 SHA512:
-  metadata.gz: 2d791d8eeb9c60e78c2500750c1a44305a73892dc8b40aa86b83d231dbbbc5d062a5ce5477a3b2b3ae8f14aefe03ef6a10c84d9583272bd1d6429392ca7ac84d
-  data.tar.gz: 3e910de85944281fd7a944b9a7f74dfd6f1e1b10ecbe7540ad142350fb4537681a39cc22681d042cd41d584e09f6cc3c022b2a9270e54ae103e64179ecdadf36
+  metadata.gz: 149307a314e594efdd409a201222188cb188486f4c37012e126e48338caaa329b09e8c606ea330bd8ef8fd9e64dd04b531cca3bdb02a69b69087ce1a154010cf
+  data.tar.gz: 8d8f633a3848e361449d2e4dcc6c49c482f636995821097304c83d957ece455edec1482a03a808ba1238d7c61a3b7acf45fbb9d75509e28b30903bdc0e1d6e59

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

@@ -0,0 +1,11 @@
+module Datadog
+  module AppSec
+    module WAF
+      module VERSION
+        BASE_STRING = '1.0.14'
+        STRING = "#{BASE_STRING}.2.0.beta1"
+        MINIMUM_RUBY_VERSION = '2.1'
+      end
+    end
+  end
+end

data/lib/datadog/{security → appsec}/waf.rb

@@ -1,9 +1,9 @@
 require 'ffi'
 require 'json'
-require 'datadog/security/waf/version'
+require 'datadog/appsec/waf/version'
 
 module Datadog
-  module Security
+  module AppSec
     module WAF
       module LibDDWAF
         class Error < StandardError; end
@@ -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
@@ -46,7 +46,7 @@ module Datadog
         end
 
         def self.shared_lib_path
-          File.join(__dir__, "../../../vendor/libddwaf/libddwaf-#{Datadog::Security::WAF::VERSION::BASE_STRING}-#{local_os}-#{local_cpu}/lib/libddwaf#{shared_lib_extname}")
+          File.join(__dir__, "../../../vendor/libddwaf/libddwaf-#{Datadog::AppSec::WAF::VERSION::BASE_STRING}-#{local_os}-#{local_cpu}/lib/libddwaf#{shared_lib_extname}")
         end
 
         ffi_lib [shared_lib_path]
@@ -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
 
@@ -280,8 +281,8 @@ module Datadog
           end
         when :ddwaf_obj_map
           (0...obj[:nbEntries]).each.with_object({}) do |i, h|
-            ptr = obj[:valueUnion][:array] + i * Datadog::Security::WAF::LibDDWAF::Object.size
-            o = Datadog::Security::WAF::LibDDWAF::Object.new(ptr)
+            ptr = obj[:valueUnion][:array] + i * Datadog::AppSec::WAF::LibDDWAF::Object.size
+            o = Datadog::AppSec::WAF::LibDDWAF::Object.new(ptr)
             l = o[:parameterNameLength]
             k = o[:parameterName].read_bytes(l)
             v = object_to_ruby(LibDDWAF::Object.new(ptr))
@@ -295,7 +296,7 @@ module Datadog
           logger.debug { { level: level, func: func, file: file, message: message.read_bytes(len) }.inspect }
         end
 
-        Datadog::Security::WAF::LibDDWAF.ddwaf_set_log_cb(@log_cb, :ddwaf_log_trace)
+        Datadog::AppSec::WAF::LibDDWAF.ddwaf_set_log_cb(@log_cb, :ddwaf_log_trace)
       end
 
       class Handle
@@ -306,12 +307,12 @@ module Datadog
         DEFAULT_MAX_TIME_STORE = 0
 
         def initialize(rule, config = {})
-          rule_obj = Datadog::Security::WAF.ruby_to_object(rule)
+          rule_obj = Datadog::AppSec::WAF.ruby_to_object(rule)
           if rule_obj.null? || rule_obj[:type] == :ddwaf_object_invalid
             fail LibDDWAF::Error, "Could not convert object #{rule.inspect}"
           end
 
-          config_obj = Datadog::Security::WAF::LibDDWAF::Config.new
+          config_obj = Datadog::AppSec::WAF::LibDDWAF::Config.new
           if config_obj.null?
             fail LibDDWAF::Error, 'Could not create config struct'
           end
@@ -320,19 +321,19 @@ module Datadog
           config_obj[:maxMapDepth]    = config[:max_map_depth]    || DEFAULT_MAX_MAP_DEPTH
           config_obj[:maxTimeStore]   = config[:max_time_store]   || DEFAULT_MAX_TIME_STORE
 
-          @handle_obj = Datadog::Security::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj)
+          @handle_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj)
           if @handle_obj.null?
             fail LibDDWAF::Error, 'Could not create handle'
           end
 
           ObjectSpace.define_finalizer(self, Handle.finalizer(handle_obj))
         ensure
-          Datadog::Security::WAF::LibDDWAF.ddwaf_object_free(rule_obj) if rule_obj
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(rule_obj) if rule_obj
         end
 
         def self.finalizer(handle_obj)
           proc do |object_id|
-            Datadog::Security::WAF::LibDDWAF.ddwaf_destroy(handle_obj)
+            Datadog::AppSec::WAF::LibDDWAF.ddwaf_destroy(handle_obj)
           end
         end
       end
@@ -344,19 +345,24 @@ module Datadog
 
         def initialize(handle)
           handle_obj = handle.handle_obj
-          free_func = Datadog::Security::WAF::LibDDWAF::ObjectNoFree
+          free_func = Datadog::AppSec::WAF::LibDDWAF::ObjectNoFree
 
-          @context_obj = Datadog::Security::WAF::LibDDWAF.ddwaf_context_init(handle_obj, free_func)
+          @context_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_context_init(handle_obj, free_func)
           if @context_obj.null?
             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|
-            Datadog::Security::WAF::LibDDWAF.ddwaf_context_destroy(context_obj)
+            input_objs.each do |input_obj|
+              Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(input_obj)
+            end
+            Datadog::AppSec::WAF::LibDDWAF.ddwaf_context_destroy(context_obj)
           end
         end
 
@@ -372,17 +378,20 @@ module Datadog
         }
 
         def run(input, timeout = DEFAULT_TIMEOUT_US)
-          input_obj = Datadog::Security::WAF.ruby_to_object(input)
+          input_obj = Datadog::AppSec::WAF.ruby_to_object(input)
           if input_obj.null?
             fail LibDDWAF::Error, "Could not convert input: #{input.inspect}"
           end
 
-          result_obj = Datadog::Security::WAF::LibDDWAF::Result.new
+          result_obj = Datadog::AppSec::WAF::LibDDWAF::Result.new
           if result_obj.null?
             fail LibDDWAF::Error, "Could not create result object"
           end
 
-          code = Datadog::Security::WAF::LibDDWAF.ddwaf_run(@context_obj, input_obj, result_obj, timeout)
+          # retain C objects in memory for subsequent calls to run
+          @input_objs << input_obj
+
+          code = Datadog::AppSec::WAF::LibDDWAF.ddwaf_run(@context_obj, input_obj, result_obj, timeout)
 
           result = Result.new(
             ACTION_MAP_OUT[result_obj[:action]],
@@ -393,8 +402,7 @@ 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
+          Datadog::AppSec::WAF::LibDDWAF.ddwaf_result_free(result_obj) if result_obj
         end
       end
     end

data/lib/libddwaf.rb

@@ -1 +1 @@
-require 'datadog/security/waf'
+require 'datadog/appsec/waf'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.0.13.0.0.beta1
+  version: 1.0.14.2.0.beta1
 platform: arm64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2022-02-07 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
 
   '
@@ -38,11 +38,11 @@ files:
 - LICENSE.Apache
 - LICENSE.BSD3
 - NOTICE
-- lib/datadog/security/waf.rb
-- lib/datadog/security/waf/version.rb
+- lib/datadog/appsec/waf.rb
+- lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.0.13-darwin-arm64/include/ddwaf.h
-- vendor/libddwaf/libddwaf-1.0.13-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.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Datadog WAF

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

@@ -1,12 +0,0 @@
-module Datadog
-  module Security
-    module WAF
-      module VERSION
-        BASE_STRING = '1.0.13'
-        STRING = "#{BASE_STRING}.0.0.beta1"
-        MINIMUM_RUBY_VERSION = '2.1'
-        MAXIMUM_RUBY_VERSION = '3.2'
-      end
-    end
-  end
-end