Skip to content

Commit f33cc46

Browse files
gnufedeavara1986
andauthored
fix(iast): patch simplejson.encoder to handle LazyTaintDict properly (#7428) [backport 2.0] (#7452)
IAST: SimpleJSON encoder should handle LazyTaintDict and LazyTaintList by encoding their inner Dict and List, without this change, it would throw an exception because they are not serializable objects. - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment. - [x] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) - [x] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [x] This PR doesn't touch any of that. --------- Co-authored-by: Alberto Vara <[email protected]> (cherry picked from commit 306a890)
1 parent c76f642 commit f33cc46

File tree

19 files changed

+108
-86
lines changed

19 files changed

+108
-86
lines changed

.riot/requirements/c9b99a0.txt renamed to .riot/requirements/12eada4.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/c9b99a0.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/12eada4.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
99
certifi==2023.7.22
1010
cffi==1.15.1
11-
charset-normalizer==3.3.1
11+
charset-normalizer==3.3.2
1212
click==7.1.2
1313
coverage[toml]==7.2.7
1414
cryptography==41.0.5
@@ -32,11 +32,12 @@ pytest==7.4.3
3232
pytest-cov==4.1.0
3333
pytest-mock==3.11.1
3434
requests==2.31.0
35+
simplejson==3.19.2
3536
six==1.16.0
3637
sortedcontainers==2.4.0
3738
tomli==2.0.1
3839
typing-extensions==4.7.1
3940
urllib3==2.0.7
4041
werkzeug==1.0.1
41-
wheel==0.41.2
42+
wheel==0.41.3
4243
zipp==3.15.0

.riot/requirements/1483961.txt renamed to .riot/requirements/135d329.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.9
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1483961.in
5+
# pip-compile --no-annotate .riot/requirements/135d329.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -33,10 +33,11 @@ pytest==7.4.3
3333
pytest-cov==4.1.0
3434
pytest-mock==3.12.0
3535
requests==2.31.0
36+
simplejson==3.19.2
3637
six==1.16.0
3738
sortedcontainers==2.4.0
3839
tomli==2.0.1
3940
urllib3==2.0.7
4041
werkzeug==3.0.1
41-
wheel==0.41.2
42+
wheel==0.41.3
4243
zipp==3.17.0

.riot/requirements/13790d2.txt renamed to .riot/requirements/13e7a0f.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/13790d2.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/13e7a0f.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
99
certifi==2023.7.22
1010
cffi==1.15.1
11-
charset-normalizer==3.3.1
11+
charset-normalizer==3.3.2
1212
click==8.1.7
1313
coverage[toml]==7.2.7
1414
cryptography==41.0.5
@@ -32,11 +32,12 @@ pytest==7.4.3
3232
pytest-cov==4.1.0
3333
pytest-mock==3.11.1
3434
requests==2.31.0
35+
simplejson==3.19.2
3536
six==1.16.0
3637
sortedcontainers==2.4.0
3738
tomli==2.0.1
3839
typing-extensions==4.7.1
3940
urllib3==2.0.7
4041
werkzeug==2.2.3
41-
wheel==0.41.2
42+
wheel==0.41.3
4243
zipp==3.15.0

.riot/requirements/15bb169.txt renamed to .riot/requirements/141228d.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/15bb169.in
5+
# pip-compile --no-annotate .riot/requirements/141228d.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -32,9 +32,10 @@ pytest==7.4.3
3232
pytest-cov==4.1.0
3333
pytest-mock==3.12.0
3434
requests==2.31.0
35+
simplejson==3.19.2
3536
six==1.16.0
3637
sortedcontainers==2.4.0
3738
tomli==2.0.1
3839
urllib3==2.0.7
3940
werkzeug==3.0.1
40-
wheel==0.41.2
41+
wheel==0.41.3

