libddwaf 1.24.1.1.1-arm64-darwin → 1.24.1.2.0-arm64-darwin
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2 -0
- data/lib/datadog/appsec/waf/context.rb +1 -1
- data/lib/datadog/appsec/waf/converter.rb +27 -24
- data/lib/datadog/appsec/waf/lib_ddwaf.rb +4 -4
- data/lib/datadog/appsec/waf/version.rb +1 -1
- data/libddwaf.gemspec +1 -1
- data/sig/datadog/appsec/waf/lib_ddwaf.rbs +2 -2
- metadata +6 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f155da2ea617fe7e28baf77011df01a78a2c2e197eb56cf16b1cc9ff4bec38c7
|
4
|
+
data.tar.gz: 46c22163bc429fd740671fbfe7e98faf83547d975ddd312a5629c3dfe44f191e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b516dc2cfc8c780946beedbc4d3e82f8ad7e3c1381319305416fcca9a421db2930f27d7773f061bcba8b53f1b7d377a7234754c76845bd7d2d6b1f0c573c75a9
|
7
|
+
data.tar.gz: 9f0752b9016faf3ccd283481ef0224646b57f37b0226f59786898c72adbda7bd1ce3cbc97881616d9ba79c50bb5959709c80265ee18cc1df1d22a852dd303c5d
|
data/CHANGELOG.md
CHANGED
@@ -83,7 +83,7 @@ module Datadog
|
|
83
83
|
Converter.object_to_ruby(result_obj[:derivatives])
|
84
84
|
)
|
85
85
|
|
86
|
-
if persistent_data_obj.
|
86
|
+
if persistent_data_obj.input_truncated? || ephemeral_data_obj.input_truncated?
|
87
87
|
result.mark_input_truncated!
|
88
88
|
end
|
89
89
|
|
@@ -15,15 +15,11 @@ module Datadog
|
|
15
15
|
res = LibDDWAF.ddwaf_object_array(obj)
|
16
16
|
raise ConversionError, "Could not convert into object: #{val}" if res.null?
|
17
17
|
|
18
|
+
max_index = max_container_size - 1 if max_container_size
|
18
19
|
if max_container_depth == 0
|
19
|
-
top_obj&.
|
20
|
+
top_obj&.mark_as_input_truncated!
|
20
21
|
else
|
21
22
|
val.each.with_index do |e, i|
|
22
|
-
if max_container_size && i >= max_container_size
|
23
|
-
(top_obj || obj).mark_truncated!
|
24
|
-
break val
|
25
|
-
end
|
26
|
-
|
27
23
|
member = Converter.ruby_to_object(
|
28
24
|
e,
|
29
25
|
max_container_size: max_container_size,
|
@@ -34,6 +30,11 @@ module Datadog
|
|
34
30
|
)
|
35
31
|
e_res = LibDDWAF.ddwaf_object_array_add(obj, member)
|
36
32
|
raise ConversionError, "Could not add to array object: #{e.inspect}" unless e_res
|
33
|
+
|
34
|
+
if max_index && i >= max_index
|
35
|
+
(top_obj || obj).mark_as_input_truncated!
|
36
|
+
break val
|
37
|
+
end
|
37
38
|
end
|
38
39
|
end
|
39
40
|
|
@@ -43,22 +44,18 @@ module Datadog
|
|
43
44
|
res = LibDDWAF.ddwaf_object_map(obj)
|
44
45
|
raise ConversionError, "Could not convert into object: #{val}" if res.null?
|
45
46
|
|
47
|
+
max_index = max_container_size - 1 if max_container_size
|
46
48
|
if max_container_depth == 0
|
47
|
-
top_obj&.
|
49
|
+
top_obj&.mark_as_input_truncated!
|
48
50
|
else
|
49
51
|
val.each.with_index do |e, i|
|
50
|
-
if max_container_size && i >= max_container_size
|
51
|
-
(top_obj || obj).mark_truncated!
|
52
|
-
break val
|
53
|
-
end
|
54
|
-
|
55
52
|
# for Steep, which doesn't handle |(k, v), i|
|
56
|
-
k = e[0]
|
53
|
+
k = e[0]
|
57
54
|
v = e[1]
|
58
55
|
|
59
56
|
if max_string_length && k.length > max_string_length
|
60
|
-
k = k[0, max_string_length]
|
61
|
-
(top_obj || obj).
|
57
|
+
k = k.to_s[0, max_string_length]
|
58
|
+
(top_obj || obj).mark_as_input_truncated!
|
62
59
|
end
|
63
60
|
member = Converter.ruby_to_object(
|
64
61
|
v,
|
@@ -68,8 +65,13 @@ module Datadog
|
|
68
65
|
top_obj: top_obj || obj,
|
69
66
|
coerce: coerce
|
70
67
|
)
|
71
|
-
kv_res = LibDDWAF.ddwaf_object_map_addl(obj, k, k.bytesize, member)
|
72
|
-
raise ConversionError, "Could not add to map object: #{
|
68
|
+
kv_res = LibDDWAF.ddwaf_object_map_addl(obj, k.to_s, k.to_s.bytesize, member)
|
69
|
+
raise ConversionError, "Could not add to map object: #{k.inspect} => #{v.inspect}" unless kv_res
|
70
|
+
|
71
|
+
if max_index && i >= max_index
|
72
|
+
(top_obj || obj).mark_as_input_truncated!
|
73
|
+
break val
|
74
|
+
end
|
73
75
|
end
|
74
76
|
end
|
75
77
|
|
@@ -78,20 +80,21 @@ module Datadog
|
|
78
80
|
obj = LibDDWAF::Object.new
|
79
81
|
encoded_val = val.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
|
80
82
|
if max_string_length && encoded_val.length > max_string_length
|
81
|
-
encoded_val = encoded_val[0, max_string_length]
|
82
|
-
(top_obj || obj).
|
83
|
+
encoded_val = encoded_val[0, max_string_length]
|
84
|
+
(top_obj || obj).mark_as_input_truncated!
|
83
85
|
end
|
84
|
-
|
86
|
+
str = encoded_val.to_s
|
87
|
+
res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
|
85
88
|
raise ConversionError, "Could not convert into object: #{val.inspect}" if res.null?
|
86
89
|
|
87
90
|
obj
|
88
91
|
when Symbol
|
89
92
|
obj = LibDDWAF::Object.new
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
(top_obj || obj).mark_truncated!
|
93
|
+
if max_string_length
|
94
|
+
val = val.to_s[0, max_string_length]
|
95
|
+
(top_obj || obj).mark_as_input_truncated!
|
94
96
|
end
|
97
|
+
str = val.to_s
|
95
98
|
res = LibDDWAF.ddwaf_object_stringl(obj, str, str.bytesize)
|
96
99
|
raise ConversionError, "Could not convert into object: #{val.inspect}" if res.null?
|
97
100
|
|
@@ -137,12 +137,12 @@ module Datadog
|
|
137
137
|
:nbEntries, :uint64,
|
138
138
|
:type, :ddwaf_obj_type
|
139
139
|
|
140
|
-
def
|
141
|
-
@
|
140
|
+
def input_truncated?
|
141
|
+
@input_truncated == true
|
142
142
|
end
|
143
143
|
|
144
|
-
def
|
145
|
-
@
|
144
|
+
def mark_as_input_truncated!
|
145
|
+
@input_truncated = true
|
146
146
|
end
|
147
147
|
end
|
148
148
|
|
@@ -5,7 +5,7 @@ module Datadog
|
|
5
5
|
BASE_STRING = "1.24.1"
|
6
6
|
# NOTE: Every change to the `BASE_STRING` should be accompanied
|
7
7
|
# by a reset of the patch version in the `STRING` below.
|
8
|
-
STRING = "#{BASE_STRING}.
|
8
|
+
STRING = "#{BASE_STRING}.2.0"
|
9
9
|
MINIMUM_RUBY_VERSION = "2.5"
|
10
10
|
end
|
11
11
|
end
|
data/libddwaf.gemspec
CHANGED
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
|
|
11
11
|
spec.email = ["dev@datadoghq.com"]
|
12
12
|
|
13
13
|
spec.summary = "Datadog WAF"
|
14
|
-
spec.description = <<-EOS.gsub(
|
14
|
+
spec.description = <<-EOS.gsub(/^[\s]+/, "")
|
15
15
|
libddwaf packages a WAF implementation in C++, exposed to Ruby
|
16
16
|
EOS
|
17
17
|
|
@@ -58,9 +58,9 @@ module Datadog
|
|
58
58
|
end
|
59
59
|
|
60
60
|
class Object < ::FFI::Struct[::FFI::AbstractMemory, untyped]
|
61
|
-
def
|
61
|
+
def input_truncated?: () -> bool
|
62
62
|
|
63
|
-
def
|
63
|
+
def mark_as_input_truncated!: () -> bool
|
64
64
|
end
|
65
65
|
|
66
66
|
# setters
|
metadata
CHANGED
@@ -1,13 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: libddwaf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.24.1.
|
4
|
+
version: 1.24.1.2.0
|
5
5
|
platform: arm64-darwin
|
6
6
|
authors:
|
7
7
|
- Datadog, Inc.
|
8
|
+
autorequire:
|
8
9
|
bindir: bin
|
9
10
|
cert_chain: []
|
10
|
-
date: 2025-09-
|
11
|
+
date: 2025-09-02 00:00:00.000000000 Z
|
11
12
|
dependencies:
|
12
13
|
- !ruby/object:Gem::Dependency
|
13
14
|
name: ffi
|
@@ -68,6 +69,7 @@ licenses:
|
|
68
69
|
- BSD-3-Clause
|
69
70
|
metadata:
|
70
71
|
allowed_push_host: https://rubygems.org
|
72
|
+
post_install_message:
|
71
73
|
rdoc_options: []
|
72
74
|
require_paths:
|
73
75
|
- lib
|
@@ -82,7 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
82
84
|
- !ruby/object:Gem::Version
|
83
85
|
version: 2.0.0
|
84
86
|
requirements: []
|
85
|
-
rubygems_version: 3.
|
87
|
+
rubygems_version: 3.5.21
|
88
|
+
signing_key:
|
86
89
|
specification_version: 4
|
87
90
|
summary: Datadog WAF
|
88
91
|
test_files: []
|