Skip to content

fix: Add a fallback method for gitter #4589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
another-rex wants to merge 5 commits into
base: master
Choose a base branch
from
+14 −8
Open

fix: Add a fallback method for gitter #4589

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec29b1f
Add a fallback method
another-rex Jan 13, 2026
9164acb
Actually log errors as well
another-rex Jan 13, 2026
64f4823
Fix lints
another-rex Jan 13, 2026
d322a42
Fix lintsstsstswgs again
another-rex Jan 13, 2026
d2ca8cc
asdfsdsdfgsdf
another-rex Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions osv/repos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ class RepoInaccessibleError(Exception):
def clone(git_url, checkout_dir, git_callbacks=None, blobless=False):
"""Perform a clone."""
# Don't user Gitter for oss-fuzz-vulns repo because it requires auth
logging.info('Cloning %s to %s.', git_url, checkout_dir)
if GITTER_HOST and git_url != 'ssh://github.com/google/oss-fuzz-vulns':
try:
os.makedirs(checkout_dir, exist_ok=True)
Expand All @@ -132,17 +133,22 @@ def clone(git_url, checkout_dir, git_callbacks=None, blobless=False):
if resp.status_code == 400:
raise GitCloneError(f'Failed to clone repo: {resp.text}')

resp.raise_for_status()
# If return is successful write out the repo, otherwise fall back to
# original cloning method
if resp.status_code == 200:
with open(f'{checkout_dir}.zst', 'wb') as f:
shutil.copyfileobj(resp.raw, f)

with open(f'{checkout_dir}.zst', 'wb') as f:
shutil.copyfileobj(resp.raw, f)
cmd = ['tar', '-xf', f'{checkout_dir}.zst', '-C', checkout_dir]
subprocess.run(cmd, check=True)
# Remove after extraction.
os.remove(f'{checkout_dir}.zst')

cmd = ['tar', '-xf', f'{checkout_dir}.zst', '-C', checkout_dir]
subprocess.run(cmd, check=True)
# Remove after extraction.
os.remove(f'{checkout_dir}.zst')
return pygit2.Repository(checkout_dir)

return pygit2.Repository(checkout_dir)
logging.error(
'Failed to clone repo through gitter, '
'status: %d, response: %s', resp.status_code, resp.text)
except requests.RequestException as e:
raise GitCloneError(f'Failed to clone repo: {e}') from e
except subprocess.CalledProcessError as e:
Expand Down
Loading