rc/marginaltool
2
0
Fork 1
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use more exceptions

Browse source
This commit is contained in:
Timotej Lazar 2024-01-16 21:51:47 +01:00
parent f38fc807aa
commit 816171f235
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
margfools
View file

@ -36,7 +36,7 @@ def sign(b64data, key, pin=None, engine=None):
p = subprocess.run(cmd, env=env, input=data, capture_output=True) p = subprocess.run(cmd, env=env, input=data, capture_output=True)
if p.returncode != 0: if p.returncode != 0:
raise RuntimeError('could not sign data') raise Exception(f'could not sign data: {p.stderr.decode()}')
return base64.b64encode(p.stdout).decode() return base64.b64encode(p.stdout).decode()
@ -64,15 +64,13 @@ if __name__ == '__main__':
if not args.cert: if not args.cert:
args.cert = config.get(url, 'cert', fallback=None) args.cert = config.get(url, 'cert', fallback=None)
if not args.key: if not args.key:
print('key not specified', file=sys.stderr) raise Exception('key not specified')
sys.exit(1)
pin = None pin = None
if args.engine is None: if args.engine is None:
if not args.cert: if not args.cert:
print('certificate not specified', file=sys.stderr) raise Exception('certificate not specified')
sys.exit(1)
args.cert = ''.join(line.strip() for line in open(args.cert) if not line.startswith('-----')) args.cert = ''.join(line.strip() for line in open(args.cert) if not line.startswith('-----'))
elif args.engine == 'pkcs11': elif args.engine == 'pkcs11':
args.cert = base64.b64encode(subprocess.run(['pkcs11-tool', '--read-object', '--type', 'cert', '--id', args.key], capture_output=True).stdout).decode() args.cert = base64.b64encode(subprocess.run(['pkcs11-tool', '--read-object', '--type', 'cert', '--id', args.key], capture_output=True).stdout).decode()
@ -110,5 +108,5 @@ if __name__ == '__main__':
request |= json.loads(r.text) request |= json.loads(r.text)
except Exception as ex: except Exception as ex:
print(ex, file=sys.stderr) print(f'error: {ex}', file=sys.stderr)
input('press enter to exit') # don’t close terminal immediately on fail input('press enter to exit') # don’t close terminal immediately on fail