Skip to content

Commit 308fa08

Browse files
pcrespovpcrespov
authored
⬆️ Maintenance/security update httpx (ITISFoundation#3087)
1 parent 2ca8edf commit 308fa08

File tree

22 files changed

+214
-118
lines changed

22 files changed

+214
-118
lines changed

‎packages/models-library/src/models_library/service_settings_labels.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ class Config(_BaseConfig):
264264
extra = Extra.allow
265265
schema_extra = {
266266
"examples": [
267+
# WARNING: do not change order. Used in tests!
267268
# legacy service
268269
{
269270
"simcore.service.settings": json.dumps(

‎requirements/constraints.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
#
1111
aiohttp>=3.7.4 # https://github.com/advisories/GHSA-v6wp-4m6f-gcjg
1212
cryptography>=3.3.2 # https://github.com/advisories/GHSA-rhm9-p9w5-fwm7 Feb.2021
13+
httpx>=0.23.0 # https://github.com/advisories/GHSA-h8pj-cxx2-jfg2 / CVE-2021-41945
1314
jinja2>=2.11.3 # https://github.com/advisories/GHSA-g3rq-g295-4j3m
15+
paramiko>=2.10.1 # https://github.com/advisories/GHSA-f8q4-jwww-x3wv
1416
pydantic>=1.8.2 # https://github.com/advisories/GHSA-5jqp-qgf6-3pvh
1517
pyyaml>=5.4 # https://github.com/advisories/GHSA-8q59-q68h-6hv4
1618
rsa>=4.1 # https://github.com/advisories/GHSA-537h-rv9q-vvph
1719
sqlalchemy[postgresql_psycopg2binary]>=1.3.3 # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
1820
sqlalchemy>=1.3.3 # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
1921
urllib3>=1.26.5 # https://github.com/advisories/GHSA-q2q7-5pp4-w6pg
20-
paramiko>=2.10.1 # https://github.com/advisories/GHSA-f8q4-jwww-x3wv
2122

2223
#
2324
# Breaking changes

‎services/api-server/requirements/_base.txt‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ cffi==1.15.0
7070
charset-normalizer==2.0.12
7171
# via
7272
# aiohttp
73-
# httpx
7473
# requests
7574
click==8.0.4
7675
# via
@@ -113,12 +112,24 @@ h11==0.12.0
113112
# via
114113
# httpcore
115114
# uvicorn
116-
httpcore==0.14.7
115+
httpcore==0.15.0
117116
# via httpx
118117
httptools==0.2.0
119118
# via uvicorn
120-
httpx==0.22.0
121-
# via -r requirements/_base.in
119+
httpx==0.23.0
120+
# via
121+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
122+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
123+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
124+
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
125+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
126+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
127+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
128+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
129+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
130+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
131+
# -c requirements/../../../requirements/constraints.txt
132+
# -r requirements/_base.in
122133
idna==3.3
123134
# via
124135
# anyio

‎services/api-server/requirements/_test.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ cfn-lint==0.60.1
6363
charset-normalizer==2.0.12
6464
# via
6565
# -c requirements/_base.txt
66-
# httpx
6766
# requests
6867
click==8.0.4
6968
# via
@@ -131,12 +130,13 @@ h11==0.12.0
131130
# via
132131
# -c requirements/_base.txt
133132
# httpcore
134-
httpcore==0.14.7
133+
httpcore==0.15.0
135134
# via
136135
# -c requirements/_base.txt
137136
# httpx
138-
httpx==0.22.0
137+
httpx==0.23.0
139138
# via
139+
# -c requirements/../../../requirements/constraints.txt
140140
# -c requirements/_base.txt
141141
# respx
142142
idna==3.3

‎services/catalog/requirements/_base.txt‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ certifi==2020.12.5
3535
# requests
3636
chardet==3.0.4
3737
# via requests
38-
charset-normalizer==2.0.10
39-
# via httpx
4038
click==8.0.3
4139
# via
4240
# typer
@@ -60,12 +58,19 @@ h11==0.12.0
6058
# via
6159
# httpcore
6260
# uvicorn
63-
httpcore==0.14.4
61+
httpcore==0.15.0
6462
# via httpx
6563
httptools==0.2.0
6664
# via uvicorn
67-
httpx==0.21.3
68-
# via -r requirements/_base.in
65+
httpx==0.23.0
66+
# via
67+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
68+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
69+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
70+
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
71+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
72+
# -c requirements/../../../requirements/constraints.txt
73+
# -r requirements/_base.in
6974
idna==2.10
7075
# via
7176
# anyio
@@ -215,3 +220,6 @@ websockets==10.1
215220
# via uvicorn
216221
yarl==1.6.3
217222
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
223+
224+
# The following packages are considered to be unsafe in a requirements file:
225+
# setuptools

‎services/catalog/requirements/_test.txt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ chardet==3.0.4
4848
# -c requirements/_base.txt
4949
# requests
5050
charset-normalizer==2.0.10
51-
# via
52-
# -c requirements/_base.txt
53-
# aiohttp
54-
# httpx
51+
# via aiohttp
5552
click==8.0.3
5653
# via
5754
# -c requirements/_base.txt
@@ -101,12 +98,13 @@ h11==0.12.0
10198
# via
10299
# -c requirements/_base.txt
103100
# httpcore
104-
httpcore==0.14.4
101+
httpcore==0.15.0
105102
# via
106103
# -c requirements/_base.txt
107104
# httpx
108-
httpx==0.21.3
105+
httpx==0.23.0
109106
# via
107+
# -c requirements/../../../requirements/constraints.txt
110108
# -c requirements/_base.txt
111109
# respx
112110
idna==2.10

‎services/datcore-adapter/requirements/_base.txt‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ certifi==2021.10.8
3232
# httpx
3333
# requests
3434
charset-normalizer==2.0.12
35-
# via
36-
# httpx
37-
# requests
35+
# via requests
3836
click==8.1.2
3937
# via
4038
# typer
@@ -73,12 +71,18 @@ h2==4.1.0
7371
# via httpx
7472
hpack==4.0.0
7573
# via h2
76-
httpcore==0.14.7
74+
httpcore==0.15.0
7775
# via httpx
7876
httptools==0.4.0
7977
# via uvicorn
80-
httpx==0.22.0
81-
# via -r requirements/_base.in
78+
httpx==0.23.0
79+
# via
80+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
81+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
82+
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
83+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
84+
# -c requirements/../../../requirements/constraints.txt
85+
# -r requirements/_base.in
8286
hyperframe==6.0.1
8387
# via h2
8488
idna==3.3
@@ -215,3 +219,6 @@ websockets==10.2
215219
# via uvicorn
216220
wrapt==1.14.0
217221
# via deprecated
222+
223+
# The following packages are considered to be unsafe in a requirements file:
224+
# setuptools

‎services/datcore-adapter/requirements/_test.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ certifi==2021.10.8
2323
charset-normalizer==2.0.12
2424
# via
2525
# -c requirements/_base.txt
26-
# httpx
2726
# requests
2827
codecov==2.1.12
2928
# via -r requirements/_test.in
@@ -49,12 +48,13 @@ h11==0.12.0
4948
# via
5049
# -c requirements/_base.txt
5150
# httpcore
52-
httpcore==0.14.7
51+
httpcore==0.15.0
5352
# via
5453
# -c requirements/_base.txt
5554
# httpx
56-
httpx==0.22.0
55+
httpx==0.23.0
5756
# via
57+
# -c requirements/../../../requirements/constraints.txt
5858
# -c requirements/_base.txt
5959
# respx
6060
icdiff==2.0.5

‎services/director-v2/requirements/_base.txt‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ certifi==2021.5.30
8383
chardet==4.0.0
8484
# via requests
8585
charset-normalizer==2.0.10
86-
# via
87-
# aiohttp
88-
# httpx
86+
# via aiohttp
8987
click==8.1.2
9088
# via
9189
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
@@ -143,12 +141,26 @@ heapdict==1.0.1
143141
# via
144142
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
145143
# zict
146-
httpcore==0.14.4
144+
httpcore==0.15.0
147145
# via httpx
148146
httptools==0.2.0
149147
# via uvicorn
150-
httpx==0.21.3
151-
# via -r requirements/_base.in
148+
httpx==0.23.0
149+
# via
150+
# -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
151+
# -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt
152+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
153+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
154+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
155+
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
156+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
157+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
158+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
159+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
160+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
161+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
162+
# -c requirements/../../../requirements/constraints.txt
163+
# -r requirements/_base.in
152164
idna==2.10
153165
# via
154166
# anyio
@@ -183,7 +195,9 @@ jsonschema==3.2.0
183195
# -c requirements/../../../packages/service-library/requirements/././constraints.txt
184196
# -c requirements/../../../packages/service-library/requirements/./constraints.txt
185197
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
186-
# -r requirements/../../../packages/simcore-sdk/requirements/_base.in
198+
# -r requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/_base.in
199+
# -r requirements/../../../packages/models-library/requirements/_base.in
200+
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in
187201
locket==0.2.1
188202
# via
189203
# -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt

‎services/director-v2/requirements/_test.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ charset-normalizer==2.0.10
8585
# via
8686
# -c requirements/_base.txt
8787
# aiohttp
88-
# httpx
8988
codecov==2.1.12
9089
# via -r requirements/_test.in
9190
colorlog==6.6.0
@@ -141,12 +140,13 @@ h11==0.12.0
141140
# via
142141
# -c requirements/_base.txt
143142
# httpcore
144-
httpcore==0.14.4
143+
httpcore==0.15.0
145144
# via
146145
# -c requirements/_base.txt
147146
# httpx
148-
httpx==0.21.3
147+
httpx==0.23.0
149148
# via
149+
# -c requirements/../../../requirements/constraints.txt
150150
# -c requirements/_base.txt
151151
# respx
152152
icdiff==2.0.5

0 commit comments

Comments
 (0)