mkit-cli 0.5.0

The mkit command-line tool: a content-addressed VCS with native attestation support
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
//! `mkit closure export|verify` — full-disclosure pack export and verify.

use std::fs;
use std::io::Write;
use std::path::{Path, PathBuf};

use clap::{Parser, ValueEnum};
use mkit_core::hash::{Hash, from_hex, to_hex};
use mkit_core::pack_key;
use mkit_core::store::{ObjectStore, StoreError};
use mkit_core::verify::{
    ClosureReport, export_closure, verify_closure, verify_closure_manifest, verify_closure_store,
};
use mkit_core::{ClosureMode, reachable_objects, reachable_snapshot};

use super::revspec;
use crate::clap_shim;
use crate::exit;
use crate::format::{self, JsonObject};

#[derive(Debug, Clone, Copy, ValueEnum)]
enum ClosureFormat {
    Default,
    Json,
}

#[derive(Debug, Parser)]
#[command(
    name = "mkit closure",
    about = "Export or verify a commit's object-set closure (full disclosure)."
)]
enum Cmd {
    /// Write MANIFEST.mkcl and raw-only pack files for a revision.
    Export(ExportArgs),
    /// Verify a closure against a trusted id (`--from`) or the local store.
    Verify(VerifyArgs),
}

#[derive(Debug, Parser)]
struct ExportArgs {
    /// Revision to export (commit, remix, or tag).
    revision: String,
    /// Export the full ancestry (history mode). Default is snapshot.
    #[arg(long)]
    history: bool,
    /// Output directory (default: `./<short-id>.closure/`).
    #[arg(short = 'o', long = "output", value_name = "DIR")]
    output: Option<PathBuf>,
    /// Overwrite a non-empty output directory.
    #[arg(long)]
    force: bool,
    #[arg(long, value_enum, default_value = "default")]
    format: ClosureFormat,
}

#[derive(Debug, Parser)]
struct VerifyArgs {
    /// With `--from`, a trusted 64-hex id. Without, a revision in the local store.
    #[arg(value_name = "COMMIT-ID")]
    commit_id: String,
    /// Directory containing `MANIFEST.mkcl` and `<pack_key>.pack` files.
    #[arg(long, value_name = "DIR")]
    from: Option<PathBuf>,
    /// History mode for a local (no `--from`) check. With `--from`, the
    /// manifest's mode is used.
    #[arg(long)]
    history: bool,
    /// Local (no `--from`) check only: enumerate every local object and
    /// also print the `unreferenced` list. Without this flag, local mode
    /// reads only objects reachable from the requested root and cannot
    /// check unreferenced objects.
    #[arg(long)]
    show_unreferenced: bool,
    #[arg(long, value_enum, default_value = "default")]
    format: ClosureFormat,
}

#[must_use]
pub fn run(args: &[String]) -> u8 {
    let cmd = match clap_shim::parse::<Cmd>("mkit closure", args) {
        Ok(c) => c,
        Err(code) => return code,
    };
    match cmd {
        Cmd::Export(opts) => run_export(&opts),
        Cmd::Verify(opts) => run_verify(&opts),
    }
}

