varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2025-12-31 20:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IPv6 host bracketing in WebSocket transport

Browse Source
This commit is contained in:
GautamBytes
2025-07-23 08:10:51 +00:00
parent 8a21435fc4
commit 1997777c52
6 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libp2p/transport/websocket/listener.py
View File

@ -38,7 +38,10 @@ class WebsocketListener(IListener):
or maddr.value_for_protocol("dns6")
or "0.0.0.0"
)
port = int(maddr.value_for_protocol("tcp"))
port_str = maddr.value_for_protocol("tcp")
if port_str is None:
raise ValueError(f"No TCP port found in multiaddr: {maddr}")
port = int(port_str)
async def serve(
task_status: TaskStatus[Any] = trio.TASK_STATUS_IGNORED,

38
libp2p/transport/websocket/transport.py
View File

@ -16,24 +16,38 @@ class WebsocketTransport(ITransport):
"""
async def dial(self, maddr: Multiaddr) -> RawConnection:
text = str(maddr)
if text.endswith("/wss"):
# Handle addresses with /p2p/ PeerID suffix by truncating them at /ws
addr_text = str(maddr)
try:
ws_part_index = addr_text.index("/ws")
# Create a new Multiaddr containing only the transport part
transport_maddr = Multiaddr(addr_text[: ws_part_index + 3])
except ValueError:
raise ValueError(
f"WebsocketTransport requires a /ws protocol, not found in {maddr}"
) from None
# Check for /wss, which is not supported yet
if str(transport_maddr).endswith("/wss"):
raise NotImplementedError("/wss (TLS) not yet supported")
if not text.endswith("/ws"):
raise ValueError(f"WebsocketTransport only supports /ws, got {maddr}")
host = (
maddr.value_for_protocol("ip4")
or maddr.value_for_protocol("ip6")
or maddr.value_for_protocol("dns")
or maddr.value_for_protocol("dns4")
or maddr.value_for_protocol("dns6")
transport_maddr.value_for_protocol("ip4")
or transport_maddr.value_for_protocol("ip6")
or transport_maddr.value_for_protocol("dns")
or transport_maddr.value_for_protocol("dns4")
or transport_maddr.value_for_protocol("dns6")
)
if host is None:
raise ValueError(f"No host protocol found in {maddr}")
raise ValueError(f"No host protocol found in {transport_maddr}")
port = int(maddr.value_for_protocol("tcp"))
uri = f"ws://{host}:{port}"
port_str = transport_maddr.value_for_protocol("tcp")
if port_str is None:
raise ValueError(f"No TCP port found in multiaddr: {transport_maddr}")
port = int(port_str)
host_str = f"[{host}]" if ":" in host else host
uri = f"ws://{host_str}:{port}"
try:
async with open_websocket_url(uri, ssl_context=None) as ws: