Publish independently verified bootstrap workers and record native Windows update recovery
This commit is contained in:
+24
-12
@@ -67,7 +67,7 @@ def verify_native_image(path, target, size):
|
||||
'Windows x86-64 PE32+ image required: ' + path.name)
|
||||
|
||||
|
||||
def binaries(folder, receipt):
|
||||
def binaries(folder, receipt, worker_only=False):
|
||||
record = json.loads(receipt.read_text(encoding='utf-8-sig'))
|
||||
if 'target' in record and 'sha256' in record:
|
||||
target, hashes = record['target'], record['sha256']
|
||||
@@ -75,11 +75,12 @@ def binaries(folder, receipt):
|
||||
check(record.get('completed') is True and record['stage'] == 'built_not_deployed', 'completed MSVC receipt required')
|
||||
target = WINDOWS
|
||||
entries = record['artifacts']
|
||||
check(all(entries[name[:-4]]['build_target'] == target for name in FILES[target]), 'incorrect build target')
|
||||
hashes = {name: entries[name[:-4]]['sha256'] for name in FILES[target]}
|
||||
names = FILES[target][2:] if worker_only else FILES[target]
|
||||
check(all(entries[name[:-4]]['build_target'] == target for name in names), 'incorrect build target')
|
||||
hashes = {name: entries[name[:-4]]['sha256'] for name in names}
|
||||
check(target in FILES, 'unknown release target')
|
||||
result = []
|
||||
for name in FILES[target]:
|
||||
for name in FILES[target][2:] if worker_only else FILES[target]:
|
||||
path = folder / name
|
||||
digest, size = fingerprint(path)
|
||||
verify_native_image(path, target, size)
|
||||
@@ -274,11 +275,16 @@ def rotate_pin(state, label, tenant, expected, new_pin):
|
||||
|
||||
|
||||
def publish(args):
|
||||
platform, blobs = binaries(args.artifacts, args.build_receipt)
|
||||
env = json.loads(args.envelope.read_bytes())
|
||||
manifest = json.loads(base64.urlsafe_b64decode(env['payload_bytes'] + '==='))
|
||||
check(manifest['platform'] == platform and manifest['artifacts'] == [dict(role=role, **blob)
|
||||
for role, blob in zip(('agent', 'helper'), blobs[:2])], 'input files differ from release envelope')
|
||||
worker_only = args.rotate_worker_only
|
||||
platform, blobs = binaries(args.artifacts, args.build_receipt, worker_only)
|
||||
if worker_only:
|
||||
check(args.envelope is None and args.rotate_bootstrap_from, 'worker rotation requires a predecessor and no release envelope')
|
||||
else:
|
||||
check(args.envelope is not None, 'a release envelope is required')
|
||||
env = json.loads(args.envelope.read_bytes())
|
||||
manifest = json.loads(base64.urlsafe_b64decode(env['payload_bytes'] + '==='))
|
||||
check(manifest['platform'] == platform and manifest['artifacts'] == [dict(role=role, **blob)
|
||||
for role, blob in zip(('agent', 'helper'), blobs[:2])], 'input files differ from release envelope')
|
||||
check(bool(args.rotate_bootstrap_from) == bool(args.bootstrap_state), 'rotation needs previous SHA and local signing state')
|
||||
check(not (args.rotate_bootstrap_from and args.bootstrap_worker), 'a rotation uses the new receipt-bound stable worker')
|
||||
client = Publisher(args.origin, args.ca)
|
||||
@@ -296,7 +302,8 @@ def publish(args):
|
||||
tenant = str(uuid.UUID(args.tenant))
|
||||
check(session['tenant_id'] == tenant and 'catalog:write' in session['permissions'], 'tenant catalog write permission required')
|
||||
path = '/api/v1/tenants/' + tenant
|
||||
paths = [args.artifacts / name for name in FILES[platform]]
|
||||
names = FILES[platform][2:] if worker_only else FILES[platform]
|
||||
paths = [args.artifacts / name for name in names]
|
||||
if args.bootstrap_worker:
|
||||
paths[2] = args.bootstrap_worker
|
||||
sha, size = fingerprint(paths[2])
|
||||
@@ -311,10 +318,14 @@ def publish(args):
|
||||
{'Content-Type': 'application/octet-stream', 'Content-Length': str(blob['bytes'])})
|
||||
check(result['sha256'] == blob['sha256'] and result['size_bytes'] == blob['bytes'], 'artifact receipt differs')
|
||||
if args.rotate_bootstrap_from:
|
||||
stable = blobs[2]
|
||||
stable = blobs[-1]
|
||||
label = {LINUX:'linux', WINDOWS:'windows', WINDOWS_GNU:'windows-gnu'}[platform]
|
||||
rotate_pin(args.bootstrap_state,label,tenant,args.rotate_bootstrap_from,
|
||||
{'sha256':stable['sha256'],'bytes':stable['bytes']})
|
||||
if worker_only:
|
||||
print(json.dumps({'tenant_id':tenant,'platform':platform,'updater_sha256':stable['sha256'],
|
||||
'updater_bytes':stable['bytes']}))
|
||||
return
|
||||
result = client.request('POST', path + '/agent-releases', encoded(env), {'Content-Type': 'application/json'})
|
||||
check(result['release_envelope'] == env, 'published envelope changed')
|
||||
print(json.dumps({'release_id': result['release_id'], 'version': manifest['version'], 'platform': platform,
|
||||
@@ -346,7 +357,8 @@ def main():
|
||||
cmd.add_argument('--bootstrap-worker', type=Path, help='Pinned initial stable updater when publishing subsequent code pairs')
|
||||
cmd.add_argument('--ca', type=Path)
|
||||
cmd.add_argument('--tenant', required=True)
|
||||
cmd.add_argument('--envelope', type=Path, required=True)
|
||||
cmd.add_argument('--envelope', type=Path, help='Prepared agent and helper release')
|
||||
cmd.add_argument('--rotate-worker-only', action='store_true', help='Rotate the stable worker independently of a code-pair release')
|
||||
auth = cmd.add_mutually_exclusive_group(required=True)
|
||||
auth.add_argument('--dev-username')
|
||||
auth.add_argument('--dev-login-file', type=Path)
|
||||
|
||||
Reference in New Issue
Block a user