fn run_export(opts: &ExportArgs) -> u8 {
    let json = matches!(opts.format, ClosureFormat::Json);
    let cwd = match std::env::current_dir() {
        Ok(p) => p,
        Err(e) => return emit_err(&format!("cwd: {e}"), exit::NOINPUT),
    };
    let layout = match super::resolve_layout(&cwd) {
        Ok(layout) => layout,
        Err(code) => return code,
    };
    let store = match ObjectStore::open(&layout) {
        Ok(s) => s,
        Err(e) => return emit_err(&format!("not a mkit repo: {e}"), exit::GENERAL_ERROR),
    };
    let root = match revspec::resolve_revision(&store, &layout, &opts.revision) {
        Ok(h) => h,
        Err(e) => return emit_err(&format!("{e}"), exit::DATAERR),
    };
    let mode = if opts.history {
        ClosureMode::History
    } else {
        ClosureMode::Snapshot
    };
    let export = match export_closure(&store, &root, mode) {
        Ok(e) => e,
        Err(e) => return emit_err(&e.to_string(), super::prove::map_prove_error(&e)),
    };
    let dir = opts.output.clone().unwrap_or_else(|| {
        PathBuf::from(format!(
            "{}.closure",
            format::short_hash(&root, format::SUMMARY_ABBREV)
        ))
    });
    if let Err((msg, code)) = prepare_dir(&dir, opts.force) {
        return emit_err(&msg, code);
    }
    let manifest_name = "MANIFEST.mkcl";
    if let Err(e) = fs::write(dir.join(manifest_name), &export.manifest) {
        return emit_err(
            &format!("write {}: {e}", dir.join(manifest_name).display()),
            exit::CANTCREAT,
        );
    }
    let mut pack_infos = Vec::new();
    let mut total = export.manifest.len() as u64;
    for pack in &export.packs {
        let key = pack_key(pack);
        let hex = to_hex(&key);
        let file = format!("{hex}.pack");
        if let Err(e) = fs::write(dir.join(&file), pack) {
            return emit_err(
                &format!("write {}: {e}", dir.join(&file).display()),
                exit::CANTCREAT,
            );
        }
        total += pack.len() as u64;
        pack_infos.push((file, key, pack.len() as u64));
    }
    let n_objects = match object_count(&store, &root, mode) {
        Ok(n) => n,
        Err(e) => return emit_err(&e, exit::GENERAL_ERROR),
    };
    let mode_str = mode_name(mode);
    if json {
        emit_export_json(&root, mode_str, &pack_infos, n_objects, manifest_name);
    } else {
        let mut stdout = std::io::stdout().lock();
        let _ = writeln!(
            stdout,
            "closure: {mode_str}, {n_objects} objects in {} pack(s), {total} B -> {}",
            pack_infos.len(),
            dir.display()
        );
    }
    exit::OK
}

fn run_verify(opts: &VerifyArgs) -> u8 {
    let json = matches!(opts.format, ClosureFormat::Json);
    if let Some(dir) = opts.from.as_deref() {
        run_verify_from(opts, dir, json)
    } else {
        run_verify_local(opts, json)
    }
}

fn run_verify_from(opts: &VerifyArgs, dir: &Path, json: bool) -> u8 {
    let root = match from_hex(&opts.commit_id) {
        Ok(h) => h,
        Err(e) => {
            return emit_err(
                &format!(
                    "with --from, commit-id must be a trusted 64-hex id (not a revision): {e}"
                ),
                exit::DATAERR,
            );
        }
    };
    let manifest_path = dir.join("MANIFEST.mkcl");
    let manifest = match fs::read(&manifest_path) {
        Ok(b) => b,
        Err(e) => {
            return emit_err(
                &format!("read {}: {e}", manifest_path.display()),
                exit::NOINPUT,
            );
        }
    };
    let decoded = match mkit_core::verify::ClosureManifest::decode(&manifest) {
        Ok(m) => m,
        Err(e) => return emit_err(&e.to_string(), exit::DATAERR),
    };
    if opts.history && decoded.mode != ClosureMode::History {
        return emit_err(
            "manifest mode is snapshot; omit --history or re-export with --history",
            exit::DATAERR,
        );
    }
    let mut packs = Vec::new();
    for key in &decoded.packs {
        let file = dir.join(format!("{}.pack", to_hex(key)));
        match fs::read(&file) {
            Ok(b) => packs.push(b),
            Err(e) => {
                return emit_err(&format!("read {}: {e}", file.display()), exit::NOINPUT);
            }
        }
    }
    let refs: Vec<&[u8]> = packs.iter().map(Vec::as_slice).collect();
    let report = match verify_closure_manifest(&root, &manifest, &refs) {
        Ok(r) => r,
        Err(e) => return emit_err(&e.to_string(), exit::DATAERR),
    };
    emit_report(&report, json, true)
}

