Skip to content
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

Jump to bottom

gitian-verify: List mismatches #91

Merged
merged 1 commit into from May 2, 2021
Merged

gitian-verify: List mismatches #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 20 additions & 3 deletions gitian-verify.py
View file
Open in desktop
Expand Up @@ -44,6 +44,8 @@ class Attr:
Status.INVALID_SIG: ('\x1b[91mBad\x1b[0m', 3),
Status.MISMATCH: ('\x1b[91mMismatch\x1b[0m', 8),
}
DIFF_OLD = '\033[91m'
DIFF_NEW = '\033[92m'

VerificationResult = collections.namedtuple('VerificationResult', ['verify_ok', 'p_fingerprint', 's_fingerprint', 'error'])
class VerificationInterface:
Expand Down Expand Up @@ -164,7 +166,7 @@ def validate_build(verifier: VerificationInterface,
keys: List[Tuple[str, str]]) -> Tuple[Dict[str, Status], Dict[Tuple[str, str], Missing]]:
'''Validate a single build (directory in gitian.sigs).'''
if not os.path.isdir(release_path):
return ({}, {})
return ({}, {}, {})

reference = None
if compare_to is not None:
Expand All @@ -175,6 +177,7 @@ def validate_build(verifier: VerificationInterface,
reference = result['out_manifest']

results = {}
mismatches = {}
missing_keys: Dict[Tuple[str, str], Missing] = collections.defaultdict(lambda: Missing(0))
for signer_name in os.listdir(release_path):
signer_dir = os.path.join(release_path, signer_name)
Expand Down Expand Up @@ -222,14 +225,15 @@ def validate_build(verifier: VerificationInterface,

if reference is not None and result['out_manifest'] != reference:
results[signer_name] = Status.MISMATCH
mismatches[signer_name] = (result['out_manifest'], reference)
else:
results[signer_name] = Status.OK

# if there is no reference, the first with a correct signature is the reference
if reference is None:
reference = result['out_manifest']

return (results, missing_keys)
return (results, missing_keys, mismatches)

def center(s: str, width: int, total_width: int) -> str:
'''Center text.'''
Expand All @@ -247,6 +251,7 @@ def main() -> None:
# maybe we could derive it otherwise (or simply look for *any* assert file)
all_missing_keys: Dict[Tuple[str,str],int] = collections.defaultdict(int)
all_results = {}
all_mismatches = {}
for build in builds:
release_path = os.path.join(args.directory, build.dir_name)

Expand All @@ -255,10 +260,11 @@ def main() -> None:

# goal: create a matrix signer × variant → status
# keep a list of unknown key fingerprints
(results, missing_keys) = validate_build(verifier, args.compare_to, release_path, result_file, sig_file, keys)
(results, missing_keys, mismatches) = validate_build(verifier, args.compare_to, release_path, result_file, sig_file, keys)
all_results[build.build_name] = results
for k, v in missing_keys.items():
all_missing_keys[k] |= v
all_mismatches[build.build_name] = mismatches

# Make a table of signer versus build
all_signers_set: Set[str] = set()
Expand Down Expand Up @@ -313,5 +319,16 @@ def main() -> None:
line += ', '.join(miss)
print(line)

if all_mismatches:
print()
print(f'{Attr.REVERSE}Mismatches{Attr.RESET}')
for (build, m) in all_mismatches.items():
for (signer, (result, reference)) in m.items():
print(f'{signer} ({build}):')
for (a, b) in zip(reference.split('\n'), result.split('\n')):
if a != b:
print(f' -{Attr.DIFF_OLD}{a}{Attr.RESET}')
print(f' +{Attr.DIFF_NEW}{b}{Attr.RESET}')

if __name__ == '__main__':
main()