wangbo/ComfyUI-Manager
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI-Manager.git synced 2026-07-03 13:19:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(git_compat): preserve corporate http.proxy in pygit2 backend

Browse Source 
Snapshot http.proxy from the global git config before blanking the config search path, then pass it explicitly (proxy=) to clone_repository and every remote.fetch() in the pygit2 backend, so corporate-lockdown proxy setups keep working after the insteadOf/SSH hardening.

Amp-Thread-ID: https://ampcode.com/threads/T-019eafa0-16a1-726e-91a4-dac1a40d4481
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Jedrzej Kosinski 2026-06-09 21:18:20 -07:00
parent 498e896472
commit 222ae16b96
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
comfyui_manager/common/git_compat.py
View File

@ -21,6 +21,13 @@ from collections import deque
from datetime import datetime, timezone, timedelta from datetime import datetime, timezone, timedelta
# Snapshot of the user's global `http.proxy` (captured before the config
# search path is blanked under the pygit2 backend) so corporate proxy
# settings survive and can be passed explicitly to fetch/clone. None means
# "no proxy".
_HTTP_PROXY = None
def _to_https_url(url): def _to_https_url(url):
"""Rewrite an SSH-form git URL to its anonymous HTTPS equivalent. """Rewrite an SSH-form git URL to its anonymous HTTPS equivalent.
@ -66,12 +73,26 @@ if USE_PYGIT2:
# See CVE-2022-24765 for context on this validation. # See CVE-2022-24765 for context on this validation.
_pygit2.option(_pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0) _pygit2.option(_pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0)
# Snapshot the global http.proxy BEFORE blanking the config search
# path, so a corporate proxy survives and can be passed explicitly
# to clone/fetch below.
try:
_global_cfg = _pygit2.Config.get_global_config()
try:
_HTTP_PROXY = _global_cfg["http.proxy"] or None
except (KeyError, Exception):
_HTTP_PROXY = None
except Exception:
_HTTP_PROXY = None
# Ignore system/global/XDG git config for libgit2 operations. A # Ignore system/global/XDG git config for libgit2 operations. A
# user's global config can carry `insteadOf` rewrites (e.g. # user's global config can carry `insteadOf` rewrites (e.g.
# https->ssh) or credential helpers that force authentication, # https->ssh) or credential helpers that force authentication,
# which libgit2 cannot satisfy without a credentials callback # which libgit2 cannot satisfy without a credentials callback
# ("authentication required but no callback set"). Blanking the # ("authentication required but no callback set"). The bundled
# config search path keeps clone/fetch over anonymous HTTPS. # pygit2 has no SSH transport, so an SSH rewrite can never succeed;
# blanking the config search path keeps clone/fetch on anonymous
# HTTPS.
try: try:
from pygit2.enums import ConfigLevel as _ConfigLevel from pygit2.enums import ConfigLevel as _ConfigLevel
_cfg_levels = [_ConfigLevel.SYSTEM, _ConfigLevel.XDG, _ConfigLevel.GLOBAL] _cfg_levels = [_ConfigLevel.SYSTEM, _ConfigLevel.XDG, _ConfigLevel.GLOBAL]
@ -494,7 +515,7 @@ class _Pygit2Repo(GitRepo):
remote = self._repo.remotes[name] remote = self._repo.remotes[name]
def _pull(): def _pull():
remote.fetch() remote.fetch(proxy=_HTTP_PROXY)
branch_name = self.active_branch_name branch_name = self.active_branch_name
branch = self._repo.branches.get(branch_name) branch = self._repo.branches.get(branch_name)
if branch and branch.upstream: if branch and branch.upstream:
@ -704,7 +725,7 @@ class _Pygit2Repo(GitRepo):
raise GitCommandError(f"No upstream for branch '{branch_name}'") raise GitCommandError(f"No upstream for branch '{branch_name}'")
remote_name = upstream.remote_name remote_name = upstream.remote_name
self._repo.remotes[remote_name].fetch() self._repo.remotes[remote_name].fetch(proxy=_HTTP_PROXY)
upstream = self._repo.branches.get(branch_name).upstream upstream = self._repo.branches.get(branch_name).upstream
if upstream is None: if upstream is None:
@ -829,12 +850,12 @@ class _Pygit2Repo(GitRepo):
def fetch_remote_by_index(self, index): def fetch_remote_by_index(self, index):
remotes = list(self._repo.remotes) remotes = list(self._repo.remotes)
remotes[index].fetch() remotes[index].fetch(proxy=_HTTP_PROXY)
def pull_remote_by_index(self, index): def pull_remote_by_index(self, index):
remotes = list(self._repo.remotes) remotes = list(self._repo.remotes)
remote = remotes[index] remote = remotes[index]
remote.fetch() remote.fetch(proxy=_HTTP_PROXY)
# After fetch, try to ff-merge tracking branch # After fetch, try to ff-merge tracking branch
try: try:
branch_name = self.active_branch_name branch_name = self.active_branch_name
@ -874,7 +895,7 @@ def clone_repo(url, dest, progress=None):
(checkout, clear_cache, close, etc.). (checkout, clear_cache, close, etc.).
""" """
if USE_PYGIT2: if USE_PYGIT2:
_pygit2.clone_repository(_to_https_url(url), dest) _pygit2.clone_repository(_to_https_url(url), dest, proxy=_HTTP_PROXY)
repo = _Pygit2Repo(dest) repo = _Pygit2Repo(dest)
repo.submodule_update() repo.submodule_update()
return repo return repo