mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2026-06-20 23:09:20 +08:00
Some checks failed
Python Linting / Run Ruff (push) Has been cancelled
* feat(security): dedicated install flags decouple git_url/pip from security_level
Install via git URL and pip install are no longer gated by
security_level. Each surface gets a dedicated config.ini flag —
allow_git_url_install / allow_pip_install (both default false, secure
by default) — that fully REPLACES the security-level term for these two
features. The network-position invariant is retained: a non-local
listener stays denied regardless of the flags unless
network_mode = personal_cloud.
- New pure predicate is_dedicated_install_allowed() in
common/manager_security (no config access; callers resolve config)
- Legacy endpoints /v2/customnode/install/git_url and .../pip switch
from is_allowed_security_level('high+') to the flag gate; batch
installs of unknown git URLs likewise (middle+ entry gate unchanged,
unknown-pip 'block' stays unconditional; response shapes preserved)
- Config readers/writers (glob + legacy) parse and persist the flags;
denial logs and frontend 403 messages name the responsible flag and
note the non-local-listener requirement (network_mode=personal_cloud)
- No auto-seed from security_level — users previously on weak/normal-
must opt in explicitly (see CHANGELOG migration notes; README
documents the new contract)
- Update the pre-existing permissive E2E harness
(start_comfyui_permissive.sh + test_e2e_legacy_real_ops.py) to the
new contract: it now also sets allow_git_url_install /
allow_pip_install = true, since security_level = normal- alone no
longer opens the git_url/pip endpoints
Tests: predicate truth table proving security_level independence in
both directions, dual-reader config contract, security-level-matrix
freeze guards, legacy gate regression guards (121 unit), plus 22
real-server E2E tests incl. URL-form pip install with self-clean.
* test(e2e): fix fresh-env failures in customnode_info and git_clone harnesses
Two pre-existing harness defects that fail deterministically on a fresh
E2E environment (unrelated to the dedicated-install-flags change):
- test_e2e_customnode_info: TestInstalledPacks asserted the seed pack
ComfyUI_SigmoidOffsetScheduler is installed, but nothing seeded it —
the installing module (test_e2e_endpoint) runs alphabetically later
and uninstalls it at the end. Add a module-scoped autouse fixture
that installs the pack via cm-cli BEFORE the server starts (the
imported-mode test asserts against the startup-frozen snapshot, so
API-based seeding after boot cannot work) and removes it on teardown
only if the fixture installed it.
- test_e2e_git_clone: _ensure_cache ran cm-cli update-cache with a
120s timeout; the full DB download routinely exceeds that on slow
links, erroring the whole module at setup. Raise to 600s.
Verified from a fresh state (seed pack absent): both modules pass
(13 tests, incl. previously-failing TestInstalledPacks 2 and
TestNightlyInstallCycle 3).
154 lines
5.6 KiB
Python
154 lines
5.6 KiB
Python
"""Security helpers for CSRF protection and Content-Type gating.
|
|
|
|
reject_simple_form_post() is applied ONLY to POST handlers that do not consume
|
|
a request body (e.g., snapshot/save, queue/reset, queue/start, reboot). These
|
|
are vulnerable to cross-origin <form method=POST> attacks because the server
|
|
accepts the request without parsing any body — the attacker needs no ability
|
|
to forge a valid payload, only to point a hidden form at the URL.
|
|
|
|
Handlers that DO read a body via ``await request.json()`` (install/git_url,
|
|
install/pip, queue/install_model, db_mode POST, policy/update POST,
|
|
channel_url_list POST, queue/batch, queue/task, import_fail_info, etc.) are
|
|
NOT gated here — a cross-origin <form method=POST> cannot forge a valid JSON
|
|
body because the browser refuses to send ``application/json`` without a CORS
|
|
preflight, which this server rejects by not responding with an appropriate
|
|
Access-Control-Allow-Origin.
|
|
|
|
DO NOT add the gate to body-reading handlers (redundant + UX-breaking).
|
|
DO NOT remove the gate from no-body handlers (this is the bypass vector).
|
|
"""
|
|
|
|
import os
|
|
from enum import Enum
|
|
from typing import Optional
|
|
|
|
from aiohttp import web
|
|
|
|
is_personal_cloud_mode = False
|
|
handler_policy = {}
|
|
|
|
|
|
# CORS "simple request" Content-Type set per Fetch spec §3.2.3. Browsers send
|
|
# <form method=POST> submissions with one of these three MIME types and do NOT
|
|
# trigger a CORS preflight, so a malicious cross-origin page can silently POST
|
|
# into state-changing endpoints if we only gate on HTTP method. Blocking these
|
|
# three Content-Types on our mutation endpoints forces any non-same-origin POST
|
|
# to use a non-simple Content-Type (e.g. application/json), which triggers a
|
|
# preflight that this server rejects (no Access-Control-Allow-Origin response).
|
|
_SIMPLE_FORM_CONTENT_TYPES = frozenset({
|
|
'application/x-www-form-urlencoded',
|
|
'multipart/form-data',
|
|
'text/plain',
|
|
})
|
|
|
|
|
|
def reject_simple_form_post(request) -> Optional[web.Response]:
|
|
"""Reject Content-Types that enable preflight-less <form method=POST> CSRF.
|
|
|
|
These 3 MIME types are the complete CORS "simple request" Content-Type set
|
|
(Fetch spec §3.2.3 "CORS-safelisted request-header"). Blocking them
|
|
eliminates the <form method=POST> cross-origin CSRF vector, because any
|
|
other Content-Type triggers a browser-enforced CORS preflight — and this
|
|
server does not answer preflights with ``Access-Control-Allow-Origin``,
|
|
effectively blocking cross-origin requests that use non-simple types.
|
|
|
|
Returns:
|
|
web.Response(status=400) when the request has a simple-form
|
|
Content-Type that must be rejected. None when the request is allowed
|
|
to proceed (no body, application/json, or any non-simple Content-Type).
|
|
|
|
Note:
|
|
aiohttp's ``request.content_type`` normalizes the header (lower-cases,
|
|
strips parameters), so a ``multipart/form-data; boundary=----X`` header
|
|
is compared as ``multipart/form-data``.
|
|
"""
|
|
if request.content_type in _SIMPLE_FORM_CONTENT_TYPES:
|
|
return web.Response(
|
|
status=400,
|
|
text='Invalid Content-Type for this endpoint. Use application/json or omit body.',
|
|
)
|
|
return None
|
|
|
|
class HANDLER_POLICY(Enum):
|
|
MULTIPLE_REMOTE_BAN_NON_LOCAL = 1
|
|
MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD = 2
|
|
BANNED = 3
|
|
|
|
|
|
def is_loopback(address):
|
|
import ipaddress
|
|
try:
|
|
return ipaddress.ip_address(address).is_loopback
|
|
except ValueError:
|
|
return False
|
|
|
|
|
|
def is_dedicated_install_allowed(flag_value: bool, listen_address: str, network_mode: str) -> bool:
|
|
"""P-direct predicate for the dedicated install flags (goal265-spec.md §1.2).
|
|
|
|
allowed iff flag AND (loopback listener OR network_mode == 'personal_cloud').
|
|
|
|
Gates the git-URL / standalone-pip install surfaces via the dedicated
|
|
``allow_git_url_install`` / ``allow_pip_install`` config flags, fully
|
|
decoupled from ``security_level`` (REPLACE, not AND — spec §1.1 inv. 1).
|
|
The network-position term retains today's invariant that a public
|
|
(non-loopback, non-personal_cloud) listener stays denied regardless of
|
|
the flags (spec §1.1 inv. 2).
|
|
|
|
Pure function — NO config access; callers resolve ``flag_value`` and
|
|
``network_mode`` through their own config reader and pass values in
|
|
(preserves common/ layering: this module must stay config-import-free).
|
|
"""
|
|
return bool(flag_value) and (is_loopback(listen_address) or network_mode.lower() == 'personal_cloud')
|
|
|
|
|
|
def do_nothing():
|
|
pass
|
|
|
|
|
|
def get_handler_policy(x):
|
|
return handler_policy.get(x) or set()
|
|
|
|
def add_handler_policy(x, policy):
|
|
s = handler_policy.get(x)
|
|
if s is None:
|
|
s = set()
|
|
handler_policy[x] = s
|
|
|
|
s.add(policy)
|
|
|
|
|
|
multiple_remote_alert = do_nothing
|
|
|
|
|
|
def is_safe_path_target(target: str) -> bool:
|
|
"""
|
|
Check if target string is safe from path traversal attacks.
|
|
|
|
Args:
|
|
target: User-provided filename or identifier
|
|
|
|
Returns:
|
|
True if safe, False if contains path traversal characters
|
|
"""
|
|
if '/' in target or '\\' in target or '..' in target or '\x00' in target:
|
|
return False
|
|
return True
|
|
|
|
|
|
def get_safe_file_path(target: str, base_dir: str, extension: str = ".json") -> Optional[str]:
|
|
"""
|
|
Safely construct a file path, preventing path traversal attacks.
|
|
|
|
Args:
|
|
target: User-provided filename (without extension)
|
|
base_dir: Base directory path
|
|
extension: File extension to append (default: ".json")
|
|
|
|
Returns:
|
|
Safe file path or None if input contains path traversal attempts
|
|
"""
|
|
if not is_safe_path_target(target):
|
|
return None
|
|
return os.path.join(base_dir, f"{target}{extension}")
|