-
Notifications
You must be signed in to change notification settings - Fork 318
Libddwaf upgrade to 17.1.0 #9486
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Hi! 👋 Thanks for your pull request! 🎉 To help us review it, please make sure to:
If you need help, please check our contributing guidelines. |
|
|
||
| private static final JsonAdapter<List<WAFResultData>> RES_JSON_ADAPTER; | ||
|
|
||
| private static final Map<String, ActionInfo> DEFAULT_ACTIONS; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dead code
|
🎯 Code Coverage 🔗 Commit SHA: b8d3158 | Docs | Was this helpful? Give us feedback! |
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 58 metrics, 7 unstable metrics. Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.02 s) : 0, 1019616
Total [baseline] (10.679 s) : 0, 10678734
Agent [candidate] (1.026 s) : 0, 1026235
Total [candidate] (10.791 s) : 0, 10790721
section appsec
Agent [baseline] (1.195 s) : 0, 1195069
Total [baseline] (11.022 s) : 0, 11022073
Agent [candidate] (1.199 s) : 0, 1199396
Total [candidate] (10.976 s) : 0, 10976021
section iast
Agent [baseline] (1.149 s) : 0, 1149451
Total [baseline] (10.896 s) : 0, 10896095
Agent [candidate] (1.148 s) : 0, 1148411
Total [candidate] (10.97 s) : 0, 10969964
section profiling
Agent [baseline] (1.169 s) : 0, 1168717
Total [baseline] (11.066 s) : 0, 11065676
Agent [candidate] (1.165 s) : 0, 1165350
Total [candidate] (11.04 s) : 0, 11039854
gantt
title petclinic - break down per module: candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.461 ms) : 0, 1461
crashtracking [candidate] (1.462 ms) : 0, 1462
BytebuddyAgent [baseline] (695.0 ms) : 0, 695000
BytebuddyAgent [candidate] (699.185 ms) : 0, 699185
GlobalTracer [baseline] (242.105 ms) : 0, 242105
GlobalTracer [candidate] (244.723 ms) : 0, 244723
AppSec [baseline] (32.674 ms) : 0, 32674
AppSec [candidate] (32.437 ms) : 0, 32437
Debugger [baseline] (6.39 ms) : 0, 6390
Debugger [candidate] (6.401 ms) : 0, 6401
Remote Config [baseline] (697.823 µs) : 0, 698
Remote Config [candidate] (678.455 µs) : 0, 678
Telemetry [baseline] (9.168 ms) : 0, 9168
Telemetry [candidate] (9.365 ms) : 0, 9365
Flare Poller [baseline] (10.989 ms) : 0, 10989
Flare Poller [candidate] (10.787 ms) : 0, 10787
section appsec
crashtracking [baseline] (1.462 ms) : 0, 1462
crashtracking [candidate] (1.477 ms) : 0, 1477
BytebuddyAgent [baseline] (718.182 ms) : 0, 718182
BytebuddyAgent [candidate] (722.908 ms) : 0, 722908
GlobalTracer [baseline] (234.68 ms) : 0, 234680
GlobalTracer [candidate] (235.884 ms) : 0, 235884
AppSec [baseline] (173.784 ms) : 0, 173784
AppSec [candidate] (173.923 ms) : 0, 173923
Debugger [baseline] (6.201 ms) : 0, 6201
Debugger [candidate] (6.038 ms) : 0, 6038
Remote Config [baseline] (660.442 µs) : 0, 660
Remote Config [candidate] (641.793 µs) : 0, 642
Telemetry [baseline] (10.005 ms) : 0, 10005
Telemetry [candidate] (8.523 ms) : 0, 8523
Flare Poller [baseline] (4.01 ms) : 0, 4010
Flare Poller [candidate] (3.883 ms) : 0, 3883
IAST [baseline] (24.973 ms) : 0, 24973
IAST [candidate] (24.849 ms) : 0, 24849
section iast
crashtracking [baseline] (1.457 ms) : 0, 1457
crashtracking [candidate] (1.469 ms) : 0, 1469
BytebuddyAgent [baseline] (813.459 ms) : 0, 813459
BytebuddyAgent [candidate] (812.645 ms) : 0, 812645
GlobalTracer [baseline] (231.774 ms) : 0, 231774
GlobalTracer [candidate] (232.892 ms) : 0, 232892
AppSec [baseline] (35.432 ms) : 0, 35432
AppSec [candidate] (34.654 ms) : 0, 34654
Debugger [baseline] (6.066 ms) : 0, 6066
Debugger [candidate] (6.1 ms) : 0, 6100
Remote Config [baseline] (601.38 µs) : 0, 601
Remote Config [candidate] (606.962 µs) : 0, 607
Telemetry [baseline] (8.468 ms) : 0, 8468
Telemetry [candidate] (8.475 ms) : 0, 8475
Flare Poller [baseline] (4.23 ms) : 0, 4230
Flare Poller [candidate] (4.203 ms) : 0, 4203
IAST [baseline] (26.798 ms) : 0, 26798
IAST [candidate] (26.178 ms) : 0, 26178
section profiling
crashtracking [baseline] (1.427 ms) : 0, 1427
crashtracking [candidate] (1.429 ms) : 0, 1429
BytebuddyAgent [baseline] (726.967 ms) : 0, 726967
BytebuddyAgent [candidate] (723.293 ms) : 0, 723293
GlobalTracer [baseline] (219.446 ms) : 0, 219446
GlobalTracer [candidate] (218.698 ms) : 0, 218698
AppSec [baseline] (33.264 ms) : 0, 33264
AppSec [candidate] (32.324 ms) : 0, 32324
Debugger [baseline] (7.327 ms) : 0, 7327
Debugger [candidate] (6.536 ms) : 0, 6536
Remote Config [baseline] (695.408 µs) : 0, 695
Remote Config [candidate] (737.072 µs) : 0, 737
Telemetry [baseline] (15.86 ms) : 0, 15860
Telemetry [candidate] (16.75 ms) : 0, 16750
Flare Poller [baseline] (4.143 ms) : 0, 4143
Flare Poller [candidate] (4.147 ms) : 0, 4147
ProfilingAgent [baseline] (106.8 ms) : 0, 106800
ProfilingAgent [candidate] (107.776 ms) : 0, 107776
Profiling [baseline] (107.406 ms) : 0, 107406
Profiling [candidate] (109.658 ms) : 0, 109658
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.019 s) : 0, 1018544
Total [baseline] (8.689 s) : 0, 8689199
Agent [candidate] (1.02 s) : 0, 1019962
Total [candidate] (8.698 s) : 0, 8698412
section iast
Agent [baseline] (1.159 s) : 0, 1159142
Total [baseline] (9.262 s) : 0, 9261880
Agent [candidate] (1.159 s) : 0, 1159233
Total [candidate] (9.302 s) : 0, 9301579
gantt
title insecure-bank - break down per module: candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.459 ms) : 0, 1459
crashtracking [candidate] (1.465 ms) : 0, 1465
BytebuddyAgent [baseline] (694.934 ms) : 0, 694934
BytebuddyAgent [candidate] (695.057 ms) : 0, 695057
GlobalTracer [baseline] (241.984 ms) : 0, 241984
GlobalTracer [candidate] (243.349 ms) : 0, 243349
AppSec [baseline] (32.689 ms) : 0, 32689
AppSec [candidate] (32.104 ms) : 0, 32104
Debugger [baseline] (6.424 ms) : 0, 6424
Debugger [candidate] (6.334 ms) : 0, 6334
Remote Config [baseline] (695.531 µs) : 0, 696
Remote Config [candidate] (671.084 µs) : 0, 671
Telemetry [baseline] (9.2 ms) : 0, 9200
Telemetry [candidate] (9.32 ms) : 0, 9320
Flare Poller [baseline] (10.067 ms) : 0, 10067
Flare Poller [candidate] (10.574 ms) : 0, 10574
section iast
crashtracking [baseline] (1.475 ms) : 0, 1475
crashtracking [candidate] (1.473 ms) : 0, 1473
BytebuddyAgent [baseline] (820.667 ms) : 0, 820667
BytebuddyAgent [candidate] (820.611 ms) : 0, 820611
GlobalTracer [baseline] (233.311 ms) : 0, 233311
GlobalTracer [candidate] (234.216 ms) : 0, 234216
AppSec [baseline] (35.672 ms) : 0, 35672
AppSec [candidate] (35.359 ms) : 0, 35359
Debugger [baseline] (6.054 ms) : 0, 6054
Debugger [candidate] (6.206 ms) : 0, 6206
Remote Config [baseline] (597.538 µs) : 0, 598
Remote Config [candidate] (614.789 µs) : 0, 615
Telemetry [baseline] (8.494 ms) : 0, 8494
Telemetry [candidate] (8.691 ms) : 0, 8691
Flare Poller [baseline] (4.301 ms) : 0, 4301
Flare Poller [candidate] (4.266 ms) : 0, 4266
IAST [baseline] (27.182 ms) : 0, 27182
IAST [candidate] (26.491 ms) : 0, 26491
LoadParameters
See matching parameters
SummaryFound 2 performance improvements and 3 performance regressions! Performance is the same for 7 metrics, 12 unstable metrics.
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section baseline
no_agent (36.841 ms) : 36539, 37143
. : milestone, 36841,
appsec (47.813 ms) : 47412, 48213
. : milestone, 47813,
code_origins (44.314 ms) : 43928, 44699
. : milestone, 44314,
iast (46.381 ms) : 45969, 46793
. : milestone, 46381,
profiling (48.23 ms) : 47790, 48670
. : milestone, 48230,
tracing (43.567 ms) : 43192, 43942
. : milestone, 43567,
section candidate
no_agent (36.993 ms) : 36693, 37292
. : milestone, 36993,
appsec (47.997 ms) : 47568, 48426
. : milestone, 47997,
code_origins (43.574 ms) : 43197, 43951
. : milestone, 43574,
iast (44.865 ms) : 44467, 45263
. : milestone, 44865,
profiling (47.097 ms) : 46669, 47525
. : milestone, 47097,
tracing (45.464 ms) : 45065, 45863
. : milestone, 45464,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section baseline
no_agent (4.534 ms) : 4483, 4586
. : milestone, 4534,
iast (9.529 ms) : 9369, 9688
. : milestone, 9529,
iast_FULL (14.315 ms) : 14029, 14602
. : milestone, 14315,
iast_GLOBAL (10.349 ms) : 10165, 10534
. : milestone, 10349,
profiling (8.679 ms) : 8539, 8820
. : milestone, 8679,
tracing (7.702 ms) : 7593, 7811
. : milestone, 7702,
section candidate
no_agent (4.346 ms) : 4298, 4395
. : milestone, 4346,
iast (10.018 ms) : 9850, 10187
. : milestone, 10018,
iast_FULL (14.578 ms) : 14290, 14867
. : milestone, 14578,
iast_GLOBAL (10.99 ms) : 10794, 11187
. : milestone, 10990,
profiling (8.55 ms) : 8408, 8691
. : milestone, 8550,
tracing (7.853 ms) : 7732, 7974
. : milestone, 7853,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 0 unstable metrics. Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section baseline
no_agent (1.469 ms) : 1457, 1480
. : milestone, 1469,
appsec (2.501 ms) : 2447, 2555
. : milestone, 2501,
iast (2.196 ms) : 2133, 2260
. : milestone, 2196,
iast_GLOBAL (2.25 ms) : 2186, 2314
. : milestone, 2250,
profiling (2.055 ms) : 2003, 2107
. : milestone, 2055,
tracing (2.019 ms) : 1969, 2069
. : milestone, 2019,
section candidate
no_agent (1.47 ms) : 1458, 1481
. : milestone, 1470,
appsec (2.492 ms) : 2439, 2546
. : milestone, 2492,
iast (2.204 ms) : 2140, 2267
. : milestone, 2204,
iast_GLOBAL (2.256 ms) : 2192, 2320
. : milestone, 2256,
profiling (2.062 ms) : 2009, 2115
. : milestone, 2062,
tracing (2.022 ms) : 1972, 2071
. : milestone, 2022,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.54.0-SNAPSHOT~b8d31589e9, baseline=1.54.0-SNAPSHOT~4386dc46f0
dateFormat X
axisFormat %s
section baseline
no_agent (15.047 s) : 15047000, 15047000
. : milestone, 15047000,
appsec (14.95 s) : 14950000, 14950000
. : milestone, 14950000,
iast (18.74 s) : 18740000, 18740000
. : milestone, 18740000,
iast_GLOBAL (18.069 s) : 18069000, 18069000
. : milestone, 18069000,
profiling (15.393 s) : 15393000, 15393000
. : milestone, 15393000,
tracing (15.237 s) : 15237000, 15237000
. : milestone, 15237000,
section candidate
no_agent (14.976 s) : 14976000, 14976000
. : milestone, 14976000,
appsec (14.964 s) : 14964000, 14964000
. : milestone, 14964000,
iast (18.437 s) : 18437000, 18437000
. : milestone, 18437000,
iast_GLOBAL (18.191 s) : 18191000, 18191000
. : milestone, 18191000,
profiling (15.435 s) : 15435000, 15435000
. : milestone, 15435000,
tracing (15.216 s) : 15216000, 15216000
. : milestone, 15216000,
|
|
Hi! 👋 Looks like you updated a Git Submodule.
|
8460db5 to
bc5038c
Compare
|
Hi! 👋 Looks like you updated a Git Submodule.
|
bc5038c to
44902b2
Compare
|
Hi! 👋 Looks like you updated a Git Submodule.
|
44902b2 to
d847652
Compare
|
Hi! 👋 Looks like you updated a Git Submodule.
|
2 similar comments
|
Hi! 👋 Looks like you updated a Git Submodule.
|
|
Hi! 👋 Looks like you updated a Git Submodule.
|
b4ee066 to
8108556
Compare
|
Hi! 👋 Looks like you updated a Git Submodule.
|
dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
Show resolved
Hide resolved
jandro996
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added a comment related with the ASM_KEEP tag that seems that should not be removed.
Just a quick note, this isn’t super relevant for this PR specifically, but IMHO it’s always easier to review smaller, focused PRs. This one could probably be split into 2 or 3, in case of a regression, it makes rollbacks simpler too 😊
eb328ea to
c65718c
Compare
Signed-off-by: sezen.leblay <sezen.leblay@datadoghq.com>
This reverts commit d999005.
44eee7c to
5d0cbd7
Compare
5d0cbd7 to
00fa9fd
Compare
Signed-off-by: sezen.leblay <sezen.leblay@datadoghq.com>
Signed-off-by: sezen.leblay <sezen.leblay@datadoghq.com>
dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java
Show resolved
Hide resolved
dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
Show resolved
Hide resolved
dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
Show resolved
Hide resolved
dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java
Show resolved
Hide resolved
jandro996
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
What Does This Do
small upgrade for waf on the libddwaf side, the new version of libddwaf allows for us to remove the earlier custom implementation of json parsing (numbers were parsed to double which the waf rejected, there is no longer an issue with this) and bug fixes to trace tagging (sampling priority fix) + enhancement of smoke tests
Motivation
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any usefull labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: APPSEC-58796