1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
|
import re
from typing import Any
import pytest
from yarl import URL
from aiohttp import web
from aiohttp.typedefs import Handler
async def test_middleware_modifies_response(loop, aiohttp_client) -> None:
async def handler(request):
return web.Response(body=b"OK")
@web.middleware
async def middleware(request, handler: Handler):
resp = await handler(request)
assert 200 == resp.status
resp.set_status(201)
resp.text = resp.text + "[MIDDLEWARE]"
return resp
app = web.Application()
app.middlewares.append(middleware)
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 201 == resp.status
txt = await resp.text()
assert "OK[MIDDLEWARE]" == txt
async def test_middleware_handles_exception(loop, aiohttp_client) -> None:
async def handler(request):
raise RuntimeError("Error text")
@web.middleware
async def middleware(request, handler: Handler):
with pytest.raises(RuntimeError) as ctx:
await handler(request)
return web.Response(status=501, text=str(ctx.value) + "[MIDDLEWARE]")
app = web.Application()
app.middlewares.append(middleware)
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 501 == resp.status
txt = await resp.text()
assert "Error text[MIDDLEWARE]" == txt
async def test_middleware_chain(loop, aiohttp_client) -> None:
async def handler(request):
return web.Response(text="OK")
handler.annotation = "annotation_value"
async def handler2(request):
return web.Response(text="OK")
middleware_annotation_seen_values = []
def make_middleware(num):
@web.middleware
async def middleware(request, handler: Handler):
middleware_annotation_seen_values.append(
getattr(handler, "annotation", None)
)
resp = await handler(request)
resp.text = resp.text + f"[{num}]"
return resp
return middleware
app = web.Application()
app.middlewares.append(make_middleware(1))
app.middlewares.append(make_middleware(2))
app.router.add_route("GET", "/", handler)
app.router.add_route("GET", "/r2", handler2)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 200 == resp.status
txt = await resp.text()
assert "OK[2][1]" == txt
assert middleware_annotation_seen_values == ["annotation_value", "annotation_value"]
# check that attributes from handler are not applied to handler2
resp = await client.get("/r2")
assert 200 == resp.status
assert middleware_annotation_seen_values == [
"annotation_value",
"annotation_value",
None,
None,
]
async def test_middleware_subapp(loop, aiohttp_client) -> None:
async def sub_handler(request):
return web.Response(text="OK")
sub_handler.annotation = "annotation_value"
async def handler(request):
return web.Response(text="OK")
middleware_annotation_seen_values = []
def make_middleware(num):
@web.middleware
async def middleware(request, handler: Handler):
annotation = getattr(handler, "annotation", None)
if annotation is not None:
middleware_annotation_seen_values.append(f"{annotation}/{num}")
return await handler(request)
return middleware
app = web.Application()
app.middlewares.append(make_middleware(1))
app.router.add_route("GET", "/r2", handler)
subapp = web.Application()
subapp.middlewares.append(make_middleware(2))
subapp.router.add_route("GET", "/", sub_handler)
app.add_subapp("/sub", subapp)
client = await aiohttp_client(app)
resp = await client.get("/sub/")
assert 200 == resp.status
await resp.text()
assert middleware_annotation_seen_values == [
"annotation_value/1",
"annotation_value/2",
]
# check that attributes from sub_handler are not applied to handler
del middleware_annotation_seen_values[:]
resp = await client.get("/r2")
assert 200 == resp.status
assert middleware_annotation_seen_values == []
@pytest.fixture
def cli(loop, aiohttp_client):
async def handler(request):
return web.Response(text="OK")
def wrapper(extra_middlewares):
app = web.Application()
app.router.add_route("GET", "/resource1", handler)
app.router.add_route("GET", "/resource2/", handler)
app.router.add_route("GET", "/resource1/a/b", handler)
app.router.add_route("GET", "/resource2/a/b/", handler)
app.router.add_route("GET", "/resource2/a/b%2Fc/", handler)
app.middlewares.extend(extra_middlewares)
return aiohttp_client(app, server_kwargs={"skip_url_asserts": True})
return wrapper
class TestNormalizePathMiddleware:
@pytest.mark.parametrize(
"path, status",
[
("/resource1", 200),
("/resource1/", 404),
("/resource2", 200),
("/resource2/", 200),
("/resource1?p1=1&p2=2", 200),
("/resource1/?p1=1&p2=2", 404),
("/resource2?p1=1&p2=2", 200),
("/resource2/?p1=1&p2=2", 200),
("/resource2/a/b%2Fc", 200),
("/resource2/a/b%2Fc/", 200),
],
)
async def test_add_trailing_when_necessary(self, path, status, cli):
extra_middlewares = [web.normalize_path_middleware(merge_slashes=False)]
client = await cli(extra_middlewares)
resp = await client.get(path)
assert resp.status == status
assert resp.url.query == URL(path).query
@pytest.mark.parametrize(
"path, status",
[
("/resource1", 200),
("/resource1/", 200),
("/resource2", 404),
("/resource2/", 200),
("/resource1?p1=1&p2=2", 200),
("/resource1/?p1=1&p2=2", 200),
("/resource2?p1=1&p2=2", 404),
("/resource2/?p1=1&p2=2", 200),
("/resource2/a/b%2Fc", 404),
("/resource2/a/b%2Fc/", 200),
],
)
async def test_remove_trailing_when_necessary(self, path, status, cli) -> None:
extra_middlewares = [
web.normalize_path_middleware(
append_slash=False, remove_slash=True, merge_slashes=False
)
]
client = await cli(extra_middlewares)
resp = await client.get(path)
assert resp.status == status
assert resp.url.query == URL(path).query
@pytest.mark.parametrize(
"path, status",
[
("/resource1", 200),
("/resource1/", 404),
("/resource2", 404),
("/resource2/", 200),
("/resource1?p1=1&p2=2", 200),
("/resource1/?p1=1&p2=2", 404),
("/resource2?p1=1&p2=2", 404),
("/resource2/?p1=1&p2=2", 200),
("/resource2/a/b%2Fc", 404),
("/resource2/a/b%2Fc/", 200),
],
)
async def test_no_trailing_slash_when_disabled(self, path, status, cli):
extra_middlewares = [
web.normalize_path_middleware(append_slash=False, merge_slashes=False)
]
client = await cli(extra_middlewares)
resp = await client.get(path)
assert resp.status == status
assert resp.url.query == URL(path).query
@pytest.mark.parametrize(
"path, status",
[
("/resource1/a/b", 200),
("//resource1//a//b", 200),
("//resource1//a//b/", 404),
("///resource1//a//b", 200),
("/////resource1/a///b", 200),
("/////resource1/a//b/", 404),
("/resource1/a/b?p=1", 200),
("//resource1//a//b?p=1", 200),
("//resource1//a//b/?p=1", 404),
("///resource1//a//b?p=1", 200),
("/////resource1/a///b?p=1", 200),
("/////resource1/a//b/?p=1", 404),
],
)
async def test_merge_slash(self, path, status, cli) -> None:
extra_middlewares = [web.normalize_path_middleware(append_slash=False)]
client = await cli(extra_middlewares)
resp = await client.get(path)
assert resp.status == status
assert resp.url.query == URL(path).query
@pytest.mark.parametrize(
"path, status",
[
("/resource1/a/b", 200),
("/resource1/a/b/", 404),
("//resource2//a//b", 200),
("//resource2//a//b/", 200),
("///resource1//a//b", 200),
("///resource1//a//b/", 404),
("/////resource1/a///b", 200),
("/////resource1/a///b/", 404),
("/resource2/a/b", 200),
("//resource2//a//b", 200),
("//resource2//a//b/", 200),
("///resource2//a//b", 200),
("///resource2//a//b/", 200),
("/////resource2/a///b", 200),
("/////resource2/a///b/", 200),
("/resource1/a/b?p=1", 200),
("/resource1/a/b/?p=1", 404),
("//resource2//a//b?p=1", 200),
("//resource2//a//b/?p=1", 200),
("///resource1//a//b?p=1", 200),
("///resource1//a//b/?p=1", 404),
("/////resource1/a///b?p=1", 200),
("/////resource1/a///b/?p=1", 404),
("/resource2/a/b?p=1", 200),
("//resource2//a//b?p=1", 200),
("//resource2//a//b/?p=1", 200),
("///resource2//a//b?p=1", 200),
("///resource2//a//b/?p=1", 200),
("/////resource2/a///b?p=1", 200),
("/////resource2/a///b/?p=1", 200),
],
)
async def test_append_and_merge_slash(self, path, status, cli) -> None:
extra_middlewares = [web.normalize_path_middleware()]
client = await cli(extra_middlewares)
resp = await client.get(path)
assert resp.status == status
assert resp.url.query == URL(path).query
@pytest.mark.parametrize(
"path, status",
[
("/resource1/a/b", 200),
("/resource1/a/b/", 200),
("//resource2//a//b", 404),
("//resource2//a//b/", 200),
("///resource1//a//b", 200),
("///resource1//a//b/", 200),
("/////resource1/a///b", 200),
("/////resource1/a///b/", 200),
("/////resource1/a///b///", 200),
("/resource2/a/b", 404),
("//resource2//a//b", 404),
("//resource2//a//b/", 200),
("///resource2//a//b", 404),
("///resource2//a//b/", 200),
("/////resource2/a///b", 404),
("/////resource2/a///b/", 200),
("/resource1/a/b?p=1", 200),
("/resource1/a/b/?p=1", 200),
("//resource2//a//b?p=1", 404),
("//resource2//a//b/?p=1", 200),
("///resource1//a//b?p=1", 200),
("///resource1//a//b/?p=1", 200),
("/////resource1/a///b?p=1", 200),
("/////resource1/a///b/?p=1", 200),
("/resource2/a/b?p=1", 404),
("//resource2//a//b?p=1", 404),
("//resource2//a//b/?p=1", 200),
("///resource2//a//b?p=1", 404),
("///resource2//a//b/?p=1", 200),
("/////resource2/a///b?p=1", 404),
("/////resource2/a///b/?p=1", 200),
],
)
async def test_remove_and_merge_slash(self, path, status, cli) -> None:
extra_middlewares = [
web.normalize_path_middleware(append_slash=False, remove_slash=True)
]
client = await cli(extra_middlewares)
resp = await client.get(path)
assert resp.status == status
assert resp.url.query == URL(path).query
async def test_cannot_remove_and_add_slash(self) -> None:
with pytest.raises(AssertionError):
web.normalize_path_middleware(append_slash=True, remove_slash=True)
@pytest.mark.parametrize(
["append_slash", "remove_slash"],
[
(True, False),
(False, True),
(False, False),
],
)
async def test_open_redirects(
self, append_slash: bool, remove_slash: bool, aiohttp_client: Any
) -> None:
async def handle(request: web.Request) -> web.StreamResponse:
pytest.fail(
msg="Security advisory 'GHSA-v6wp-4m6f-gcjg' test handler "
"matched unexpectedly",
pytrace=False,
)
app = web.Application(
middlewares=[
web.normalize_path_middleware(
append_slash=append_slash, remove_slash=remove_slash
)
]
)
app.add_routes([web.get("/", handle), web.get("/google.com", handle)])
client = await aiohttp_client(app, server_kwargs={"skip_url_asserts": True})
resp = await client.get("//google.com", allow_redirects=False)
assert resp.status == 308
assert resp.headers["Location"] == "/google.com"
assert resp.url.query == URL("//google.com").query
async def test_old_style_middleware(loop, aiohttp_client) -> None:
async def handler(request):
return web.Response(body=b"OK")
async def middleware_factory(app, handler: Handler):
async def middleware(request):
resp = await handler(request)
assert 200 == resp.status
resp.set_status(201)
resp.text = resp.text + "[old style middleware]"
return resp
return middleware
with pytest.warns(DeprecationWarning) as warning_checker:
app = web.Application()
app.middlewares.append(middleware_factory)
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 201 == resp.status
txt = await resp.text()
assert "OK[old style middleware]" == txt
found = False
for obj in warning_checker.list:
msg = str(obj.message)
if "old-style" not in msg:
continue
assert re.match(
"^old-style middleware "
'"<function test_old_style_middleware.<locals>.'
'middleware_factory at 0x[0-9a-fA-F]+>" '
"deprecated, see #2252$",
msg,
)
found = True
assert found
async def test_old_style_middleware_class(loop, aiohttp_client) -> None:
async def handler(request):
return web.Response(body=b"OK")
class Middleware:
async def __call__(self, app, handler: Handler):
async def middleware(request):
resp = await handler(request)
assert 200 == resp.status
resp.set_status(201)
resp.text = resp.text + "[old style middleware]"
return resp
return middleware
with pytest.warns(DeprecationWarning) as warning_checker:
app = web.Application()
app.middlewares.append(Middleware())
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 201 == resp.status
txt = await resp.text()
assert "OK[old style middleware]" == txt
found = False
for obj in warning_checker.list:
msg = str(obj.message)
if "old-style" not in msg:
continue
assert re.match(
"^old-style middleware "
'"<test_web_middleware.test_old_style_middleware_class.'
"<locals>.Middleware object "
'at 0x[0-9a-fA-F]+>" deprecated, see #2252$',
msg,
)
found = True
assert found
async def test_new_style_middleware_class(loop, aiohttp_client) -> None:
async def handler(request):
return web.Response(body=b"OK")
@web.middleware
class Middleware:
async def __call__(self, request, handler: Handler):
resp = await handler(request)
assert 200 == resp.status
resp.set_status(201)
resp.text = resp.text + "[new style middleware]"
return resp
app = web.Application()
app.middlewares.append(Middleware())
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 201 == resp.status
txt = await resp.text()
assert "OK[new style middleware]" == txt
async def test_new_style_middleware_method(loop, aiohttp_client) -> None:
async def handler(request):
return web.Response(body=b"OK")
class Middleware:
@web.middleware
async def call(self, request, handler: Handler):
resp = await handler(request)
assert 200 == resp.status
resp.set_status(201)
resp.text = resp.text + "[new style middleware]"
return resp
app = web.Application()
app.middlewares.append(Middleware().call)
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
resp = await client.get("/")
assert 201 == resp.status
txt = await resp.text()
assert "OK[new style middleware]" == txt
|
