libddwaf 1.3.0.0.0.beta1-arm64-darwin → 1.3.0.1.0-arm64-darwin

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d61d30335dc5c90470f7b9ac71ceea1ae7da0042db544a8c62374edd124dd974
4
- data.tar.gz: 90dc658d8a988ec6ea7f4ead85848f132805027f16c82673907eef9acb14decf
3
+ metadata.gz: a691170b9bdc4e23f2e430785add53f2c0f41b9a429a6c13a8428c0285b2a974
4
+ data.tar.gz: 046b526ed58dc6d5c0abf55255642061a766b539e2e91d94a8a02ee7587080b5
5
5
  SHA512:
6
- metadata.gz: ff8d5353dbdd0407a2f6aecd76ad7ad9721088039fb02ba337b4fd42adf8261648172ae8a6281c135ca0b8b1e721e403a18938265fc97c46c334171c90574995
7
- data.tar.gz: a079420007d1d3cd9c85ad33b55e5412398360cbae4859aa56e41cc4d662ac5b964fc63a2e384a325570a259bbc1ac3451eb90022ab526fd905e740a9bbe9b5f
6
+ metadata.gz: 623f671fa1116b9d8dc4a6413723cc93c5eefe606eeaf11e10ab77d0b72f3c6b98c87ca0f8f1ba6acf9b050c5c46251c96d9a7ab5412ea60a0b4dc1ec7e6f69e
7
+ data.tar.gz: 475c973188acc9af9c3dce51352d35efeeb24c8fddb240e1ca3153be60a0caa6a02419dd02decaf4015bd67f55a502c03d7cb57505fafa434af26f83e32f1cfc
@@ -3,7 +3,7 @@ module Datadog
3
3
  module WAF
4
4
  module VERSION
5
5
  BASE_STRING = '1.3.0'
6
- STRING = "#{BASE_STRING}.0.0.beta1"
6
+ STRING = "#{BASE_STRING}.1.0"
7
7
  MINIMUM_RUBY_VERSION = '2.1'
8
8
  end
9
9
  end
@@ -6,7 +6,13 @@ module Datadog
6
6
  module AppSec
7
7
  module WAF
8
8
  module LibDDWAF
9
- class Error < StandardError; end
9
+ class Error < StandardError
10
+ attr_reader :ruleset_info
11
+
12
+ def initialize(msg, ruleset_info: nil)
13
+ @ruleset_info = ruleset_info
14
+ end
15
+ end
10
16
 
11
17
  extend ::FFI::Library
12
18
 
@@ -158,8 +164,8 @@ module Datadog
158
164
  end
159
165
 
160
166
  class Obfuscator < ::FFI::Struct
161
- layout :key_regex, :string,
162
- :value_regex, :string
167
+ layout :key_regex, :pointer, # :charptr
168
+ :value_regex, :pointer # :charptr
163
169
  end
164
170
 
165
171
  layout :limits, Limits,
@@ -183,7 +189,7 @@ module Datadog
183
189
  attach_function :ddwaf_init, [:ddwaf_rule, :ddwaf_config, :ddwaf_ruleset_info], :ddwaf_handle
184
190
  attach_function :ddwaf_destroy, [:ddwaf_handle], :void
185
191
 
186
- attach_function :ddwaf_required_addresses, [:ddwaf_handle, :uint32ptr], :charptrptr
192
+ attach_function :ddwaf_required_addresses, [:ddwaf_handle, UInt32Ptr], :charptrptr
187
193
 
188
194
  # running
189
195
 
@@ -354,7 +360,9 @@ module Datadog
354
360
  DEFAULT_MAX_CONTAINER_DEPTH = 0
355
361
  DEFAULT_MAX_STRING_LENGTH = 0
356
362
 
357
- def initialize(rule, config = {})
363
+ attr_reader :ruleset_info
364
+
365
+ def initialize(rule, limits: {}, obfuscator: {})
358
366
  rule_obj = Datadog::AppSec::WAF.ruby_to_object(rule)
359
367
  if rule_obj.null? || rule_obj[:type] == :ddwaf_object_invalid
360
368
  fail LibDDWAF::Error, "Could not convert object #{rule.inspect}"
@@ -365,15 +373,25 @@ module Datadog
365
373
  fail LibDDWAF::Error, 'Could not create config struct'
366
374
  end
367
375
 
368
- config_obj[:limits][:max_container_size] = config[:max_container_size] || DEFAULT_MAX_CONTAINER_SIZE
369
- config_obj[:limits][:max_container_depth] = config[:max_container_depth] || DEFAULT_MAX_CONTAINER_DEPTH
370
- config_obj[:limits][:max_string_length] = config[:max_string_length] || DEFAULT_MAX_STRING_LENGTH
376
+ config_obj[:limits][:max_container_size] = limits[:max_container_size] || DEFAULT_MAX_CONTAINER_SIZE
377
+ config_obj[:limits][:max_container_depth] = limits[:max_container_depth] || DEFAULT_MAX_CONTAINER_DEPTH
378
+ config_obj[:limits][:max_string_length] = limits[:max_string_length] || DEFAULT_MAX_STRING_LENGTH
379
+ config_obj[:obfuscator][:key_regex] = FFI::MemoryPointer.from_string(obfuscator[:key_regex]) if obfuscator[:key_regex]
380
+ config_obj[:obfuscator][:value_regex] = FFI::MemoryPointer.from_string(obfuscator[:value_regex]) if obfuscator[:value_regex]
371
381
 
372
- ruleset_info = LibDDWAF::RuleSetInfoNone
382
+ ruleset_info = LibDDWAF::RuleSetInfo.new
373
383
 
374
384
  @handle_obj = Datadog::AppSec::WAF::LibDDWAF.ddwaf_init(rule_obj, config_obj, ruleset_info)
385
+
386
+ @ruleset_info = {
387
+ loaded: ruleset_info[:loaded],
388
+ failed: ruleset_info[:failed],
389
+ errors: WAF.object_to_ruby(ruleset_info[:errors]),
390
+ version: ruleset_info[:version],
391
+ }
392
+
375
393
  if @handle_obj.null?
376
- fail LibDDWAF::Error, 'Could not create handle'
394
+ fail LibDDWAF::Error.new('Could not create handle', ruleset_info: @ruleset_info)
377
395
  end
378
396
 
379
397
  ObjectSpace.define_finalizer(self, Handle.finalizer(handle_obj))
@@ -387,6 +405,15 @@ module Datadog
387
405
  Datadog::AppSec::WAF::LibDDWAF.ddwaf_destroy(handle_obj)
388
406
  end
389
407
  end
408
+
409
+ def required_addresses
410
+ count = Datadog::AppSec::WAF::LibDDWAF::UInt32Ptr.new
411
+ list = Datadog::AppSec::WAF::LibDDWAF.ddwaf_required_addresses(handle_obj, count)
412
+
413
+ return [] if count == 0 # list is null
414
+
415
+ list.get_array_of_string(0, count[:value])
416
+ end
390
417
  end
391
418
 
392
419
  Result = Struct.new(:action, :data, :total_runtime, :timeout)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: libddwaf
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0.0.0.beta1
4
+ version: 1.3.0.1.0
5
5
  platform: arm64-darwin
6
6
  authors:
7
7
  - Datadog, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-04-20 00:00:00.000000000 Z
11
+ date: 2022-04-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ffi