libddwaf 1.0.14.1.0.beta1-arm64-darwin → 1.0.14.2.1.beta1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700b20e917e6f02ec85f4fec814e462bd4217e93e762654018bfcc3de29c277d
-  data.tar.gz: 776889413935922f161e92097b1785d9e2ae69467817c1c212339a3aad0031a4
+  metadata.gz: 7980801c132296bae2a001905acf9ccd966303bda673c41930d8d193d770e4b5
+  data.tar.gz: 321cecbcc79b00989cbd513a08d738fc4e3571fb3120e0f3fbb3b84fd6c027bc
 SHA512:
-  metadata.gz: d7313b67653fa744017923219e5e5b1b3263bb15e407ed11a512b47f0e2e11064f2da9af31eed97385afdcbd69ccc1e52858262138a37983529edb7cfc324780
-  data.tar.gz: b43ad9e1d54b9dc1ca4b476fe198a281a4cbeb360cf5d1b2fa36c92286f5fffdf29a43a52d35d5db32074ba331646bbd1efc379b5e860971b8e795c0bf4f1229
+  metadata.gz: 9054ec3246d4445e7147b860f2a4173db3e700c47d43f962c9de8222ec6ceedd921ba104384b112886590ae4e9b13b3d3d66811288380bcf690db8f1ad5377de
+  data.tar.gz: fb20091d1477380b18c0c1ece6f3d0dd21c0efeaeaa7b6151d271e9cda08f08247122a9403db63ebff584ebcf62d50debc6aed903aef9eec5018f9bb3b7ed17c

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

@@ -1,11 +1,10 @@
 module Datadog
-  module Security
+  module AppSec
     module WAF
       module VERSION
         BASE_STRING = '1.0.14'
-        STRING = "#{BASE_STRING}.1.0.beta1"
+        STRING = "#{BASE_STRING}.2.1.beta1"
         MINIMUM_RUBY_VERSION = '2.1'
-        MAXIMUM_RUBY_VERSION = '3.2'
       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
@@ -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]
@@ -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
@@ -251,13 +253,7 @@ module Datadog
 
           obj
         else
-          obj = LibDDWAF::Object.new
-          res = LibDDWAF.ddwaf_object_invalid(obj)
-          if res.null?
-            fail LibDDWAF::Error, "Could not convert into object: #{val}"
-          end
-
-          obj
+          ruby_to_object(''.freeze)
         end
       end
 
@@ -279,8 +275,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))
@@ -294,7 +290,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
@@ -305,12 +301,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
@@ -319,19 +315,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
@@ -343,9 +339,9 @@ 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
@@ -358,9 +354,9 @@ module Datadog
         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)
+              Datadog::AppSec::WAF::LibDDWAF.ddwaf_object_free(input_obj)
             end
-            Datadog::Security::WAF::LibDDWAF.ddwaf_context_destroy(context_obj)
+            Datadog::AppSec::WAF::LibDDWAF.ddwaf_context_destroy(context_obj)
           end
         end
 
@@ -369,19 +365,19 @@ module Datadog
           ddwaf_err_internal:         :err_internal,
           ddwaf_err_invalid_object:   :err_invalid_object,
           ddwaf_err_invalid_argument: :err_invalid_argument,
-          ddwaf_err_timeout:          :err_invalid_object,
+          ddwaf_err_timeout:          :err_timeout,
           ddwaf_good:                 :good,
           ddwaf_monitor:              :monitor,
           ddwaf_block:                :block,
         }
 
         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
@@ -389,7 +385,7 @@ module Datadog
           # 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)
+          code = Datadog::AppSec::WAF::LibDDWAF.ddwaf_run(@context_obj, input_obj, result_obj, timeout)
 
           result = Result.new(
             ACTION_MAP_OUT[result_obj[:action]],
@@ -400,7 +396,7 @@ module Datadog
 
           [ACTION_MAP_OUT[code], result]
         ensure
-          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.14.1.0.beta1
+  version: 1.0.14.2.1.beta1
 platform: arm64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-03-03 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,8 +38,8 @@ 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.14-darwin-arm64/include/ddwaf.h
 - vendor/libddwaf/libddwaf-1.0.14-darwin-arm64/lib/libddwaf.dylib
@@ -57,9 +57,6 @@ 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:
   - - ">="