saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #35241 from terminalmage/gitfs-fixes

Browse source 
Ensure max recursion in gitfs results in no blob object being returned.
This commit is contained in:
Mike Place 2016-08-06 16:53:49 +09:00 • committed by GitHub
commit 4bcfaa97d0
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/utils/gitfs.py
View file

@ -857,6 +857,7 @@ class GitPython(GitProvider):
while True:
depth += 1
if depth > SYMLINK_RECURSE_DEPTH:
blob = None
break
try:
file_blob = tree / path
@ -878,6 +879,7 @@ class GitPython(GitProvider):
break
except KeyError:
# File not found or repo_path points to a directory
blob = None
break
return blob, blob.hexsha if blob is not None else blob
@ -1400,6 +1402,7 @@ class Pygit2(GitProvider):
while True:
depth += 1
if depth > SYMLINK_RECURSE_DEPTH:
blob = None
break
try:
if stat.S_ISLNK(tree[path].filemode):
@ -1414,7 +1417,9 @@ class Pygit2(GitProvider):
else:
oid = tree[path].oid
blob = self.repo[oid]
break
except KeyError:
blob = None
break
return blob, blob.hex if blob is not None else blob
@ -1750,6 +1755,7 @@ class Dulwich(GitProvider): # pylint: disable=abstract-method
while True:
depth += 1
if depth > SYMLINK_RECURSE_DEPTH:
blob = None
break
prefix_dirs, _, filename = path.rpartition(os.path.sep)
tree = self.walk_tree(tree, prefix_dirs)
@ -1771,6 +1777,7 @@ class Dulwich(GitProvider): # pylint: disable=abstract-method
blob = self.repo.get_object(oid)
break
except KeyError:
blob = None
break
return blob, blob.sha().hexdigest() if blob is not None else blob