Commit 623949f
committed
fix(websocket): handle IPv6 4-tuple in listener getsockname()
WebsocketListener.listen() unpacked sock.getsockname() directly into
(sock_addr, sock_port), which raised ValueError on IPv6 sockets whose
getsockname() returns (host, port, flowinfo, scopeid). The ValueError
was caught by the outer except and re-raised as OpenConnectionError,
so IPv6 WebSocket listeners could not start.
Pull the parse into a small _extract_host_port_from_sockname helper
that accepts any tuple of length >= 2 with (str, int) in the first two
slots, and falls back gracefully on unknown shapes. Add unit tests
covering IPv4 2-tuple, IPv6 4-tuple (zero and nonzero scopeid), and
unexpected shapes — no actual IPv6 socket needed.
Fixes libp2p#1316.1 parent d9c50c0 commit 623949f
3 files changed
Lines changed: 79 additions & 3 deletions
File tree
- libp2p/transport/websocket
- newsfragments
- tests/core/transport/websocket
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
34 | 54 | | |
35 | 55 | | |
36 | 56 | | |
| |||
297 | 317 | | |
298 | 318 | | |
299 | 319 | | |
300 | | - | |
301 | | - | |
302 | | - | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
303 | 330 | | |
304 | 331 | | |
305 | 332 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 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 | + | |
0 commit comments