Retire emergency CLI: Zuse goes thumbdrive-resident, ACL.4th activated
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
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
7fc3e93358
commit
cc9521d2cc
@@ -58,8 +58,9 @@ static int write_devblock(struct blkio_dev *dev, uint32_t devblock,
|
||||
|
||||
MintResult capsule_mint_identity(struct blkio_dev *dev, VM *issuer_vm,
|
||||
const char *full_name, const char *username,
|
||||
const char *email, const char *phone) {
|
||||
if (!dev || !issuer_vm || !full_name || !username) return MINT_ERR_WRITE_FAIL;
|
||||
const char *email, const char *phone,
|
||||
uint8_t out_pubkey[32], uint8_t out_seed[32]) {
|
||||
if (!dev || !full_name || !username) return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
/* full_name/username required and must fit; email/phone may be NULL
|
||||
* (treated as empty/null) but must fit if given. */
|
||||
@@ -83,13 +84,17 @@ MintResult capsule_mint_identity(struct blkio_dev *dev, VM *issuer_vm,
|
||||
}
|
||||
}
|
||||
|
||||
if (!issuer_vm->zuse_cert_installed) return MINT_ERR_NO_ZUSE_CERT;
|
||||
if (!virtio_rng_ready()) return MINT_ERR_NO_ENTROPY;
|
||||
/* issuer_vm==NULL is genesis mode (§F.21) -- no existing Zuse to
|
||||
* require a cert from. */
|
||||
if (issuer_vm && !issuer_vm->zuse_cert_installed) return MINT_ERR_NO_ZUSE_CERT;
|
||||
if (!virtio_rng_ready()) return MINT_ERR_NO_ENTROPY;
|
||||
|
||||
/* Fresh identity keypair. */
|
||||
uint8_t seed[32], pubkey[32];
|
||||
if (virtio_rng_get_bytes(seed, sizeof(seed)) != 0) return MINT_ERR_NO_ENTROPY;
|
||||
ed25519_keygen(seed, pubkey);
|
||||
if (out_pubkey) memcpy(out_pubkey, pubkey, 32);
|
||||
if (out_seed) memcpy(out_seed, seed, 32);
|
||||
|
||||
/* Fresh drive_uuid -- an independent random draw, not derived from
|
||||
* the identity seed (§F.8 decision 3: "which physical drive," not
|
||||
@@ -98,18 +103,29 @@ MintResult capsule_mint_identity(struct blkio_dev *dev, VM *issuer_vm,
|
||||
if (virtio_rng_get_bytes(drive_uuid, sizeof(drive_uuid)) != 0)
|
||||
return MINT_ERR_NO_ENTROPY;
|
||||
|
||||
/* Cert: SubjectPublicKeyInfo = new pubkey, serialNumber = drive_uuid,
|
||||
* signed by Zuse's own on-device seed (§F.8 decision 4). */
|
||||
uint8_t cert[512];
|
||||
size_t cert_len = x509_build_user_cert(cert, sizeof(cert), pubkey,
|
||||
drive_uuid, issuer_vm->zuse_cert_seed);
|
||||
if (cert_len == 0 || cert_len > 4096) return MINT_ERR_CERT_BUILD;
|
||||
uint32_t cert_devblock = 0;
|
||||
uint32_t cert_devblocks = 0;
|
||||
if (issuer_vm) {
|
||||
/* Cert: SubjectPublicKeyInfo = new pubkey, serialNumber =
|
||||
* drive_uuid, signed by Zuse's own on-device seed (§F.8
|
||||
* decision 4). Genesis mode (issuer_vm==NULL) skips this
|
||||
* entirely -- Zuse's own identity isn't verified against a
|
||||
* separate signer, she's recognized directly by pubkey match
|
||||
* against zuse_genesis_marker_t (§F.21). */
|
||||
uint8_t cert[512];
|
||||
size_t cert_len = x509_build_user_cert(cert, sizeof(cert), pubkey,
|
||||
drive_uuid, issuer_vm->zuse_cert_seed);
|
||||
if (cert_len == 0 || cert_len > 4096) return MINT_ERR_CERT_BUILD;
|
||||
|
||||
uint8_t cert_block[4096];
|
||||
memset(cert_block, 0, sizeof(cert_block));
|
||||
memcpy(cert_block, cert, cert_len);
|
||||
if (write_devblock(dev, MINT_CERT_DEVBLOCK, cert_block) != 0)
|
||||
return MINT_ERR_WRITE_FAIL;
|
||||
uint8_t cert_block[4096];
|
||||
memset(cert_block, 0, sizeof(cert_block));
|
||||
memcpy(cert_block, cert, cert_len);
|
||||
if (write_devblock(dev, MINT_CERT_DEVBLOCK, cert_block) != 0)
|
||||
return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
cert_devblock = MINT_CERT_DEVBLOCK;
|
||||
cert_devblocks = MINT_CERT_DEVBLOCKS;
|
||||
}
|
||||
|
||||
/* user_identity_seed_t record. */
|
||||
user_identity_seed_t idrec;
|
||||
@@ -145,8 +161,8 @@ MintResult capsule_mint_identity(struct blkio_dev *dev, VM *issuer_vm,
|
||||
* anywhere in this codebase yet,
|
||||
* §F.8's own open item */
|
||||
sig.metadata_devblocks = MINT_METADATA_DEVBLOCKS;
|
||||
sig.cert_offset = MINT_CERT_DEVBLOCK;
|
||||
sig.cert_devblocks = MINT_CERT_DEVBLOCKS;
|
||||
sig.cert_offset = cert_devblock;
|
||||
sig.cert_devblocks = cert_devblocks;
|
||||
sig.identity_src_offset = MINT_IDENTITY_SRC_OFFSET;
|
||||
sig.identity_src_devblocks = MINT_IDENTITY_SRC_DEVBLOCKS;
|
||||
sig.hdr_crc = homeblocks_sig_compute_crc(&sig);
|
||||
|
||||
Reference in New Issue
Block a user