fn run_verify_local(opts: &VerifyArgs, json: bool) -> u8 {
    let cwd = match std::env::current_dir() {
        Ok(p) => p,
        Err(e) => return emit_err(&format!("cwd: {e}"), exit::NOINPUT),
    };
    let layout = match super::resolve_layout(&cwd) {
        Ok(layout) => layout,
        Err(code) => return code,
    };
    let store = match ObjectStore::open(&layout) {
        Ok(s) => s,
        Err(e) => return emit_err(&format!("not a mkit repo: {e}"), exit::GENERAL_ERROR),
    };
    let root = match revspec::resolve_revision(&store, &layout, &opts.commit_id) {
        Ok(h) => h,
        Err(e) => return emit_err(&format!("{e}"), exit::DATAERR),
    };
    let mode = if opts.history {
        ClosureMode::History
    } else {
        ClosureMode::Snapshot
    };
    let report = if opts.show_unreferenced {
        let hashes = match store.iter_object_hashes() {
            Ok(h) => h,
            Err(e) => return emit_err(&format!("enumerate objects: {e}"), exit::GENERAL_ERROR),
        };
        let mut objects = Vec::new();
        // `store.read` re-verifies each object's on-disk bytes against its
        // filename hash and fails hard (`HashMismatch`) on a corrupt file. A
        // local `closure verify --show-unreferenced` retains the old
        // enumerate-everything path, so report that corruption under its
        // filename id and continue with the map-backed walk.
        let mut local_corrupt: Vec<(Hash, String)> = Vec::new();
        for h in hashes {
            match store.read(&h) {
                Ok(b) => objects.push(b),
                Err(StoreError::ObjectNotFound(_)) => {}
                Err(e @ StoreError::HashMismatch { .. }) => local_corrupt.push((h, e.to_string())),
                Err(e) => return emit_err(&format!("read {}: {e}", to_hex(&h)), exit::DATAERR),
            }
        }
        let mut report = match verify_closure(&root, mode, objects.iter().map(Vec::as_slice)) {
            Ok(r) => r,
            Err(e) => return emit_err(&e.to_string(), exit::DATAERR),
        };
        for (h, reason) in local_corrupt {
            report.missing.retain(|m| *m != h);
            report.corrupt.push((h, reason));
        }
        report.corrupt.sort_by_key(|(id, _)| *id);
        report
    } else {
        match verify_closure_store(&store, &root, mode) {
            Ok(r) => r,
            Err(e) => return emit_err(&e.to_string(), exit::DATAERR),
        }
    };
    emit_report(&report, json, opts.show_unreferenced)
}

fn emit_report(report: &ClosureReport, json: bool, show_unreferenced: bool) -> u8 {
    if json {
        emit_report_json(report, show_unreferenced);
    } else {
        emit_report_text(report, show_unreferenced);
    }
    if report.is_complete() {
        exit::OK
    } else {
        exit::DATAERR
    }
}

fn emit_report_text(report: &ClosureReport, show_unreferenced: bool) {
    let mut stdout = std::io::stdout().lock();
    let mode = mode_name(report.mode);
    if report.is_complete() {
        let _ = writeln!(
            stdout,
            "ok: closure complete ({} objects, {mode})",
            report.verified
        );
    } else {
        let _ = writeln!(
            stdout,
            "bad: closure incomplete: {} missing, {} corrupt",
            report.missing.len(),
            report.corrupt.len()
        );
        print_id_list(&mut stdout, &report.missing, None);
        let corrupt_ids: Vec<Hash> = report.corrupt.iter().map(|(id, _)| *id).collect();
        print_id_list(&mut stdout, &corrupt_ids, Some(&report.corrupt));
    }
    if !show_unreferenced && !report.unreferenced_checked {
        let _ = writeln!(
            stdout,
            "note: unreferenced not checked (use --show-unreferenced)"
        );
    } else if show_unreferenced && !report.unreferenced.is_empty() {
        let _ = writeln!(stdout, "note: {} unreferenced", report.unreferenced.len());
        print_id_list(&mut stdout, &report.unreferenced, None);
    }
}

fn print_id_list(stdout: &mut impl Write, ids: &[Hash], corrupt: Option<&[(Hash, String)]>) {
    let show = ids.len().min(10);
    for id in ids.iter().take(show) {
        if let Some(pairs) = corrupt {
            let reason = pairs
                .iter()
                .find(|(h, _)| h == id)
                .map_or("", |(_, r)| r.as_str());
            let _ = writeln!(stdout, "{} ({reason})", to_hex(id));
        } else {
            let _ = writeln!(stdout, "{}", to_hex(id));
        }
    }
    if ids.len() > 10 {
        let _ = writeln!(stdout, "... and {} more", ids.len() - 10);
    }
}