.riot/requirements/2b46598.txt renamed to .riot/requirements/14e9b7c.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/2b46598.in
5+
# pip-compile --no-annotate .riot/requirements/14e9b7c.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -31,8 +31,9 @@ pytest==7.4.3
3131
pytest-cov==4.1.0
3232
pytest-mock==3.12.0
3333
requests==2.31.0
34+
simplejson==3.19.2
3435
six==1.16.0
3536
sortedcontainers==2.4.0
3637
urllib3==2.0.7
3738
werkzeug==3.0.1
38-
wheel==0.41.2
39+
wheel==0.41.3

.riot/requirements/5ee9ded.txt renamed to .riot/requirements/1a89546.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/5ee9ded.in
5+
# pip-compile --no-annotate .riot/requirements/1a89546.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -33,10 +33,11 @@ pytest==7.4.3
3333
pytest-cov==4.1.0
3434
pytest-mock==3.12.0
3535
requests==2.31.0
36+
simplejson==3.19.2
3637
six==1.16.0
3738
sortedcontainers==2.4.0
3839
tomli==2.0.1
3940
urllib3==2.0.7
4041
werkzeug==3.0.1
41-
wheel==0.41.2
42+
wheel==0.41.3
4243
zipp==3.17.0

.riot/requirements/1961d96.txt renamed to .riot/requirements/1c0a8cf.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/1961d96.in
5+
# pip-compile --no-annotate .riot/requirements/1c0a8cf.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -31,8 +31,9 @@ pytest==7.4.3
3131
pytest-cov==4.1.0
3232
pytest-mock==3.12.0
3333
requests==2.31.0
34+
simplejson==3.19.2
3435
six==1.16.0
3536
sortedcontainers==2.4.0
3637
urllib3==2.0.7
3738
werkzeug==3.0.1
38-
wheel==0.41.2
39+
wheel==0.41.3

.riot/requirements/194b700.txt renamed to .riot/requirements/3056fd9.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/194b700.in
5+
# pip-compile --no-annotate .riot/requirements/3056fd9.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -33,10 +33,11 @@ pytest==7.4.3
3333
pytest-cov==4.1.0
3434
pytest-mock==3.12.0
3535
requests==2.31.0
36+
simplejson==3.19.2
3637
six==1.16.0
3738
sortedcontainers==2.4.0
3839
tomli==2.0.1
3940
urllib3==2.0.7
4041
werkzeug==3.0.1
41-
wheel==0.41.2
42+
wheel==0.41.3
4243
zipp==3.17.0

.riot/requirements/5bb1431.txt renamed to .riot/requirements/3ea4153.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.9
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5bb1431.in
5+
# pip-compile --no-annotate .riot/requirements/3ea4153.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -33,10 +33,11 @@ pytest==7.4.3
3333
pytest-cov==4.1.0
3434
pytest-mock==3.12.0
3535
requests==2.31.0
36+
simplejson==3.19.2
3637
six==1.16.0
3738
sortedcontainers==2.4.0
3839
tomli==2.0.1
3940
urllib3==2.0.7
4041
werkzeug==3.0.1
41-
wheel==0.41.2
42+
wheel==0.41.3
4243
zipp==3.17.0

.riot/requirements/f00ead8.txt renamed to .riot/requirements/44824c2.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/f00ead8.in
5+
# pip-compile --no-annotate .riot/requirements/44824c2.in
66
#
77
astunparse==1.6.3
88
attrs==23.1.0
9-
blinker==1.6.3
9+
blinker==1.7.0
1010
certifi==2023.7.22
1111
cffi==1.16.0
12-
charset-normalizer==3.3.1
12+
charset-normalizer==3.3.2
1313
click==8.1.7
1414
coverage[toml]==7.3.2
1515
cryptography==41.0.5
@@ -31,8 +31,9 @@ pytest==7.4.3
3131
pytest-cov==4.1.0
3232
pytest-mock==3.12.0
3333
requests==2.31.0
34+
simplejson==3.19.2
3435
six==1.16.0
3536
sortedcontainers==2.4.0
3637
urllib3==2.0.7
3738
werkzeug==3.0.1
38-
wheel==0.41.2
39+
wheel==0.41.3

0 commit comments

Comments
 (0)