Merge branch '2.10' into backport-10021-to-2.10

DataDog · Aug 2, 2024 · e40de0d · e40de0d
2 parents 7ac67ca + 156f57f
commit e40de0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/ddtrace/appsec/_iast/_ast/ast_patching.py b/ddtrace/appsec/_iast/_ast/ast_patching.py
@@ -39,6 +39,7 @@
     "ddsketch",
     "ddtrace",
     "encodings",  # this package is used to load encodings when a module is imported, propagation is not needed
+    "encodings.idna",
     "envier",
     "exceptiongroup",
     "freezegun",  # Testing utilities for time manipulation

diff --git a/releasenotes/notes/asm-avoid-idna-d724dce73afafa93.yaml b/releasenotes/notes/asm-avoid-idna-d724dce73afafa93.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Code Security: add encodings.idna to the IAST patching denylist to avoid problems with gevent.