comfyui-manager 4.3__tar.gz → 4.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {comfyui_manager-4.3/comfyui_manager.egg-info → comfyui_manager-4.4}/PKG-INFO +58 -17
- {comfyui_manager-4.3 → comfyui_manager-4.4}/README.md +56 -15
- {comfyui_manager-4.3 → comfyui_manager-4.4}/cm_cli/__main__.py +2 -3
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/git_utils.py +2 -1
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/manager_security.py +64 -5
- comfyui_manager-4.4/comfyui_manager/common/manager_util.py +965 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/timestamp_utils.py +6 -3
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/unified_dep_resolver.py +22 -34
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/manager_core.py +39 -93
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/manager_server.py +22 -17
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/share_3rdparty.py +11 -198
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/utils/model_utils.py +2 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/README.md +0 -2
- comfyui_manager-4.4/comfyui_manager/js/cm-api.js +154 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/comfyui-manager.js +39 -79
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/comfyui-share-common.js +15 -248
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/custom-nodes-manager.js +11 -13
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/model-manager.js +97 -40
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/node_fixer.js +25 -6
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/snapshot.js +21 -7
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/legacy/manager_core.py +39 -93
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/legacy/manager_server.py +50 -56
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/legacy/share_3rdparty.py +11 -198
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/prestartup_script.py +50 -50
- {comfyui_manager-4.3 → comfyui_manager-4.4/comfyui_manager.egg-info}/PKG-INFO +58 -17
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager.egg-info/SOURCES.txt +17 -3
- {comfyui_manager-4.3 → comfyui_manager-4.4}/pyproject.toml +2 -15
- comfyui_manager-4.4/tests/test_cache_files.py +202 -0
- comfyui_manager-4.4/tests/test_channel_response.py +172 -0
- comfyui_manager-4.4/tests/test_cm_api_try_install.py +381 -0
- comfyui_manager-4.4/tests/test_cnr_install_extraction_failure.py +95 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_flagged_nodepack_policy.py +172 -22
- comfyui_manager-4.4/tests/test_glob_model_install_whitelist.py +110 -0
- comfyui_manager-4.4/tests/test_legacy_model_whitelist.py +43 -0
- comfyui_manager-4.4/tests/test_logger_terminal_state.py +123 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_notice_html_sanitizer.py +1 -0
- comfyui_manager-4.4/tests/test_notice_tls.py +218 -0
- comfyui_manager-4.4/tests/test_pip_blacklist_matching.py +425 -0
- comfyui_manager-4.4/tests/test_pip_fixer_opencv.py +135 -0
- comfyui_manager-4.4/tests/test_pip_package_names.py +85 -0
- comfyui_manager-4.4/tests/test_restart_command.py +195 -0
- comfyui_manager-4.4/tests/test_restore_pip_snapshot.py +110 -0
- comfyui_manager-4.4/tests/test_share_asset_path.py +185 -0
- comfyui_manager-4.4/tests/test_snapshot_restore_pins.py +113 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_unified_dep_resolver.py +129 -35
- comfyui_manager-4.4/tests/test_version_suffix.py +90 -0
- comfyui_manager-4.3/comfyui_manager/common/manager_util.py +0 -638
- comfyui_manager-4.3/comfyui_manager/js/cm-api.js +0 -67
- comfyui_manager-4.3/comfyui_manager/js/comfyui-share-copus.js +0 -1168
- comfyui_manager-4.3/comfyui_manager/js/comfyui-share-openart.js +0 -746
- {comfyui_manager-4.3 → comfyui_manager-4.4}/LICENSE.txt +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/MANIFEST.in +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/cm_cli/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/alter-list.json +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/channels.list.template +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/cm_global.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/cnr_utils.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/config_writer.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/context.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/enums.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/git_compat.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/git_helper.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/manager_downloader.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/node_package.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/security_check.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/common/security_messages.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/custom-node-list.json +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/data_models/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/data_models/generated_models.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/extension-node-map.json +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/extras.json +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/github-stats.json +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/CLAUDE.md +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/constants.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/utils/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/utils/environment_utils.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/utils/formatting_utils.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/utils/node_pack_utils.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/glob/utils/security_utils.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/comfyui-gui-builder.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/comfyui-share-youml.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/common.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/custom-nodes-manager.css +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/manager-grid.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/model-manager.css +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/popover-helper.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/snapshot.css +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/turbogrid.esm.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/js/workflow-metadata.js +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/legacy/__init__.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/legacy/html_utils.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager/model-list.json +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager.egg-info/dependency_links.txt +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager.egg-info/entry_points.txt +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager.egg-info/requires.txt +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/comfyui_manager.egg-info/top_level.txt +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/requirements.txt +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/setup.cfg +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_config_write_and_install_denial.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_git_compat.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_grid_highlight_escaping.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_install_flags_config.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_install_flags_guards.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_legacy_secgate_other_paths.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_markdown_composer_href.py +0 -0
- {comfyui_manager-4.3 → comfyui_manager-4.4}/tests/test_nightly_cnr_fallback.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: comfyui-manager
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.4
|
|
4
4
|
Summary: ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI.
|
|
5
5
|
Maintainer-email: "Dr.Lt.Data" <dr.lt.data@gmail.com>, Yoland Yan <yoland@comfy.org>, James Kwon <hongilkwon316@gmail.com>, Robin Huang <robin@comfy.org>
|
|
6
6
|
License: GPL-3.0-only
|
|
@@ -9,7 +9,7 @@ Keywords: comfyui,comfyui-manager
|
|
|
9
9
|
Classifier: Development Status :: 5 - Production/Stable
|
|
10
10
|
Classifier: Intended Audience :: Developers
|
|
11
11
|
Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
|
|
12
|
-
Requires-Python: >=3.
|
|
12
|
+
Requires-Python: >=3.10
|
|
13
13
|
Description-Content-Type: text/markdown
|
|
14
14
|
License-File: LICENSE.txt
|
|
15
15
|
Requires-Dist: GitPython
|
|
@@ -48,6 +48,8 @@ Dynamic: license-file
|
|
|
48
48
|
|
|
49
49
|
## Installation
|
|
50
50
|
|
|
51
|
+
Requires Python 3.10 or newer, matching ComfyUI's minimum Python version.
|
|
52
|
+
|
|
51
53
|
* When installing the latest ComfyUI, it will be automatically installed as a dependency, so manual installation is no longer necessary.
|
|
52
54
|
|
|
53
55
|
* Manual installation of the nightly version:
|
|
@@ -111,8 +113,7 @@ Dynamic: license-file
|
|
|
111
113
|
 
