highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 05:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

contrib: reject divergent verify-commits history

Browse Source 
`verify-commits.py` must not authorize checkout for a commit whose history diverges from configured trust roots.
Require proof that the commit is an ancestor of a root before skipping checks, and identify the failing root in errors.

Co-authored-by: Rob Hamilton <6456095+Rob1Ham@users.noreply.github.com>
This commit is contained in:
Lőrinc
2026-08-14 16:15:44 -07:00
parent b3d1dca338
commit 465bca734e
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/verify-commits/verify-commits.py
View File

@@ -22,6 +22,15 @@ def is_ancestor(older, newer, root_name):
sys.exit(1)
return result.returncode == 0
def predates(commit, root, root_name):
"""Return whether commit is provably older than root, rejecting divergent history."""
if is_ancestor(root, commit, root_name):
return False
elif is_ancestor(commit, root, root_name):
return True
print(f'"{commit}" diverges from the {root_name} "{root}", refusing to verify.', file=sys.stderr)
sys.exit(1)
def tree_sha512sum(commit='HEAD'):
"""Calculate the Tree-sha512 for the commit.
@@ -119,23 +128,19 @@ def main():
is_ancestor(verified_root, current_commit, "trusted Git root")
print('There is a valid path from "{}" to {} where all commits are signed!'.format(initial_commit, verified_root))
sys.exit(0)
else:
# Make sure this commit isn't older than trusted roots
if not is_ancestor(verified_root, current_commit, "trusted Git root"):
print(f"\"{current_commit}\" predates the trusted root, stopping!")
sys.exit(0)
elif predates(current_commit, verified_root, "trusted Git root"):
print(f"\"{current_commit}\" predates the trusted root, stopping!")
sys.exit(0)
if verify_tree:
if current_commit == verified_sha512_root:
print("All Tree-SHA512s matched up to {}".format(verified_sha512_root), file=sys.stderr)
verify_tree = False
no_sha1 = False
else:
# Skip the tree check if we are older than the trusted root
if not is_ancestor(verified_sha512_root, current_commit, "trusted Tree-SHA512 root"):
print(f"\"{current_commit}\" predates the trusted SHA512 root, disabling tree verification.")
verify_tree = False
no_sha1 = False
elif predates(current_commit, verified_sha512_root, "trusted Tree-SHA512 root"):
print(f"\"{current_commit}\" predates the trusted SHA512 root, disabling tree verification.")
verify_tree = False
no_sha1 = False
os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1"