fn emit_report_json(report: &ClosureReport, show_unreferenced: bool) {
    let missing: Vec<String> = report.missing.iter().map(to_hex).collect();
    let unreferenced: Vec<String> = if show_unreferenced {
        report.unreferenced.iter().map(to_hex).collect()
    } else {
        Vec::new()
    };
    let mut corrupt_items = Vec::new();
    for (id, reason) in &report.corrupt {
        let mut obj = JsonObject::new();
        obj.field_hash("id", id).field_str("reason", reason);
        corrupt_items.push(obj.finish());
    }
    let mut top = JsonObject::new();
    top.field_hash("root", &report.root)
        .field_str("mode", mode_name(report.mode))
        .field_u64("verified", report.verified as u64)
        .field_bool("complete", report.is_complete())
        .field_bool("unreferenced_checked", report.unreferenced_checked)
        .field_raw("missing", &format::json_string_array(&missing))
        .field_raw("corrupt", &format!("[{}]", corrupt_items.join(",")))
        .field_raw("unreferenced", &format::json_string_array(&unreferenced));
    let mut stdout = std::io::stdout().lock();
    let _ = writeln!(stdout, "{}", top.finish());
}

fn emit_export_json(
    root: &Hash,
    mode: &str,
    packs: &[(String, Hash, u64)],
    objects: usize,
    manifest: &str,
) {
    let mut pack_items = Vec::new();
    for (file, key, bytes) in packs {
        let mut obj = JsonObject::new();
        obj.field_str("file", file)
            .field_hash("blake3", key)
            .field_u64("bytes", *bytes);
        pack_items.push(obj.finish());
    }
    let mut top = JsonObject::new();
    top.field_hash("root", root)
        .field_str("mode", mode)
        .field_raw("packs", &format!("[{}]", pack_items.join(",")))
        .field_u64("objects", objects as u64)
        .field_str("manifest", manifest);
    let mut stdout = std::io::stdout().lock();
    let _ = writeln!(stdout, "{}", top.finish());
}

fn prepare_dir(dir: &Path, force: bool) -> Result<(), (String, u8)> {
    if dir.exists() {
        if dir.is_file() {
            return Err((
                format!("{} exists and is not a directory", dir.display()),
                exit::CANTCREAT,
            ));
        }
        let empty = fs::read_dir(dir)
            .map_err(|e| (format!("read {}: {e}", dir.display()), exit::NOINPUT))?
            .next()
            .is_none();
        if !empty && !force {
            return Err((
                format!("{} is not empty; pass --force to overwrite", dir.display()),
                exit::CANTCREAT,
            ));
        }
    } else {
        fs::create_dir_all(dir)
            .map_err(|e| (format!("create {}: {e}", dir.display()), exit::CANTCREAT))?;
    }
    Ok(())
}

fn object_count(store: &ObjectStore, root: &Hash, mode: ClosureMode) -> Result<usize, String> {
    let set = match mode {
        ClosureMode::Snapshot => reachable_snapshot(store, root),
        ClosureMode::History => reachable_objects(store, root),
    }
    .map_err(|e| format!("count objects: {e}"))?;
    Ok(set.len())
}

fn mode_name(mode: ClosureMode) -> &'static str {
    match mode {
        ClosureMode::Snapshot => "snapshot",
        ClosureMode::History => "history",
    }
}

use super::error as emit_err;

#[cfg(test)]
mod tests {
    use super::*;

    fn parse_args(args: &[String]) -> Result<Cmd, clap::Error> {
        let mut full: Vec<String> = vec!["mkit closure".into()];
        full.extend_from_slice(args);
        Cmd::try_parse_from(full)
    }

    #[test]
    fn parse_export_defaults() {
        let Cmd::Export(p) = parse_args(&["export".into(), "HEAD".into()]).unwrap() else {
            panic!("expected export");
        };
        assert_eq!(p.revision, "HEAD");
        assert!(!p.history);
        assert!(!p.force);
    }

    #[test]
    fn parse_verify_from() {
        let Cmd::Verify(p) = parse_args(&[
            "verify".into(),
            "aa".repeat(32),
            "--from".into(),
            "/tmp/c".into(),
        ])
        .unwrap() else {
            panic!("expected verify");
        };
        assert!(p.from.is_some());
        assert!(!p.history);
        assert!(!p.show_unreferenced);
    }

    #[test]
    fn parse_verify_show_unreferenced() {
        let Cmd::Verify(p) =
            parse_args(&["verify".into(), "HEAD".into(), "--show-unreferenced".into()]).unwrap()
        else {
            panic!("expected verify");
        };
        assert!(p.show_unreferenced);
    }
}