libddwaf 1.3.0.0.0.beta1-aarch64-linux → 1.3.0.1.0.beta1-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a988d3a03098a355583ff7222a64805d454699820d6a132c5b154a4a27576796
-  data.tar.gz: ea7b4a8200bca321337dfb4725537c64471d2fb72a9a87211c08a20c84d6a0f9
+  metadata.gz: ac32125f2aa6f6632a5b8e6bab87f6e37ffb8248da2d0c0f59abe95eeb3eb765
+  data.tar.gz: e702dadb52d3aa9e0aa8be62417a71db815afdf4f27aa1966cd06ed7b364b6b0
 SHA512:
-  metadata.gz: d04d8a56bb401b4256e86d4b5b9fa383b8c476c32d82f84569d7fd38c690ac73dd102c965483567c907a044f07e8cafa850b4d2cfe46e0e7688527bc82a60df9
-  data.tar.gz: c6688b5112236f7cca6ded0efeeef085c7754655f2b707d2bfd601fdedae9b7e0e23e8eba224bd64ea0bcc1880d8d886636eee4896d1b93c5b1b23b5e65e83fc
+  metadata.gz: a15ea409175ce2616dab6a851ac1a4e6d8264c483006680af3e04562753ed5ecbb722fed1bf406b95a02a049e77936d4d3d9b1c8b41d2c28c560aad640e0c28e
+  data.tar.gz: cb9a77becb1fdf0c66aa78cf0a7fdadaf22c3afccafc9eb79fa6ee21a815f29e16c6340cc23381ebb46a47f2fc7623dee736a70202d452208b7878bdc424ee0d

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

@@ -3,7 +3,7 @@ module Datadog
     module WAF
       module VERSION
         BASE_STRING = '1.3.0'
-        STRING = "#{BASE_STRING}.0.0.beta1"
+        STRING = "#{BASE_STRING}.1.0.beta1"
         MINIMUM_RUBY_VERSION = '2.1'
       end
     end

data/lib/datadog/appsec/waf.rb

@@ -6,7 +6,13 @@ module Datadog
   module AppSec
     module WAF
       module LibDDWAF
-        class Error < StandardError; end
+        class Error < StandardError
+          attr_reader :ruleset_info
+
+          def initialize(msg, ruleset_info: nil)
+            @ruleset_info = ruleset_info
+          end
+        end
 
         extend ::FFI::Library
 
@@ -158,8 +164,8 @@ module Datadog
           end
 
           class Obfuscator < ::FFI::Struct
-            layout :key_regex,   :string,
-                   :value_regex, :string
+            layout :key_regex,   :pointer, # :charptr
+                   :value_regex, :pointer  # :charptr
           end
 
           layout :limits,     Limits,
@@ -183,7 +189,7 @@ module Datadog
         attach_function :ddwaf_init, [:ddwaf_rule, :ddwaf_config, :ddwaf_ruleset_info], :ddwaf_handle
         attach_function :ddwaf_destroy, [:ddwaf_handle], :void
 
-        attach_function :ddwaf_required_addresses, [:ddwaf_handle, :uint32ptr], :charptrptr
+        attach_function :ddwaf_required_addresses, [:ddwaf_handle, UInt32Ptr], :charptrptr
 
         # running
 
@@ -354,7 +360,9 @@ module Datadog
         DEFAULT_MAX_CONTAINER_DEPTH = 0
         DEFAULT_MAX_STRING_LENGTH   = 0
 
-        def initialize(rule, config = {})
+        attr_reader :ruleset_info
+
+        def initialize(rule, limits: {}, obfuscator: {})
           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}"
@@ -365,15 +373,25 @@ module Datadog
             fail LibDDWAF::Error, 'Could not create config struct'
           end
 
-          config_obj[:limits][:max_container_size]  = config[:max_container_size]  || DEFAULT_MAX_CONTAINER_SIZE
-          config_obj[:limits][:max_container_depth] = config[:max_container_depth] || DEFAULT_MAX_CONTAINER_DEPTH
-          config_obj[:limits][:max_string_length]   = config[:max_string_length]   || DEFAULT_MAX_STRING_LENGTH
+          config_obj[:limits][:max_container_size]  = limits[:max_container_size]  || DEFAULT_MAX_CONTAINER_SIZE
+          config_obj[:limits][:max_container_depth] = limits[:max_container_depth] || DEFAULT_MAX_CONTAINER_DEPTH
+          config_obj[:limits][:max_string_length]   = limits[:max_string_length]   || DEFAULT_MAX_STRING_LENGTH
+          config_obj[:obfuscator][:key_regex]       = FFI::MemoryPointer.from_string(obfuscator[:key_regex])   if obfuscator[:key_regex]
+          config_obj[:obfuscator][:value_regex]     = FFI::MemoryPointer.from_string(obfuscator[:value_regex]) if obfuscator[:value_regex]
 
-          ruleset_info = LibDDWAF::RuleSetInfoNone
+          ruleset_info = LibDDWAF::RuleSetInfo.new
 
           @handle_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj, ruleset_info)
+
+          @ruleset_info = {
+            loaded: ruleset_info[:loaded],
+            failed: ruleset_info[:failed],
+            errors: WAF.object_to_ruby(ruleset_info[:errors]),
+            version: ruleset_info[:version],
+          }
+
           if @handle_obj.null?
-            fail LibDDWAF::Error, 'Could not create handle'
+            fail LibDDWAF::Error.new('Could not create handle', ruleset_info: @ruleset_info)
           end
 
           ObjectSpace.define_finalizer(self, Handle.finalizer(handle_obj))
@@ -387,6 +405,15 @@ module Datadog
             Datadog::AppSec::WAF::LibDDWAF.ddwaf_destroy(handle_obj)
           end
         end
+
+        def required_addresses
+          count = Datadog::AppSec::WAF::LibDDWAF::UInt32Ptr.new
+          list = Datadog::AppSec::WAF::LibDDWAF.ddwaf_required_addresses(handle_obj, count)
+
+          return [] if count == 0 # list is null
+
+          list.get_array_of_string(0, count[:value])
+        end
       end
 
       Result = Struct.new(:action, :data, :total_runtime, :timeout)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.3.0.0.0.beta1
+  version: 1.3.0.1.0.beta1
 platform: aarch64-linux
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi