Skip to content

Commit c4fb534

Browse files
dependabot[bot]asvetlov
dependabot[bot]
and
asvetlov
authored
Bump aiohttp from 3.10.10 to 3.11.2 (#464)
* Bump aiohttp from 3.10.10 to 3.11.2 Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.10.10 to 3.11.2. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp@v3.10.10...v3.11.2) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Svetlov <[email protected]>
1 parent 51dd875 commit c4fb534

File tree

7 files changed

+79
-88
lines changed

7 files changed

+79
-88
lines changed

‎requirements/prod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
aiohttp==3.10.10
1+
aiohttp==3.11.2
22
flit==3.10.1

‎tests/test_allowed_hosts.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
from typing import Awaitable, Callable
2-
31
from aiohttp import web
4-
from aiohttp.test_utils import TestClient
2+
from aiohttp.pytest_plugin import AiohttpClient
53
from aiohttp_remotes import AllowedHosts, setup as _setup
64

7-
_Client = Callable[[web.Application], Awaitable[TestClient]]
8-
95

10-
async def test_allowed_hosts_ok(aiohttp_client: _Client) -> None:
6+
async def test_allowed_hosts_ok(aiohttp_client: AiohttpClient) -> None:
117
async def handler(request: web.Request) -> web.Response:
128
return web.Response()
139

@@ -19,7 +15,7 @@ async def handler(request: web.Request) -> web.Response:
1915
assert resp.status == 200
2016

2117

22-
async def test_allowed_hosts_forbidden(aiohttp_client: _Client) -> None:
18+
async def test_allowed_hosts_forbidden(aiohttp_client: AiohttpClient) -> None:
2319
async def handler(request: web.Request) -> web.Response:
2420
return web.Response()
2521

@@ -31,7 +27,7 @@ async def handler(request: web.Request) -> web.Response:
3127
assert resp.status == 400
3228

3329

34-
async def test_allowed_hosts_star(aiohttp_client: _Client) -> None:
30+
async def test_allowed_hosts_star(aiohttp_client: AiohttpClient) -> None:
3531
async def handler(request: web.Request) -> web.Response:
3632
return web.Response()
3733

@@ -43,7 +39,7 @@ async def handler(request: web.Request) -> web.Response:
4339
assert resp.status == 200
4440

4541

46-
async def test_allowed_hosts_default(aiohttp_client: _Client) -> None:
42+
async def test_allowed_hosts_default(aiohttp_client: AiohttpClient) -> None:
4743
async def handler(request: web.Request) -> web.Response:
4844
return web.Response()
4945

‎tests/test_basic_auth.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
from typing import Awaitable, Callable
2-
31
import aiohttp
42
from aiohttp import web
5-
from aiohttp.test_utils import TestClient
3+
from aiohttp.pytest_plugin import AiohttpClient
64
from aiohttp_remotes import BasicAuth, setup as _setup
75

8-
_Client = Callable[[web.Application], Awaitable[TestClient]]
9-
106

11-
async def test_basic_auth_ok(aiohttp_client: _Client) -> None:
7+
async def test_basic_auth_ok(aiohttp_client: AiohttpClient) -> None:
128
async def handler(request: web.Request) -> web.Response:
139
return web.Response()
1410

@@ -20,7 +16,7 @@ async def handler(request: web.Request) -> web.Response:
2016
assert resp.status == 200
2117

2218

23-
async def test_basic_auth_request_auth(aiohttp_client: _Client) -> None:
19+
async def test_basic_auth_request_auth(aiohttp_client: AiohttpClient) -> None:
2420
async def handler(request: web.Request) -> web.Response:
2521
return web.Response()
2622

@@ -33,7 +29,7 @@ async def handler(request: web.Request) -> web.Response:
3329
assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
3430

3531

36-
async def test_basic_auth_wrong_creds(aiohttp_client: _Client) -> None:
32+
async def test_basic_auth_wrong_creds(aiohttp_client: AiohttpClient) -> None:
3733
async def handler(request: web.Request) -> web.Response:
3834
return web.Response()
3935

@@ -46,7 +42,7 @@ async def handler(request: web.Request) -> web.Response:
4642
assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
4743

4844

49-
async def test_basic_auth_malformed_req(aiohttp_client: _Client) -> None:
45+
async def test_basic_auth_malformed_req(aiohttp_client: AiohttpClient) -> None:
5046
async def handler(request: web.Request) -> web.Response:
5147
return web.Response()
5248

@@ -59,7 +55,7 @@ async def handler(request: web.Request) -> web.Response:
5955
assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
6056

6157

62-
async def test_basic_auth_malformed_req2(aiohttp_client: _Client) -> None:
58+
async def test_basic_auth_malformed_req2(aiohttp_client: AiohttpClient) -> None:
6359
async def handler(request: web.Request) -> web.Response:
6460
return web.Response()
6561

@@ -72,7 +68,7 @@ async def handler(request: web.Request) -> web.Response:
7268
assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
7369

7470

75-
async def test_basic_auth_white_path(aiohttp_client: _Client) -> None:
71+
async def test_basic_auth_white_path(aiohttp_client: AiohttpClient) -> None:
7672
async def handler(request: web.Request) -> web.Response:
7773
return web.Response()
7874

‎tests/test_cloudfare.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import aiohttp
1919
from aiohttp import web
2020
from aiohttp.abc import AbstractResolver
21+
from aiohttp.pytest_plugin import AiohttpClient
2122
from aiohttp.resolver import DefaultResolver
22-
from aiohttp.test_utils import TestClient, unused_port
23+
from aiohttp.test_utils import unused_port
2324
from aiohttp_remotes import Cloudflare, setup as _setup
2425

25-
_Client = Callable[[web.Application], Awaitable[TestClient]]
2626
_CloudSession = Callable[..., Awaitable[aiohttp.ClientSession]]
2727

2828

@@ -125,7 +125,7 @@ async def go(**kwargs: Any) -> aiohttp.ClientSession:
125125

126126

127127
async def test_cloudfare_ok(
128-
aiohttp_client: _Client, cloudfare_session: _CloudSession
128+
aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
129129
) -> None:
130130
async def handler(request: web.Request) -> web.Response:
131131
assert request.remote == "10.10.10.10"
@@ -143,7 +143,7 @@ async def handler(request: web.Request) -> web.Response:
143143

144144

145145
async def test_cloudfare_no_networks(
146-
aiohttp_client: _Client, cloudfare_session: _CloudSession
146+
aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
147147
) -> None:
148148
cf_client = await cloudfare_session(ipv4=[], ipv6=[])
149149

@@ -153,7 +153,7 @@ async def test_cloudfare_no_networks(
153153

154154

155155
async def test_cloudfare_not_cloudfare(
156-
aiohttp_client: _Client, cloudfare_session: _CloudSession
156+
aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
157157
) -> None:
158158
async def handler(request: web.Request) -> web.Response:
159159
return web.Response()
@@ -169,7 +169,7 @@ async def handler(request: web.Request) -> web.Response:
169169

170170

171171
async def test_cloudfare_garbage_config(
172-
aiohttp_client: _Client, cloudfare_session: _CloudSession
172+
aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
173173
) -> None:
174174
async def handler(request: web.Request) -> web.Response:
175175
assert request.remote == "10.10.10.10"

‎tests/test_forwarded.py

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
from typing import Awaitable, Callable
2-
31
from aiohttp import web
4-
from aiohttp.test_utils import TestClient
2+
from aiohttp.pytest_plugin import AiohttpClient
53
from aiohttp_remotes import ForwardedRelaxed, ForwardedStrict, setup as _setup
64

7-
_Client = Callable[[web.Application], Awaitable[TestClient]]
8-
95

10-
async def test_forwarded_relaxed_ok(aiohttp_client: _Client) -> None:
6+
async def test_forwarded_relaxed_ok(aiohttp_client: AiohttpClient) -> None:
117
async def handler(request: web.Request) -> web.Response:
128
assert request.host == "example.com"
139
assert request.scheme == "https"
@@ -25,7 +21,7 @@ async def handler(request: web.Request) -> web.Response:
2521
assert resp.status == 200
2622

2723

28-
async def test_forwarded_relaxed_no_for(aiohttp_client: _Client) -> None:
24+
async def test_forwarded_relaxed_no_for(aiohttp_client: AiohttpClient) -> None:
2925
async def handler(request: web.Request) -> web.Response:
3026
assert request.host == "example.com"
3127
assert request.scheme == "https"
@@ -43,7 +39,7 @@ async def handler(request: web.Request) -> web.Response:
4339
assert resp.status == 200
4440

4541

46-
async def test_forwarded_relaxed_no_proto(aiohttp_client: _Client) -> None:
42+
async def test_forwarded_relaxed_no_proto(aiohttp_client: AiohttpClient) -> None:
4743
async def handler(request: web.Request) -> web.Response:
4844
assert request.host == "example.com"
4945
assert request.scheme == "http"
@@ -61,7 +57,7 @@ async def handler(request: web.Request) -> web.Response:
6157
assert resp.status == 200
6258

6359

64-
async def test_forwarded_relaxed_no_host(aiohttp_client: _Client) -> None:
60+
async def test_forwarded_relaxed_no_host(aiohttp_client: AiohttpClient) -> None:
6561
async def handler(request: web.Request) -> web.Response:
6662
url = cl.make_url("/")
6763
assert url.host is not None
@@ -82,7 +78,7 @@ async def handler(request: web.Request) -> web.Response:
8278
assert resp.status == 200
8379

8480

85-
async def test_forwarded_relaxed_many_hosts(aiohttp_client: _Client) -> None:
81+
async def test_forwarded_relaxed_many_hosts(aiohttp_client: AiohttpClient) -> None:
8682
async def handler(request: web.Request) -> web.Response:
8783
assert request.host == "example.com"
8884
assert request.scheme == "https"
@@ -102,7 +98,7 @@ async def handler(request: web.Request) -> web.Response:
10298
assert resp.status == 200
10399

104100

105-
async def test_forwarded_strict_ok(aiohttp_client: _Client) -> None:
101+
async def test_forwarded_strict_ok(aiohttp_client: AiohttpClient) -> None:
106102
async def handler(request: web.Request) -> web.Response:
107103
assert request.host == "example.com"
108104
assert request.scheme == "https"
@@ -120,7 +116,7 @@ async def handler(request: web.Request) -> web.Response:
120116
assert resp.status == 200
121117

122118

123-
async def test_forwarded_strict_no_proto(aiohttp_client: _Client) -> None:
119+
async def test_forwarded_strict_no_proto(aiohttp_client: AiohttpClient) -> None:
124120
async def handler(request: web.Request) -> web.Response:
125121
assert request.host == "example.com"
126122
assert request.scheme == "http"
@@ -137,7 +133,7 @@ async def handler(request: web.Request) -> web.Response:
137133
assert resp.status == 200
138134

139135

140-
async def test_forwarded_strict_no_host(aiohttp_client: _Client) -> None:
136+
async def test_forwarded_strict_no_host(aiohttp_client: AiohttpClient) -> None:
141137
async def handler(request: web.Request) -> web.Response:
142138
assert request.host.startswith("127.0.0.1:")
143139
assert request.scheme == "https"
@@ -154,7 +150,7 @@ async def handler(request: web.Request) -> web.Response:
154150
assert resp.status == 200
155151

156152

157-
async def test_forwarded_strict_too_many_protos(aiohttp_client: _Client) -> None:
153+
async def test_forwarded_strict_too_many_protos(aiohttp_client: AiohttpClient) -> None:
158154
async def handler(request: web.Request) -> web.Response:
159155
return web.Response()
160156

@@ -169,7 +165,7 @@ async def handler(request: web.Request) -> web.Response:
169165
assert resp.status == 400
170166

171167

172-
async def test_forwarded_strict_too_many_for(aiohttp_client: _Client) -> None:
168+
async def test_forwarded_strict_too_many_for(aiohttp_client: AiohttpClient) -> None:
173169
async def handler(request: web.Request) -> web.Response:
174170
return web.Response()
175171

@@ -181,7 +177,7 @@ async def handler(request: web.Request) -> web.Response:
181177
assert resp.status == 400
182178

183179

184-
async def test_forwarded_strict_untrusted_ip(aiohttp_client: _Client) -> None:
180+
async def test_forwarded_strict_untrusted_ip(aiohttp_client: AiohttpClient) -> None:
185181
async def handler(request: web.Request) -> web.Response:
186182
return web.Response()
187183

@@ -193,7 +189,7 @@ async def handler(request: web.Request) -> web.Response:
193189
assert resp.status == 400
194190

195191

196-
async def test_forwarded_strict_whitelist(aiohttp_client: _Client) -> None:
192+
async def test_forwarded_strict_whitelist(aiohttp_client: AiohttpClient) -> None:
197193
async def handler(request: web.Request) -> web.Response:
198194
assert request.remote == "127.0.0.1"
199195
return web.Response()
@@ -206,7 +202,7 @@ async def handler(request: web.Request) -> web.Response:
206202
assert resp.status == 200
207203

208204

209-
async def test_forwarded_strict_no_for(aiohttp_client: _Client) -> None:
205+
async def test_forwarded_strict_no_for(aiohttp_client: AiohttpClient) -> None:
210206
async def handler(request: web.Request) -> web.Response:
211207
return web.Response()
212208

‎tests/test_secure.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
import ssl
2-
from typing import Awaitable, Callable
32

43
import pytest
54
from yarl import URL
65

76
import aiohttp
87
from aiohttp import web
9-
from aiohttp.test_utils import TestClient, TestServer, make_mocked_request
8+
from aiohttp.pytest_plugin import AiohttpClient, AiohttpServer
9+
from aiohttp.test_utils import make_mocked_request
1010
from aiohttp_remotes import Secure, setup as _setup
1111

12-
_Server = Callable[..., Awaitable[TestServer]]
13-
_Client = Callable[..., Awaitable[TestClient]]
14-
1512

1613
async def test_secure_ok(
17-
aiohttp_client: _Client,
18-
aiohttp_server: _Server,
14+
aiohttp_client: AiohttpClient,
15+
aiohttp_server: AiohttpServer,
1916
ssl_ctx: ssl.SSLContext,
2017
client_ssl_ctx: ssl.SSLContext,
2118
) -> None:
@@ -39,8 +36,8 @@ async def handler(request: web.Request) -> web.Response:
3936

4037

4138
async def test_secure_redirect(
42-
aiohttp_client: _Client,
43-
aiohttp_server: _Server,
39+
aiohttp_client: AiohttpClient,
40+
aiohttp_server: AiohttpServer,
4441
ssl_ctx: ssl.SSLContext,
4542
client_ssl_ctx: ssl.SSLContext,
4643
) -> None:
@@ -62,7 +59,7 @@ async def handler(request: web.Request) -> web.Response:
6259
assert resp.request_info.url.scheme == "https"
6360

6461

65-
async def test_secure_no_redirection(aiohttp_client: _Client) -> None:
62+
async def test_secure_no_redirection(aiohttp_client: AiohttpClient) -> None:
6663
async def handler(request: web.Request) -> web.Response:
6764
return web.Response()
6865

@@ -76,8 +73,8 @@ async def handler(request: web.Request) -> web.Response:
7673

7774

7875
async def test_no_x_frame(
79-
aiohttp_client: _Client,
80-
aiohttp_server: _Server,
76+
aiohttp_client: AiohttpClient,
77+
aiohttp_server: AiohttpServer,
8178
ssl_ctx: ssl.SSLContext,
8279
client_ssl_ctx: ssl.SSLContext,
8380
) -> None:
@@ -101,8 +98,8 @@ async def handler(request: web.Request) -> web.Response:
10198

10299

103100
async def test_no_sts(
104-
aiohttp_client: _Client,
105-
aiohttp_server: _Server,
101+
aiohttp_client: AiohttpClient,
102+
aiohttp_server: AiohttpServer,
106103
ssl_ctx: ssl.SSLContext,
107104
client_ssl_ctx: ssl.SSLContext,
108105
) -> None:
@@ -125,8 +122,8 @@ async def handler(request: web.Request) -> web.Response:
125122

126123

127124
async def test_no_cto(
128-
aiohttp_client: _Client,
129-
aiohttp_server: _Server,
125+
aiohttp_client: AiohttpClient,
126+
aiohttp_server: AiohttpServer,
130127
ssl_ctx: ssl.SSLContext,
131128
client_ssl_ctx: ssl.SSLContext,
132129
) -> None:
@@ -150,8 +147,8 @@ async def handler(request: web.Request) -> web.Response:
150147

151148

152149
async def test_no_xss(
153-
aiohttp_client: _Client,
154-
aiohttp_server: _Server,
150+
aiohttp_client: AiohttpClient,
151+
aiohttp_server: AiohttpServer,
155152
ssl_ctx: ssl.SSLContext,
156153
client_ssl_ctx: ssl.SSLContext,
157154
) -> None:

0 commit comments

Comments
 (0)