Robert Allan JamesandClaude Sonnet 5
cc9521d2cc
Three tightly-coupled changes, verified together per Captain Bob's own "getting rid of the emergency cli" direction: 1. Zuse's identity is thumbdrive-resident, never system-resident. New zuse_genesis_marker_t (magic/version/zuse_pubkey[32]/crc) replaces zuse_cert_devblock_t's slot in the top-of-device fence -- the system now remembers only that a root identity exists and its pubkey, never a seed. zuse_cert_devblock_t is kept in the repo, marked superseded, no longer written by any code path. capsule_mint_identity() grows a genesis mode (issuer_vm=NULL): no cert is built or written (Zuse isn't verified against a separate signer -- she's recognized by pubkey match against the marker) and two new optional out-params (out_pubkey/out_seed) let the caller install the cert immediately after a genesis mint. New capsule_zuse_boot_try_attach() (capsule_zuse_boot.c), called from sk_repl_idle() on every fresh USB attach (the only point in the boot lifecycle a thumbdrive can actually be detected -- attach polling doesn't exist yet at kernel_main.c's old one-shot mint point, which is why that whole block is gone): no marker + blank drive -> genesis-mint; marker present + matching drive -> read its own user_identity_seed_t, install the cert. Either way, re-runs ACL-ZUSE-BOOT (zuse.4th) so zuse_session activates exactly like it always has for a same-boot cert install -- ACL-PIN only blocks redefinition, not re-execution, so no new C-side auth logic needed. 2. ACL.4th activated (capsules/init.4th) -- inactive all session until now. Found and fixed a real bug this immediately surfaced: zuse.4th's ACL-ZUSE-BOOT tried `['] ACL-ZUSE-BOOT ACL-PIN` from inside its own still-compiling definition -- the word isn't findable yet at that point, so the whole definition silently failed to compile every previous boot this session (dormant, since ACL.4th never loaded). Fixed: pin after the definition closes, not from within it -- it only needs to happen once anyway, and pinning doesn't block the re-invocation genesis/attach needs. 3. The unauthenticated emergency-CLI ACL bypass is retired (repl.c): `emergency_console = is_hera ? (zuse_session ? 0 : 1) : 0` deleted from both sk_repl_step and sk_repl_run. Every word run from Hera's own bare prompt now goes through ordinary ACL enforcement; emergency_console is driven only by the genuine C-level fault handler again. Added ZUSE-SESSION? (starforth_words.c), a read-only diagnostic matching ZUSE-PUBKEY@'s own precedent, to verify the whole chain directly rather than by inference. Verified end-to-end live in QEMU: fresh boot, no thumbdrive -> ZUSE-SESSION? reads 0. Attach a genuinely blank drive via QMP -> genesis mint fires automatically (no typing) -> ZUSE-SESSION? reads -1 (true). Hermes/Artemis both birth clean on all three architectures with ACL now actually enforced for the first time all session -- no denials, no UNKNOWN WORD beyond the deliberate POST self-test cases. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019ZGkimpfyh63EZyRkNbkPD
111 lines
4.4 KiB
C
111 lines
4.4 KiB
C
/*
|
||
StarForth — Steady-State Virtual Machine Runtime
|
||
|
||
Copyright (c) 2023–2025 Robert A. James
|
||
All rights reserved.
|
||
|
||
Licensed under the StarForth License, Version 1.0
|
||
*/
|
||
|
||
#ifndef __STARKERNEL__
|
||
#error "capsule_zuse_boot.c is kernel-only"
|
||
#endif
|
||
|
||
#include "starkernel/capsule_zuse_boot.h"
|
||
#include "starkernel/capsule_mint.h"
|
||
#include "starkernel/zuse_genesis_marker.h"
|
||
#include "starkernel/user_identity_seed.h"
|
||
#include "starkernel/console.h"
|
||
#include "block_subsystem.h" /* compute_crc64(), blk_meta_zone_read/write */
|
||
#include "blkio.h"
|
||
#include <string.h>
|
||
#include <stddef.h>
|
||
|
||
/* Read exactly one devblock (4096 bytes) at devblock offset `devblock`,
|
||
* as 4 consecutive 1KiB forth-block reads -- mirrors capsule_runcap.c's
|
||
* and homeblocks_sig_check()'s own read convention. */
|
||
static int read_devblock(struct blkio_dev *dev, uint32_t devblock, uint8_t *buf4096) {
|
||
uint32_t base = devblock * 4u;
|
||
for (uint32_t i = 0; i < 4u; i++) {
|
||
if (blkio_read((blkio_dev_t *)dev, base + i,
|
||
buf4096 + (size_t)i * BLKIO_FORTH_BLOCK_SIZE) != BLKIO_OK) {
|
||
return -1;
|
||
}
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
static int genesis_marker_read(zuse_genesis_marker_t *out) {
|
||
if (blk_meta_zone_read(0, (uint8_t *)out) != 0) return -1;
|
||
if (out->magic != ZUSE_GENESIS_MARKER_MAGIC) return -1;
|
||
if (out->version != ZUSE_GENESIS_MARKER_VERSION) return -1;
|
||
uint64_t want_crc = compute_crc64((const uint8_t *)out, offsetof(zuse_genesis_marker_t, crc));
|
||
if (want_crc != out->crc) return -1;
|
||
return 0;
|
||
}
|
||
|
||
static void install_and_activate(VM *mama_vm, const uint8_t seed[32], const uint8_t pubkey[32]) {
|
||
if (vm_zuse_cert_install(mama_vm, seed, pubkey) != 0) return;
|
||
/* zuse.4th's ACL-ZUSE-BOOT self-activated once already at Mama's own
|
||
* birth, when no cert was installed yet (the thumbdrive wasn't
|
||
* attached at that early, one-shot point) -- ACL-PIN only blocks
|
||
* *redefinition*, not re-execution, so re-running the same policy
|
||
* word here is the correct, already-designed way to activate
|
||
* zuse_session now that a cert genuinely exists. No new C-side auth
|
||
* logic; policy stays in ACL.4th/zuse.4th per this project's own
|
||
* convention. */
|
||
vm_interpret(mama_vm, "ACL-ZUSE-BOOT");
|
||
}
|
||
|
||
void capsule_zuse_boot_try_attach(struct blkio_dev *dev,
|
||
homeblocks_sig_result_t sig_rc,
|
||
const homeblocks_sig_t *sig,
|
||
VM *mama_vm) {
|
||
if (!dev || !mama_vm) return;
|
||
if (mama_vm->zuse_cert_installed) return; /* already have Zuse this boot */
|
||
|
||
zuse_genesis_marker_t marker;
|
||
int have_marker = (genesis_marker_read(&marker) == 0);
|
||
|
||
if (!have_marker) {
|
||
if (sig_rc != HOMEBLOCKS_SIG_BLANK) return; /* not eligible for genesis */
|
||
|
||
uint8_t seed[32], pubkey[32];
|
||
MintResult r = capsule_mint_identity(dev, (VM *)0, "Zuse", "zuse",
|
||
(const char *)0, (const char *)0,
|
||
pubkey, seed);
|
||
if (r != MINT_OK) {
|
||
console_println("Zuse: genesis mint failed");
|
||
return;
|
||
}
|
||
|
||
zuse_genesis_marker_t wm;
|
||
memset(&wm, 0, sizeof(wm));
|
||
wm.magic = ZUSE_GENESIS_MARKER_MAGIC;
|
||
wm.version = ZUSE_GENESIS_MARKER_VERSION;
|
||
memcpy(wm.zuse_pubkey, pubkey, 32);
|
||
wm.crc = compute_crc64((const uint8_t *)&wm, offsetof(zuse_genesis_marker_t, crc));
|
||
if (blk_meta_zone_write(0, (const uint8_t *)&wm) != 0) {
|
||
console_println("Zuse: genesis minted but fence marker write FAILED (not persistent)");
|
||
} else {
|
||
console_println("Zuse: genesis minted onto attached thumbdrive");
|
||
}
|
||
|
||
install_and_activate(mama_vm, seed, pubkey);
|
||
return;
|
||
}
|
||
|
||
/* Marker present: genesis already happened, on some thumbdrive.
|
||
* Only act if THIS attach is that drive. */
|
||
if (sig_rc != HOMEBLOCKS_SIG_OK || !sig) return;
|
||
if (sig->identity_src_offset == 0 || sig->identity_src_devblocks < 1) return;
|
||
|
||
user_identity_seed_t idrec;
|
||
if (read_devblock(dev, sig->identity_src_offset, (uint8_t *)&idrec) != 0) return;
|
||
if (idrec.magic != USER_IDENTITY_SEED_MAGIC) return;
|
||
if (memcmp(idrec.pubkey, marker.zuse_pubkey, 32) != 0) return; /* not Zuse's drive */
|
||
|
||
console_println("Zuse: identity confirmed from attached thumbdrive");
|
||
install_and_activate(mama_vm, idrec.seed, idrec.pubkey);
|
||
}
|