wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-07-06 22:51:18 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix IPv4-mapped IPv6 addresses

Browse Source
This commit is contained in:
Talmaj Marinc 2026-06-30 17:25:53 +02:00
parent 115a4305ea
commit e326ef3b16
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/model_downloader/security/ssrf.py
View File

@ -64,6 +64,13 @@ def is_blocked_ip(ip_str: str) -> bool:
ip = ipaddress.ip_address(ip_str) ip = ipaddress.ip_address(ip_str)
except ValueError: except ValueError:
return True # unparseable -> refuse return True # unparseable -> refuse
# On CPython before the gh-113171 fix (backported to 3.12.4/3.11.9/
# 3.10.14/3.9.19) the is_* properties don't see through IPv4-mapped IPv6
# (e.g. ::ffff:169.254.169.254), so resolve and re-check the embedded IPv4
# to keep mapped metadata/private addresses from slipping past the filter.
mapped = getattr(ip, "ipv4_mapped", None)
if mapped is not None:
ip = mapped
return ( return (
ip.is_private ip.is_private
or ip.is_loopback or ip.is_loopback

6
tests-unit/model_downloader_test/test_security.py
View File

@ -56,6 +56,12 @@ def test_allow_any_extension_relaxes_extension_only():
("172.16.0.1", True), ("172.16.0.1", True),
("::1", True), ("::1", True),
("0.0.0.0", True), ("0.0.0.0", True),
# IPv4-mapped IPv6: must see through the mapping even on CPython
# versions predating the gh-113171 is_* property fix.
("::ffff:169.254.169.254", True), # mapped cloud metadata
("::ffff:127.0.0.1", True), # mapped loopback
("::ffff:10.0.0.1", True), # mapped RFC1918
("::ffff:8.8.8.8", False), # mapped public address stays allowed
("8.8.8.8", False), ("8.8.8.8", False),
("1.1.1.1", False), ("1.1.1.1", False),
("not-an-ip", True), # unparseable -> refuse ("not-an-ip", True), # unparseable -> refuse