|
|
112
114
|
|
|
113
115
|
* You can share the workflow by clicking the Share button at the bottom of the main menu or selecting Share Output from the Context Menu of the Image node.
|
|
114
|
-
* Currently, it supports sharing via [https://
|
|
115
|
-
[https://openart.ai](https://openart.ai/workflows/dev), [https://youml.com](https://youml.com)
|
|
116
|
+
* Currently, it supports sharing via [https://youml.com](https://youml.com)
|
|
116
117
|
as well as through the Matrix channel.
|
|
117
118
|
|
|
118
119
|

|
|
@@ -134,6 +135,7 @@ In `ComfyUI-Manager` V4.0.3b4 and later, configuration files and dynamically gen
|
|
|
134
135
|
* Configurable pip overrides: `<USER_DIRECTORY>/__manager/pip_overrides.json`
|
|
135
136
|
* Configurable pip blacklist: `<USER_DIRECTORY>/__manager/pip_blacklist.list`
|
|
136
137
|
* Configurable pip auto fix: `<USER_DIRECTORY>/__manager/pip_auto_fix.list`
|
|
138
|
+
* Configurable flagged nodepack whitelist: `<USER_DIRECTORY>/__manager/nodepack-whitelist.list`
|
|
137
139
|
* Saved snapshot files: `<USER_DIRECTORY>/__manager/snapshots`
|
|
138
140
|
* Startup script files: `<USER_DIRECTORY>/__manager/startup-scripts`
|
|
139
141
|
* Component files: `<USER_DIRECTORY>/__manager/components`
|
|
@@ -286,6 +288,7 @@ The following settings are applied based on the section marked as `is_default`.
|
|
|
286
288
|
```
|
|
287
289
|
downgrade_blacklist = diffusers, kornia
|
|
288
290
|
```
|
|
291
|
+
* Names are matched without regard to case or to `-`, `_`, and `.`, so `opencv-python` and `opencv_python` are the same package.
|
|
289
292
|
|
|
290
293
|
* Custom pip mapping
|
|
291
294
|
* When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
|
|
@@ -404,16 +407,44 @@ reinstallation checks the target before removing the existing nodepack, and a
|
|
|
404
407
|
policy refusal preserves the current installation. For flagged-policy denials,
|
|
405
408
|
the UI reports that the current security configuration does not allow the action
|
|
406
409
|
and directs users to the terminal. Only the terminal provides loopback-only
|
|
407
|
-
`--listen` examples, the private network override setting,
|
|
410
|
+
`--listen` examples, the private network override setting, the pack whitelist,
|
|
411
|
+
and restart instructions.
|
|
408
412
|
|
|
409
|
-
* Active versions continue through the normal install flow.
|
|
410
|
-
use the `middle` security level, so they are available
|
|
411
|
-
with `security_level = normal`, `normal-`, or `weak`.
|
|
412
|
-
these
|
|
413
|
+
* Active versions continue through the normal install flow. New HTTP requests
|
|
414
|
+
to install CNR releases use the `middle` security level, so they are available
|
|
415
|
+
on non-local listeners with `security_level = normal`, `normal-`, or `weak`.
|
|
416
|
+
`strong` denies these new requests, including requests for whitelisted packs.
|
|
413
417
|
* Flagged versions (`NodeVersionStatusFlagged`) must satisfy the same installation
|
|
414
418
|
conditions as Active versions. In addition, **all** addresses in `--listen`
|
|
415
419
|
must resolve to loopback, such as `127.0.0.1` and `::1`, unless the explicit
|
|
416
|
-
override below is enabled.
|
|
420
|
+
override below is enabled or the pack ID is whitelisted.
|
|
421
|
+
* To allow specific packs on any listener without enabling all flagged installs,
|
|
422
|
+
edit `nodepack-whitelist.list` beside Manager's `config.ini`
|
|
423
|
+
(normally `<USER_DIRECTORY>/__manager/nodepack-whitelist.list`).
|
|
424
|
+
At server startup, Manager creates a commented template if the file is missing;
|
|
425
|
+
existing files are preserved. The template grants no exceptions by default.
|
|
426
|
+
Enter one Registry pack ID per line:
|
|
427
|
+
|
|
428
|
+
```text
|
|
429
|
+
# Nodepack whitelist
|
|
430
|
+
# Add one Registry ID per line; each entry applies to all CNR versions.
|
|
431
|
+
# Registry IDs are case-insensitive.
|
|
432
|
+
|
|
433
|
+
comfyui-impact-pack
|
|
434
|
+
comfyui-inspire-pack # Inline comments are supported.
|
|
435
|
+
```
|
|
436
|
+
|
|
437
|
+
Entries are case-insensitive and apply to all CNR versions of that pack. Use
|
|
438
|
+
Registry IDs, not display names, Git URLs, or `id@version`; wildcards are not
|
|
439
|
+
expanded. Blank lines and `#` comments are ignored. Delete an entry or comment
|
|
440
|
+
out its line with `#` to revoke that exception. Manager reads the file
|
|
441
|
+
for each installation check, so edits and removals apply without restarting.
|
|
442
|
+
A missing, unreadable, or NUL-containing file grants no whitelist exceptions.
|
|
443
|
+
If mixed encodings introduce NUL characters, Manager logs a warning to save
|
|
444
|
+
the file as UTF-8. Whitelist-based permission is logged at WARNING level with
|
|
445
|
+
the Registry ID, including in snapshot restore children. This records the policy
|
|
446
|
+
decision, not successful installation. Packs absent from the list continue to
|
|
447
|
+
use the listener and global option rules.
|
|
417
448
|
* To allow flagged versions on a non-local listener in a **trusted private
|
|
418
449
|
network**, an administrator can explicitly opt in:
|
|
419
450
|
|
|
@@ -429,17 +460,27 @@ and directs users to the terminal. Only the terminal provides loopback-only
|
|
|
429
460
|
private network. This option does not require `network_mode = private`, and
|
|
430
461
|
`network_mode = personal_cloud` alone does not allow flagged versions.
|
|
431
462
|
* CNR API refusals, including banned or unavailable packages, still prevent
|
|
432
|
-
installation.
|
|
433
|
-
the separate Git/nightly and pip
|
|
463
|
+
installation. Neither the option nor the whitelist bypasses the `strong`
|
|
464
|
+
restriction on new HTTP install requests or the separate Git/nightly and pip
|
|
465
|
+
installation policies.
|
|
434
466
|
* Enabling an already installed version does not query the Registry or reinstall it.
|
|
435
|
-
* Older deferred switches without a stored status require loopback-only listeners
|
|
436
|
-
or
|
|
437
|
-
request the installation again so Manager can
|
|
467
|
+
* Older deferred switches without a stored status require loopback-only listeners,
|
|
468
|
+
the override, or a whitelisted pack ID. Otherwise they are rejected without
|
|
469
|
+
changing the installed pack; request the installation again so Manager can
|
|
470
|
+
check its current Registry status.
|
|
438
471
|
* Newly scheduled deferred version switches retain the returned version status
|
|
439
|
-
and check it against the current listen address and
|
|
472
|
+
and check it against the current listen address, option, and whitelist again
|
|
473
|
+
at restart.
|
|
440
474
|
This uses the saved status; it does not query CNR again for later status changes.
|
|
441
475
|
Server-scheduled snapshot restores inherit the permission computed from the
|
|
442
|
-
server's current listener and setting
|
|
476
|
+
server's current listener and setting, and read the whitelist from the server's
|
|
477
|
+
Manager configuration directory.
|
|
478
|
+
* Startup execution of deferred CNR switches and server-scheduled snapshot
|
|
479
|
+
restores does not recheck `security_level`. Changing it to `strong` does not
|
|
480
|
+
cancel previously scheduled work. For example, a flagged version switch
|
|
481
|
+
scheduled under `normal` can still run after restarting with `strong` if the
|
|
482
|
+
pack remains whitelisted. The startup flagged-version checks described above
|
|
483
|
+
still apply. This is existing behavior of scheduled execution.
|
|
443
484
|
* Standalone `cm-cli` commands remain local administrator operations and do not
|
|
444
485
|
use the server listener policy.
|
|
445
486
|
|
|
@@ -14,6 +14,8 @@
|
|
|
14
14
|
|
|
15
15
|
## Installation
|
|
16
16
|
|
|
17
|
+
Requires Python 3.10 or newer, matching ComfyUI's minimum Python version.
|
|
18
|
+
|
|
17
19
|
* When installing the latest ComfyUI, it will be automatically installed as a dependency, so manual installation is no longer necessary.
|
|
18
20
|
|
|
19
21
|
* Manual installation of the nightly version:
|
|
@@ -77,8 +79,7 @@
|
|
|
77
79
|
 
|
|
78
80
|
|
|
79
81
|
* You can share the workflow by clicking the Share button at the bottom of the main menu or selecting Share Output from the Context Menu of the Image node.
|
|
80
|
-
* Currently, it supports sharing via [https://
|
|
81
|
-
[https://openart.ai](https://openart.ai/workflows/dev), [https://youml.com](https://youml.com)
|
|
82
|
+
* Currently, it supports sharing via [https://youml.com](https://youml.com)
|
|
82
83
|
as well as through the Matrix channel.
|
|
83
84
|
|
|
84
85
|

|
|
@@ -100,6 +101,7 @@ In `ComfyUI-Manager` V4.0.3b4 and later, configuration files and dynamically gen
|
|
|
100
101
|
* Configurable pip overrides: `<USER_DIRECTORY>/__manager/pip_overrides.json`
|
|
101
102
|
* Configurable pip blacklist: `<USER_DIRECTORY>/__manager/pip_blacklist.list`
|
|
102
103
|
* Configurable pip auto fix: `<USER_DIRECTORY>/__manager/pip_auto_fix.list`
|
|
104
|
+
* Configurable flagged nodepack whitelist: `<USER_DIRECTORY>/__manager/nodepack-whitelist.list`
|
|
103
105
|
* Saved snapshot files: `<USER_DIRECTORY>/__manager/snapshots`
|
|
104
106
|
* Startup script files: `<USER_DIRECTORY>/__manager/startup-scripts`
|
|
105
107
|
* Component files: `<USER_DIRECTORY>/__manager/components`
|
|
@@ -252,6 +254,7 @@ The following settings are applied based on the section marked as `is_default`.
|
|
|
252
254
|
```
|
|
253
255
|
downgrade_blacklist = diffusers, kornia
|
|
254
256
|
```
|
|
257
|
+
* Names are matched without regard to case or to `-`, `_`, and `.`, so `opencv-python` and `opencv_python` are the same package.
|
|
255
258
|
|
|
256
259
|
* Custom pip mapping
|
|
257
260
|
* When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
|
|
@@ -370,16 +373,44 @@ reinstallation checks the target before removing the existing nodepack, and a
|
|
|
370
373
|
policy refusal preserves the current installation. For flagged-policy denials,
|
|
371
374
|
the UI reports that the current security configuration does not allow the action
|
|
372
375
|
and directs users to the terminal. Only the terminal provides loopback-only
|
|
373
|
-
`--listen` examples, the private network override setting,
|
|
376
|
+
`--listen` examples, the private network override setting, the pack whitelist,
|
|
377
|
+
and restart instructions.
|
|
374
378
|
|
|
375
|
-
* Active versions continue through the normal install flow.
|
|
376
|
-
use the `middle` security level, so they are available
|
|
377
|
-
with `security_level = normal`, `normal-`, or `weak`.
|
|
378
|
-
these
|
|
379
|
+
* Active versions continue through the normal install flow. New HTTP requests
|
|
380
|
+
to install CNR releases use the `middle` security level, so they are available
|
|
381
|
+
on non-local listeners with `security_level = normal`, `normal-`, or `weak`.
|
|
382
|
+
`strong` denies these new requests, including requests for whitelisted packs.
|
|
379
383
|
* Flagged versions (`NodeVersionStatusFlagged`) must satisfy the same installation
|
|
380
384
|
conditions as Active versions. In addition, **all** addresses in `--listen`
|
|
381
385
|
must resolve to loopback, such as `127.0.0.1` and `::1`, unless the explicit
|
|
382
|
-
override below is enabled.
|
|
386
|
+
override below is enabled or the pack ID is whitelisted.
|
|
387
|
+
* To allow specific packs on any listener without enabling all flagged installs,
|
|
388
|
+
edit `nodepack-whitelist.list` beside Manager's `config.ini`
|
|
389
|
+
(normally `<USER_DIRECTORY>/__manager/nodepack-whitelist.list`).
|
|
390
|
+
At server startup, Manager creates a commented template if the file is missing;
|
|
391
|
+
existing files are preserved. The template grants no exceptions by default.
|
|
392
|
+
Enter one Registry pack ID per line:
|
|
393
|
+
|
|
394
|
+
```text
|
|
395
|
+
# Nodepack whitelist
|
|
396
|
+
# Add one Registry ID per line; each entry applies to all CNR versions.
|
|
397
|
+
# Registry IDs are case-insensitive.
|
|
398
|
+
|
|
399
|
+
comfyui-impact-pack
|
|
400
|
+
comfyui-inspire-pack # Inline comments are supported.
|
|
401
|
+
```
|
|
402
|
+
|
|
403
|
+
Entries are case-insensitive and apply to all CNR versions of that pack. Use
|
|
404
|
+
Registry IDs, not display names, Git URLs, or `id@version`; wildcards are not
|
|
405
|
+
expanded. Blank lines and `#` comments are ignored. Delete an entry or comment
|
|
406
|
+
out its line with `#` to revoke that exception. Manager reads the file
|
|
407
|
+
for each installation check, so edits and removals apply without restarting.
|
|
408
|
+
A missing, unreadable, or NUL-containing file grants no whitelist exceptions.
|
|
409
|
+
If mixed encodings introduce NUL characters, Manager logs a warning to save
|
|
410
|
+
the file as UTF-8. Whitelist-based permission is logged at WARNING level with
|
|
411
|
+
the Registry ID, including in snapshot restore children. This records the policy
|
|
412
|
+
decision, not successful installation. Packs absent from the list continue to
|
|
413
|
+
use the listener and global option rules.
|
|
383
414
|
* To allow flagged versions on a non-local listener in a **trusted private
|
|
384
415
|
network**, an administrator can explicitly opt in:
|
|
385
416
|
|
|
@@ -395,17 +426,27 @@ and directs users to the terminal. Only the terminal provides loopback-only
|
|
|
395
426
|
private network. This option does not require `network_mode = private`, and
|
|
396
427
|
`network_mode = personal_cloud` alone does not allow flagged versions.
|
|
397
428
|
* CNR API refusals, including banned or unavailable packages, still prevent
|
|
398
|
-
installation.
|
|
399
|
-
the separate Git/nightly and pip
|
|
429
|
+
installation. Neither the option nor the whitelist bypasses the `strong`
|
|
430
|
+
restriction on new HTTP install requests or the separate Git/nightly and pip
|
|
431
|
+
installation policies.
|
|
400
432
|
* Enabling an already installed version does not query the Registry or reinstall it.
|
|
401
|
-
* Older deferred switches without a stored status require loopback-only listeners
|
|
402
|
-
or
|
|
403
|
-
request the installation again so Manager can
|
|
433
|
+
* Older deferred switches without a stored status require loopback-only listeners,
|
|
434
|
+
the override, or a whitelisted pack ID. Otherwise they are rejected without
|
|
435
|
+
changing the installed pack; request the installation again so Manager can
|
|
436
|
+
check its current Registry status.
|
|
404
437
|
* Newly scheduled deferred version switches retain the returned version status
|
|
405
|
-
and check it against the current listen address and
|
|
438
|
+
and check it against the current listen address, option, and whitelist again
|
|
439
|
+
at restart.
|
|
406
440
|
This uses the saved status; it does not query CNR again for later status changes.
|
|
407
441
|
Server-scheduled snapshot restores inherit the permission computed from the
|
|
408
|
-
server's current listener and setting
|
|
442
|
+
server's current listener and setting, and read the whitelist from the server's
|
|
443
|
+
Manager configuration directory.
|
|
444
|
+
* Startup execution of deferred CNR switches and server-scheduled snapshot
|
|
445
|
+
restores does not recheck `security_level`. Changing it to `strong` does not
|
|
446
|
+
cancel previously scheduled work. For example, a flagged version switch
|
|
447
|
+
scheduled under `normal` can still run after restarting with `strong` if the
|
|
448
|
+
pack remains whitelisted. The startup flagged-version checks described above
|
|
449
|
+
still apply. This is existing behavior of scheduled execution.
|
|
409
450
|
* Standalone `cm-cli` commands remain local administrator operations and do not
|
|
410
451
|
use the server listener policy.
|
|
411
452
|
|
|
@@ -1541,9 +1541,8 @@ async def _force_update_cache(channel):
|
|
|
1541
1541
|
|
|
1542
1542
|
json_obj = await manager_util.get_data(uri, silent=True)
|
|
1543
1543
|
|
|
1544
|
-
|
|
1545
|
-
|
|
1546
|
-
json.dump(json_obj, file, indent=4, sort_keys=True)
|
|
1544
|
+
if not manager_util.write_cache_file(cache_uri, json_obj):
|
|
1545
|
+
raise OSError("the cache file is in use")
|
|
1547
1546
|
|
|
1548
1547
|
print(f" [CACHED] {filename}")
|
|
1549
1548
|
except Exception as e:
|
|
@@ -18,6 +18,7 @@ DO NOT add the gate to body-reading handlers (redundant + UX-breaking).
|
|
|
18
18
|
DO NOT remove the gate from no-body handlers (this is the bypass vector).
|
|
19
19
|
"""
|
|
20
20
|
|
|
21
|
+
import logging
|
|
21
22
|
import os
|
|
22
23
|
from enum import Enum
|
|
23
24
|
from typing import Optional
|
|
@@ -27,6 +28,8 @@ from aiohttp import web
|
|
|
27
28
|
is_personal_cloud_mode = False
|
|
28
29
|
handler_policy = {}
|
|
29
30
|
|
|
31
|
+
FLAGGED_NODEPACK_WHITELIST_FILE = 'nodepack-whitelist.list'
|
|
32
|
+
|
|
30
33
|
FLAGGED_NODEPACK_INSTALL_ERROR = (
|
|
31
34
|
'This action is not allowed by the current security configuration. '
|
|
32
35
|
'See the terminal for details.'
|
|
@@ -39,7 +42,10 @@ FLAGGED_NODEPACK_INSTALL_GUIDANCE = (
|
|
|
39
42
|
' Do not use bare --listen or any non-loopback address, such as 0.0.0.0 or ::.\n'
|
|
40
43
|
'2. For a trusted private network, set allow_flagged_nodepack_install = true '
|
|
41
44
|
'in the [default] section of ComfyUI-Manager\'s config.ini.\n'
|
|
42
|
-
'
|
|
45
|
+
'3. To allow specific packs, add their Registry pack IDs (case-insensitive), one per line, '
|
|
46
|
+
f'to {FLAGGED_NODEPACK_WHITELIST_FILE} beside ComfyUI-Manager\'s config.ini. '
|
|
47
|
+
'Whitelist changes apply to subsequent installations without a restart.\n'
|
|
48
|
+
'Restart ComfyUI after changing the listener or config.ini. '
|
|
43
49
|
'All other installation security checks still apply.'
|
|
44
50
|
)
|
|
45
51
|
|
|
@@ -99,7 +105,7 @@ def is_loopback(address):
|
|
|
99
105
|
return False
|
|
100
106
|
|
|
101
107
|
|
|
102
|
-
def is_loopback_listener(listen_address: str) -> bool:
|
|
108
|
+
def is_loopback_listener(listen_address: Optional[str]) -> bool:
|
|
103
109
|
"""All addresses bound by --listen must resolve exclusively to loopback."""
|
|
104
110
|
import socket
|
|
105
111
|
|
|
@@ -120,9 +126,62 @@ def is_loopback_listener(listen_address: str) -> bool:
|
|
|
120
126
|
return True
|
|
121
127
|
|
|
122
128
|
|
|
123
|
-
def
|
|
124
|
-
"""
|
|
125
|
-
|
|
129
|
+
def ensure_nodepack_whitelist(manager_files_path):
|
|
130
|
+
"""Create a commented template without replacing an existing whitelist."""
|
|
131
|
+
path = os.path.join(manager_files_path, FLAGGED_NODEPACK_WHITELIST_FILE)
|
|
132
|
+
try:
|
|
133
|
+
os.makedirs(manager_files_path, exist_ok=True)
|
|
134
|
+
with open(path, 'x', encoding='utf-8') as file:
|
|
135
|
+
file.write(
|
|
136
|
+
'# Allow selected flagged CNR nodepacks on non-local listeners.\n'
|
|
137
|
+
'# One Registry ID per line; IDs are case-insensitive and apply to all versions.\n'
|
|
138
|
+
'# Blank lines and # comments are ignored. Changes apply without restarting.\n'
|
|
139
|
+
'# Other installation security checks still apply.\n'
|
|
140
|
+
'#\n'
|
|
141
|
+
'# Example entries (commented out; uncomment to allow):\n'
|
|
142
|
+
'# comfyui-impact-pack\n'
|
|
143
|
+
'# comfyui-inspire-pack # Optional inline comment\n'
|
|
144
|
+
)
|
|
145
|
+
except OSError as exc:
|
|
146
|
+
if isinstance(exc, FileExistsError) and os.path.isfile(path):
|
|
147
|
+
return
|
|
148
|
+
logging.warning('[ComfyUI-Manager] Cannot create nodepack whitelist %s: %s', path, exc)
|
|
149
|
+
|
|
150
|
+
|
|
151
|
+
def is_flagged_nodepack_whitelisted(node_id: str, manager_files_path) -> bool:
|
|
152
|
+
"""Match a whole Registry ID, ignoring case, in the current Manager whitelist."""
|
|
153
|
+
if not manager_files_path:
|
|
154
|
+
return False
|
|
155
|
+
path = os.path.join(manager_files_path, FLAGGED_NODEPACK_WHITELIST_FILE)
|
|
156
|
+
try:
|
|
157
|
+
with open(path, encoding='utf-8-sig') as file:
|
|
158
|
+
contents = file.read()
|
|
159
|
+
if '\x00' in contents:
|
|
160
|
+
raise UnicodeError('NUL characters found; save the file as UTF-8')
|
|
161
|
+
entries = (line.split('#', 1)[0].strip() for line in contents.split('\n'))
|
|
162
|
+
if node_id.lower() in {entry.lower() for entry in entries if entry}:
|
|
163
|
+
logging.warning('[ComfyUI-Manager] CNR installation of %r permitted by nodepack whitelist (%s).', node_id, path)
|
|
164
|
+
return True
|
|
165
|
+
return False
|
|
166
|
+
except FileNotFoundError:
|
|
167
|
+
return False
|
|
168
|
+
except (OSError, UnicodeError) as exc:
|
|
169
|
+
logging.warning('[ComfyUI-Manager] Cannot read flagged nodepack whitelist %s: %s', path, exc)
|
|
170
|
+
return False
|
|
171
|
+
|
|
172
|
+
|
|
173
|
+
def is_cnr_install_allowed(
|
|
174
|
+
status: str, allow_flagged: bool, listen_address: Optional[str], *,
|
|
175
|
+
node_id: Optional[str] = None, manager_files_path=None,
|
|
176
|
+
) -> bool:
|
|
177
|
+
"""Flagged versions require loopback, explicit permission, or a whitelisted ID.
|
|
178
|
+
|
|
179
|
+
Restore children pass their parent's resolved permission and no listener.
|
|
180
|
+
"""
|
|
181
|
+
return (status != 'NodeVersionStatusFlagged'
|
|
182
|
+
or bool(allow_flagged)
|
|
183
|
+
or is_loopback_listener(listen_address)
|
|
184
|
+
or (node_id is not None and is_flagged_nodepack_whitelisted(node_id, manager_files_path)))
|
|
126
185
|
|
|
127
186
|
|
|
128
187
|
def is_dedicated_install_allowed(flag_value: bool, listen_address: str, network_mode: str) -> bool:
|