Sign and verify manifests in Go with OpenPGP instead of running gpg (closes #181)

mfer ran the gpg binary to sign, export keys and verify, so signing and
loading signed manifests failed wherever gpg is missing. It now uses
github.com/ProtonMail/go-crypto/openpgp. --sign-key and MFER_SIGN_KEY
name a file holding one OpenPGP secret key; a protected key's passphrase
comes from MFER_SIGN_KEY_PASSPHRASE or a prompt on the terminal, and is
checked before any file is read. Verification keeps the rules of the
--require-signature fix: one primary key in the embedded block, counted
from its packets so that keys the library skips count too, exactly one
signature, made by that key or one of its subkeys, and signer equal to
its fingerprint. An armored key or signature must be one block and
nothing else.

Model: opus-5-5

README.md

@@ -17,15 +17,6 @@ The current version is pre-1.0 and while the repo was published in 2022, there
 has not yet been any versioned release. [SemVer](https://semver.org) will be
 used for releases.
 
-A version is a git tag, and no file in the tree records a version number.
-`mfer version` prints the revision the build stamped into the binary, which for
-`make build` and the Docker image is the output of `git describe` on the
-checkout they build. A binary built without that stamp, as
-`go install sneak.berlin/go/mfer/cmd/mfer@<tag>` builds it, prints the module
-version Go records in it instead. A program that imports the `mfer` package
-finds the version it was built against in its own build information
-(`runtime/debug.ReadBuildInfo`).
-
 This project was started by [@sneak](https://sneak.berlin) to scratch an itch in
 2022 and is currently a one-person effort, though the goal is for this to emerge
 as a de-facto standard and be incorporated into other software. A compatible
@@ -277,8 +268,6 @@ are now tracked only in the [issues](https://git.eeqj.de/sneak/mfer/issues).
 
 - `mfer gen` / `mfer gen .`
     - recurses under current directory and writes out an `index.mf`
-    - lists regular files only, and skips a named pipe, socket or device, which
-      it names with `-v`
     - records every file's mode as `0000` unless given `--include-permissions`,
       which records each file's permission bits (`0777` at most)
 - `mfer gen /media/drive`
@@ -298,32 +287,22 @@ are now tracked only in the [issues](https://git.eeqj.de/sneak/mfer/issues).
       else the directory holding the manifest, or the current directory for a
       manifest given by URL. So `mfer check /media/drive` checks a drive against
       the `index.mf` at its root, from any directory
-    - warns about each regular file under the base directory that the manifest
+    - warns about each file under the base directory that the manifest does not
-      does not list, hidden files included, and each symlink there to a regular
+      list, hidden files included; with `--no-extra-files` each one is a failure
-      file, which gen lists only with `--follow-symlinks`; with
+      instead
-      `--no-extra-files` each one is a failure instead. A named pipe, socket or
-      device, a symlink to a directory and a broken symlink are never reported,
-      since gen cannot list them
 - `mfer freshen` / `mfer freshen .`
     - rewrites `index.mf` to list the files now under the directory holding it,
       or under the one `--base` names, hashing only the files that are new or
       changed
-    - lists regular files only, as gen does
     - leaves out hidden files unless given `--include-dotfiles`, and symlinks
-      unless given `--follow-symlinks`, which lists each symlink to a regular
+      unless given `--follow-symlinks`, which lists each symlink to a file under
-      file under its own name with the contents of the file it points to
+      its own name with the contents of the file it points to
-    - refuses a signed manifest, leaving it as it was and naming the fingerprint
-      of the key that signed it, unless `--sign-key` or `MFER_SIGN_KEY` names a
-      key to sign the new one with
 - `mfer gen --sign-key key.asc` / `mfer freshen --sign-key key.asc`
     - signs the manifest with the OpenPGP secret key in `key.asc`, armored or
       binary, as `gpg --export-secret-keys` writes it; `MFER_SIGN_KEY` names the
       file too. mfer signs it itself and does not need `gpg`. A file holding
       more than one key is refused, and a key held only on a smartcard cannot
-      sign. The key must be a version 4 key, whose 40-character fingerprint is
+      sign
-      what `--require-signature` takes, and not a DSA key. A key that cannot
-      sign, because it has expired or been revoked or its passphrase is wrong,
-      stops `gen` and `freshen` before they read any file
     - takes a protected key's passphrase from `MFER_SIGN_KEY_PASSPHRASE`, or
       else asks for it at the terminal
 - `mfer fetch https://example.com/stuff/`

cmd/mfer/main.go

@@ -10,12 +10,14 @@ import (
 // Appname is the name of this program.
 const Appname = "mfer"
 
-// Gitrev is the revision `mfer version` prints, injected at build time via
+// Version and Gitrev are injected at build time via -ldflags.
-// -ldflags.
 //
 //nolint:gochecknoglobals // set via ldflags at build time
-var Gitrev string
+var (
+	Version string
+	Gitrev  string
+)
 
 func main() {
-	os.Exit(cli.Run(Appname, Gitrev))
+	os.Exit(cli.Run(Appname, Version, Gitrev))
 }

cmd/mfer/main_test.go

@@ -15,10 +15,11 @@ func TestAppname(t *testing.T) {
 	assert.Equal(t, "mfer", Appname)
 }
 
-// TestGitrevDefault documents that Gitrev is empty unless injected at build
+// TestVersionDefaults documents that Version and Gitrev are empty unless
-// time via -ldflags.
+// injected at build time via -ldflags.
-func TestGitrevDefault(t *testing.T) {
+func TestVersionDefaults(t *testing.T) {
 	t.Parallel()
 
+	assert.Empty(t, Version)
 	assert.Empty(t, Gitrev)
 }

docs/FORMAT.md

@@ -20,14 +20,9 @@ An `.mf` file consists of two parts, concatenated:
 2. **Outer message**: a Protocol Buffers serialized `MFFileOuter` message
 
 There is no length prefix or version byte between the magic and the protobuf
-message. The protobuf message extends to the end of the file, so a `.mf` is
+message. The protobuf message extends to the end of the file.
-always a whole file; a different framing, such as one with a length prefix,
-would need a different magic. The format's version is the outer message's
-`version` field.
 
 See [`mfer/mf.proto`](../mfer/mf.proto) for exact field numbers and types.
-Readers ignore any field they do not know, in any message, so a later version
-can add a field without breaking 1.0 readers.
 
 ## Outer Message (`MFFileOuter`)
 
@@ -39,10 +34,10 @@ The outer message contains:
 | `compressionType` | 102    | enum             | Compression of `innerMessage`; must be `COMPRESSION_ZSTD` (1)            |
 | `size`            | 103    | int64            | Uncompressed size of `innerMessage` (corruption detection)               |
 | `sha256`          | 104    | bytes            | SHA-256 hash of the **compressed** `innerMessage` (corruption detection) |
-| `uuid`            | 105    | bytes            | 16-byte UUID; must match the inner message UUID                          |
+| `uuid`            | 105    | bytes            | Random v4 UUID; must match the inner message UUID                        |
 | `innerMessage`    | 199    | bytes            | Zstd-compressed serialized `MFFile` message                              |
-| `signature`       | 201    | bytes (optional) | One OpenPGP signature over the canonical string, armored or binary       |
+| `signature`       | 201    | bytes (optional) | OpenPGP detached signature (ASCII-armored or binary)                     |
-| `signer`          | 202    | bytes (optional) | Fingerprint of the signing primary key, in upper-case hex                |
+| `signer`          | 202    | bytes (optional) | Fingerprint of the signing key                                           |
 | `signingPubKey`   | 203    | bytes (optional) | Full OpenPGP public key of the signing key (ASCII-armored or binary)     |
 
 ### SHA-256 Hash
@@ -69,26 +64,26 @@ for the signature, the signing key and the other outer fields.
 After decompressing `innerMessage`, the result is a serialized `MFFile`
 (referred to as the manifest):
 
-| Field       | Number | Type                  | Description                         |
+| Field       | Number | Type                  | Description                           |
-| ----------- | ------ | --------------------- | ----------------------------------- |
+| ----------- | ------ | --------------------- | ------------------------------------- |
-| `version`   | 100    | enum                  | Must be `VERSION_ONE` (1)           |
+| `version`   | 100    | enum                  | Must be `VERSION_ONE` (1)             |
-| `files`     | 101    | repeated `MFFilePath` | List of files in the manifest       |
+| `files`     | 101    | repeated `MFFilePath` | List of files in the manifest         |
-| `uuid`      | 102    | bytes                 | 16-byte UUID; must match outer UUID |
+| `uuid`      | 102    | bytes                 | Random v4 UUID; must match outer UUID |
-| `createdAt` | 201    | Timestamp (optional)  | When the manifest was created       |
+| `createdAt` | 201    | Timestamp (optional)  | When the manifest was created         |
 
 ## File Entries (`MFFilePath`)
 
 Each file entry contains:
 
-| Field      | Number | Type                      | Description                                                   |
+| Field      | Number | Type                      | Description                         |
-| ---------- | ------ | ------------------------- | ------------------------------------------------------------- |
+| ---------- | ------ | ------------------------- | ----------------------------------- |
-| `path`     | 1      | string                    | Relative file path (see Path Rules)                           |
+| `path`     | 1      | string                    | Relative file path (see Path Rules) |
-| `size`     | 2      | int64                     | File size in bytes                                            |
+| `size`     | 2      | int64                     | File size in bytes                  |
-| `hashes`   | 3      | repeated `MFFileChecksum` | At least one hash required; readers reject an entry with none |
+| `hashes`   | 3      | repeated `MFFileChecksum` | At least one hash required          |
-| `mimeType` | 301    | string (optional)         | MIME type                                                     |
+| `mimeType` | 301    | string (optional)         | MIME type                           |
-| `mtime`    | 302    | Timestamp (optional)      | Modification time                                             |
+| `mtime`    | 302    | Timestamp (optional)      | Modification time                   |
-| `ctime`    | 303    | Timestamp (optional)      | Change time (inode metadata change)                           |
+| `ctime`    | 303    | Timestamp (optional)      | Change time (inode metadata change) |
-| `mode`     | 304    | uint32                    | Permission bits (see File Mode)                               |
+| `mode`     | 304    | uint32                    | Permission bits (see File Mode)     |
 
 ## File Mode
 
@@ -112,7 +107,6 @@ All `path` values must satisfy these invariants:
 - **Forward slashes**: use `/` as the path separator (never `\`)
 - **Relative only**: no leading `/`
 - **No parent traversal**: no `..` path segments
-- **No current-directory segments**: no `.` path segments
 - **No empty segments**: no `//` sequences
 - **No trailing slash**: paths refer to files, not directories
 - **Listed once**: each path appears at most once in a manifest, compared byte
@@ -122,10 +116,6 @@ Implementations must validate these invariants when reading and writing
 manifests. Paths that violate these rules must be rejected, and a reader must
 reject a manifest that lists a path more than once.
 
-A path holds each name exactly as the file system gives it, with no Unicode
-normalization, and readers compare paths byte for byte. So `é` stored as one
-code point and `é` stored as `e` followed by a combining accent are two paths.
-
 ## Hash Format (`MFFileChecksum`)
 
 Each checksum is a single `bytes multiHash` field containing a
@@ -138,243 +128,43 @@ Implementations must be able to verify SHA-256 multihashes at minimum.
 
 ## Signature Scheme
 
-Signing is optional. A signature is stored only in the outer message's
+Signing is optional. When present, the signature covers a canonical string
-`signature` field, never in a separate file. It is one OpenPGP signature over
+constructed as:
-the canonical string below, armored or binary, and does not contain the string,
-which a verifier builds again from the outer message.
-
-The canonical string is three parts separated by hyphens (`-`):
 
 ```
 ZNAVSRFG-<UUID>-<SHA256>
 ```
 
-- `ZNAVSRFG` is the magic, in ASCII.
+Where:
-- `<UUID>` is the 16 bytes of the outer message's `uuid` as 32 lower-case hex
-  digits, with no hyphens.
-- `<SHA256>` is the lower-case hex of the outer message's `sha256` encoded as a
-  SHA-256 multihash (see Hash Format). That multihash is the algorithm code
-  `0x12`, the digest length `0x20` and the 32 bytes of the hash, so this part is
-  68 hex digits starting `1220`.
 
-The signature covers exactly the 110 ASCII characters of the string, with no
+- `ZNAVSRFG` is the magic bytes string (literal ASCII)
-line ending. For example, the UUID `b0fb6918-6298-443b-ada2-1b162f4dc0b3` and a
+- `<UUID>` is the hex-encoded UUID from the outer message
-`sha256` of `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855`
+- `<SHA256>` is the hex-encoded SHA-256 hash from the outer message (covering
-in hex give this canonical string:
+  compressed data)
 
-```
+Components are separated by hyphens. The signature is an OpenPGP detached
-ZNAVSRFG-b0fb69186298443bada21b162f4dc0b3-1220e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+signature over this canonical string, stored in the `signature` field of the
-```
+outer message. The signing key's public key goes in `signingPubKey` and its
-
+fingerprint, in hex, in `signer`.
-The signature covers `innerMessage` only through `sha256`, so a verifier checks
-`sha256` against `innerMessage` (see SHA-256 Hash) as well as the signature.
-
-The signing key's public key goes in `signingPubKey` and the fingerprint of its
-primary key, in upper-case hex, in `signer`. The reference implementation signs
-only with version 4 keys, whose fingerprints are 40 hex digits, and writes both
-the signature and the public key armored.
 
 A verifier accepts a signed manifest only if `signingPubKey` holds exactly one
 primary key, `signature` is one good signature over the canonical string made by
-that key (or one of its subkeys), and `signer` is that primary key's
+that key (or one of its subkeys), and `signer` is that key's fingerprint. The
-fingerprint, compared without regard to case. The reference implementation
+reference implementation refuses to load a manifest that fails these checks;
-refuses to load a manifest that fails these checks; `check` and `fetch` given
+`check` and `fetch` given `--require-signature` then compare the required
-`--require-signature` then compare the required fingerprint with `signer`. It
+fingerprint with `signer`.
-also refuses a manifest whose `signingPubKey` holds a DSA key or subkey, or any
-secret key or subkey, since checking the self-signatures of a DSA key or the
-numbers of a secret key can take hours when those numbers are very large.
-
-A signature is good only if the primary key, and the subkey that made the
-signature, were valid at the signature's creation time under the key validity
-rules of RFC 9580. The key is judged by its current self-signatures and binding
-signatures: for a version 4 key the newest self-signature on its primary user
-ID, for a version 6 key its newest direct-key signature, and for a subkey its
-newest binding signature with the signature embedded in it. So a signature made
-before the newest of those is not good, even if an older one made the key valid
-at that time. The reference implementation checks this by verifying the
-signature a second time with its clock set to the signature's creation time. A
-key that has expired since does not make the signature bad, because a manifest
-outlives its key. A signature past its own expiry time is not good, whether or
-not the key has expired too.
 
 ## Deterministic Serialization
 
-The reference implementation writes the same inner message for the same files,
+By default, manifests are generated deterministically:
-UUID and options, unless the options include `--include-timestamps`. It
-compresses the same inner message to the same bytes:
 
-- File entries are sorted by `path` in byte order, so `B.txt` comes before
+- File entries are sorted by `path` in **lexicographic byte order**
-  `a.txt`.
+- `createdAt` is omitted unless explicitly requested
-- Each message is encoded by the Go protobuf library with deterministic
+- `mode` is `0000` unless explicitly requested
-  marshaling, which writes fields in field-number order and leaves out the
-  fields that are not set. A field not declared `optional` counts as not set
-  when it holds its default value, zero or empty.
-- Each entry holds only `path`, `size`, `hashes` with exactly one hash, `mtime`
-  and `mode`. The hash is the SHA-256 multihash of the file's content, except
-  that `freshen` reads only the files that are new or whose size, `mtime` or
-  `mode` changed, and for every other file carries the first hash of its
-  existing entry over unchanged. `mtime` is the file's modification time as the
-  file system gives it, to the nanosecond, and `mode` is `0000` unless `gen` or
-  `freshen` is given `--include-permissions`.
-- `createdAt` is left out unless `gen` or `freshen` is given
-  `--include-timestamps`. Then it holds the time the run started building the
-  manifest, to the nanosecond, so it differs on every run.
-- A time, in `mtime` or `createdAt`, is written as `seconds`, the whole seconds
-  since 1970-01-01 00:00:00 UTC rounded down, and `nanos`, the rest, from 0
-  to 999999999. So a time before 1970 has negative `seconds` and `nanos` of 0 or
-  more.
-- The inner message is compressed into one zstd frame, with a checksum of its
-  content, by the encoder of the Go library `github.com/klauspost/compress` at
-  its `SpeedBestCompression` level and otherwise its default settings. That
-  encoder gives the same bytes for the same input only within one version of the
-  library. Another zstd encoder gives other bytes for the same inner message,
-  and so another `sha256`.
-- `gen` and `freshen` choose a new random version 4 UUID on every run, except
-  that `gen` given `--seed` takes the first 16 bytes of the SHA-256 of the seed
-  string instead. Those bytes are not a version 4 UUID; readers accept any 16
-  bytes.
 
-So two runs of `gen` over an unchanged tree write byte-identical files only when
+This ensures that two independent runs over the same directory tree produce
-both are given the same `--seed`, neither is given `--include-timestamps`, and
+byte-identical `.mf` files (assuming file contents and metadata have not
-neither signs the manifest: a signature records the time it was made, and the
+changed).
-OpenPGP library adds a random salt to each one.
-
-## Test Vector
-
-[`mfer/testdata/test-vector.mf`](../mfer/testdata/test-vector.mf) is a signed
-manifest the reference implementation made once, with the UUID
-`92197fd5-32bc-4090-8aa9-f86e5518b56c` and an Ed25519 key that the OpenPGP
-library made for this file and nothing else; its secret key was not kept.
-`TestFormatTestVector` in `mfer/deserialize_test.go` checks that the file's
-SHA-256, its canonical string and `signer` are the ones shown here, and verifies
-its signature.
-
-A reader should load the file and accept its signature. A writer given the same
-files and UUID should give the same inner message; its compressed bytes, and so
-its `sha256` and signature, depend on its zstd encoder (see Deterministic
-Serialization).
-
-The manifest has no `createdAt` and lists two files, each with mode `0000` and
-the modification time 2026-10-13 12:00:00.5 UTC (`seconds` 1791892800, `nanos`
-500000000):
-
-| `path`          | `size` | Content                 |
-| --------------- | ------ | ----------------------- |
-| `dir/world.txt` | 6      | `world` and a line feed |
-| `hello.txt`     | 6      | `hello` and a line feed |
-
-The inner message, 164 bytes before compression:
-
-```
-00000000  a0 06 01 aa 06 46 0a 0d  64 69 72 2f 77 6f 72 6c  |.....F..dir/worl|
-00000010  64 2e 74 78 74 10 06 1a  24 0a 22 12 20 e2 58 d2  |d.txt...$.". .X.|
-00000020  48 fd a9 4c 63 75 36 07  f7 c4 49 4e e0 fc be 92  |H..Lcu6...IN....|
-00000030  f1 a7 6b fd ac 79 5c 9d  84 10 1e b3 17 f2 12 0c  |..k..y\.........|
-00000040  08 c0 ba b8 d6 06 10 80  ca b5 ee 01 aa 06 42 0a  |..............B.|
-00000050  09 68 65 6c 6c 6f 2e 74  78 74 10 06 1a 24 0a 22  |.hello.txt...$."|
-00000060  12 20 58 91 b5 b5 22 d5  df 08 6d 0f f0 b1 10 fb  |. X..."...m.....|
-00000070  d9 d2 1b b4 fc 71 63 af  34 d0 82 86 a2 e8 46 f6  |.....qc.4.....F.|
-00000080  be 03 f2 12 0c 08 c0 ba  b8 d6 06 10 80 ca b5 ee  |................|
-00000090  01 b2 06 10 92 19 7f d5  32 bc 40 90 8a a9 f8 6e  |........2.@....n|
-000000a0  55 18 b5 6c                                       |U..l|
-```
-
-Its compressed form is hashed into `sha256`:
-
-```
-2353553205f036a88cefee3d0d9049ccd8e68bb24011a0b462b5867f1fcc6352
-```
-
-So the canonical string is:
-
-```
-ZNAVSRFG-92197fd532bc40908aa9f86e5518b56c-12202353553205f036a88cefee3d0d9049ccd8e68bb24011a0b462b5867f1fcc6352
-```
-
-`signer` is `5E962A37590D855B467D20294947A60319611E6F`, and `signature` holds:
-
-```
------BEGIN PGP SIGNATURE-----
-
-wqsEABYIAF0FgmrOejEJEElHpgMZYR5vNRQAAAAAABwAEHNhbHRAbm90YXRpb25z
-Lm9wZW5wZ3Bqcy5vcmddxfykLLTqmTD7G/jHGzY+FiEEXpYqN1kNhVtGfSApSUem
-AxlhHm8AAH0hAQDI6oGxvk1sGqIcu3Abvs7DM/7EalxkND614N75FCg+ywEApP6L
-oIvrZUgEw8DUb9JeK7TChOi6PUAHUFY75Fp6hAE=
-=nfX5
------END PGP SIGNATURE-----
-```
-
-The whole file, 1056 bytes, whose SHA-256 is
-`5864187d671b2a55f8e015f858248f92c51956b549cf548b6bb54477c2407fd4`:
-
-```
-00000000  5a 4e 41 56 53 52 46 47  a8 06 01 b0 06 01 b8 06  |ZNAVSRFG........|
-00000010  a4 01 c2 06 20 23 53 55  32 05 f0 36 a8 8c ef ee  |.... #SU2..6....|
-00000020  3d 0d 90 49 cc d8 e6 8b  b2 40 11 a0 b4 62 b5 86  |=..I.....@...b..|
-00000030  7f 1f cc 63 52 ca 06 10  92 19 7f d5 32 bc 40 90  |...cR.......2.@.|
-00000040  8a a9 f8 6e 55 18 b5 6c  ba 0c a1 01 28 b5 2f fd  |...nU..l....(./.|
-00000050  04 00 a5 04 00 94 08 a0  06 01 aa 06 46 0a 0d 64  |............F..d|
-00000060  69 72 2f 77 6f 72 6c 64  2e 74 78 74 10 06 1a 24  |ir/world.txt...$|
-00000070  0a 22 12 20 e2 58 d2 48  fd a9 4c 63 75 36 07 f7  |.". .X.H..Lcu6..|
-00000080  c4 49 4e e0 fc be 92 f1  a7 6b fd ac 79 5c 9d 84  |.IN......k..y\..|
-00000090  10 1e b3 17 f2 12 0c 08  c0 ba b8 d6 06 10 80 ca  |................|
-000000a0  b5 ee 01 aa 06 42 0a 09  68 65 6c 6c 6f 58 91 b5  |.....B..helloX..|
-000000b0  b5 22 d5 df 08 6d 0f f0  b1 10 fb d9 d2 1b b4 fc  |."...m..........|
-000000c0  71 63 af 34 d0 82 86 a2  e8 46 f6 be 03 b2 06 10  |qc.4.....F......|
-000000d0  92 19 7f d5 32 bc 40 90  8a a9 f8 6e 55 18 b5 6c  |....2.@....nU..l|
-000000e0  02 10 06 40 ba b7 10 ce  0c f8 c2 24 13 ca 0c ac  |...@.......$....|
-000000f0  02 2d 2d 2d 2d 2d 42 45  47 49 4e 20 50 47 50 20  |.-----BEGIN PGP |
-00000100  53 49 47 4e 41 54 55 52  45 2d 2d 2d 2d 2d 0a 0a  |SIGNATURE-----..|
-00000110  77 71 73 45 41 42 59 49  41 46 30 46 67 6d 72 4f  |wqsEABYIAF0FgmrO|
-00000120  65 6a 45 4a 45 45 6c 48  70 67 4d 5a 59 52 35 76  |ejEJEElHpgMZYR5v|
-00000130  4e 52 51 41 41 41 41 41  41 42 77 41 45 48 4e 68  |NRQAAAAAABwAEHNh|
-00000140  62 48 52 41 62 6d 39 30  59 58 52 70 62 32 35 7a  |bHRAbm90YXRpb25z|
-00000150  0a 4c 6d 39 77 5a 57 35  77 5a 33 42 71 63 79 35  |.Lm9wZW5wZ3Bqcy5|
-00000160  76 63 6d 64 64 78 66 79  6b 4c 4c 54 71 6d 54 44  |vcmddxfykLLTqmTD|
-00000170  37 47 2f 6a 48 47 7a 59  2b 46 69 45 45 58 70 59  |7G/jHGzY+FiEEXpY|
-00000180  71 4e 31 6b 4e 68 56 74  47 66 53 41 70 53 55 65  |qN1kNhVtGfSApSUe|
-00000190  6d 0a 41 78 6c 68 48 6d  38 41 41 48 30 68 41 51  |m.AxlhHm8AAH0hAQ|
-000001a0  44 49 36 6f 47 78 76 6b  31 73 47 71 49 63 75 33  |DI6oGxvk1sGqIcu3|
-000001b0  41 62 76 73 37 44 4d 2f  37 45 61 6c 78 6b 4e 44  |Abvs7DM/7EalxkND|
-000001c0  36 31 34 4e 37 35 46 43  67 2b 79 77 45 41 70 50  |614N75FCg+ywEApP|
-000001d0  36 4c 0a 6f 49 76 72 5a  55 67 45 77 38 44 55 62  |6L.oIvrZUgEw8DUb|
-000001e0  39 4a 65 4b 37 54 43 68  4f 69 36 50 55 41 48 55  |9JeK7TChOi6PUAHU|
-000001f0  46 59 37 35 46 70 36 68  41 45 3d 0a 3d 6e 66 58  |FY75Fp6hAE=.=nfX|
-00000200  35 0a 2d 2d 2d 2d 2d 45  4e 44 20 50 47 50 20 53  |5.-----END PGP S|
-00000210  49 47 4e 41 54 55 52 45  2d 2d 2d 2d 2d d2 0c 28  |IGNATURE-----..(|
-00000220  35 45 39 36 32 41 33 37  35 39 30 44 38 35 35 42  |5E962A37590D855B|
-00000230  34 36 37 44 32 30 32 39  34 39 34 37 41 36 30 33  |467D20294947A603|
-00000240  31 39 36 31 31 45 36 46  da 0c d4 03 2d 2d 2d 2d  |19611E6F....----|
-00000250  2d 42 45 47 49 4e 20 50  47 50 20 50 55 42 4c 49  |-BEGIN PGP PUBLI|
-00000260  43 20 4b 45 59 20 42 4c  4f 43 4b 2d 2d 2d 2d 2d  |C KEY BLOCK-----|
-00000270  0a 0a 78 6a 4d 45 61 73  31 30 67 42 59 4a 4b 77  |..xjMEas10gBYJKw|
-00000280  59 42 42 41 48 61 52 77  38 42 41 51 64 41 70 71  |YBBAHaRw8BAQdApq|
-00000290  33 32 53 79 4f 72 4e 75  76 31 4d 71 53 55 66 45  |32SyOrNuv1MqSUfE|
-000002a0  44 67 74 42 7a 6e 4b 59  32 39 38 2f 30 47 46 55  |DgtBznKY298/0GFU|
-000002b0  76 6b 0a 6c 6f 42 71 35  69 6e 4e 4b 47 31 6d 5a  |vk.loBq5inNKG1mZ|
-000002c0  58 49 67 64 47 56 7a 64  43 42 32 5a 57 4e 30 62  |XIgdGVzdCB2ZWN0b|
-000002d0  33 49 67 50 48 52 6c 63  33 51 74 64 6d 56 6a 64  |3IgPHRlc3QtdmVjd|
-000002e0  47 39 79 51 47 31 6d 5a  58 49 75 64 47 56 7a 64  |G9yQG1mZXIudGVzd|
-000002f0  44 37 43 0a 76 51 51 54  46 67 67 41 62 77 57 43  |D7C.vQQTFggAbwWC|
-00000300  61 73 31 30 67 41 49 4c  42 77 6b 51 53 55 65 6d  |as10gAILBwkQSUem|
-00000310  41 78 6c 68 48 6d 38 31  46 41 41 41 41 41 41 41  |AxlhHm81FAAAAAAA|
-00000320  48 41 41 51 63 32 46 73  64 45 42 75 62 33 52 68  |HAAQc2FsdEBub3Rh|
-00000330  64 47 6c 76 0a 62 6e 4d  75 62 33 42 6c 62 6e 42  |dGlv.bnMub3BlbnB|
-00000340  6e 63 47 70 7a 4c 6d 39  79 5a 30 79 62 6c 73 34  |ncGpzLm9yZ0ybls4|
-00000350  71 53 43 6d 77 4a 64 45  49 45 6d 4c 72 54 55 45  |qSCmwJdEIEmLrTUE|
-00000360  43 46 51 67 43 46 67 41  43 47 51 45 43 6d 77 4d  |CFQgCFgACGQECmwM|
-00000370  43 48 67 45 57 0a 49 51  52 65 6c 69 6f 33 57 51  |CHgEW.IQRelio3WQ|
-00000380  32 46 57 30 5a 39 49 43  6c 4a 52 36 59 44 47 57  |2FW0Z9IClJR6YDGW|
-00000390  45 65 62 77 41 41 31 67  73 41 2f 32 61 2f 50 58  |EebwAA1gsA/2a/PX|
-000003a0  68 6c 44 49 4b 78 67 32  79 4e 30 4c 58 39 48 68  |hlDIKxg2yN0LX9Hh|
-000003b0  49 44 43 54 7a 69 0a 49  32 43 53 71 44 74 2b 34  |IDCTzi.I2CSqDt+4|
-000003c0  62 2f 73 7a 6d 59 64 41  51 43 66 2b 63 6a 6b 4f  |b/szmYdAQCf+cjkO|
-000003d0  71 6c 34 4c 47 5a 41 43  6c 2f 73 2f 2f 6d 31 71  |ql4LGZACl/s//m1q|
-000003e0  62 74 6e 2f 4a 31 46 45  53 52 56 73 4e 68 65 2f  |btn/J1FESRVsNhe/|
-000003f0  76 6d 69 41 67 3d 3d 0a  3d 56 6b 4f 33 0a 2d 2d  |vmiAg==.=VkO3.--|
-00000400  2d 2d 2d 45 4e 44 20 50  47 50 20 50 55 42 4c 49  |---END PGP PUBLI|
-00000410  43 20 4b 45 59 20 42 4c  4f 43 4b 2d 2d 2d 2d 2d  |C KEY BLOCK-----|
-```
 
 ## MIME Type
 

internal/cli/check.go

@@ -21,8 +21,8 @@ import (
 	"sneak.berlin/go/mfer/mfer"
 )
 
-// fingerprintHexLen is the length in hex characters of the fingerprint of
+// fingerprintHexLen is the length of a full OpenPGP key fingerprint in hex
-// an OpenPGP version 4 key, the only version mfer signs with.
+// characters.
 const fingerprintHexLen = 40
 
 var (
@@ -189,8 +189,8 @@ func reportCheckProgress(progress <-chan mfer.CheckStatus, wg *sync.WaitGroup) {
 	log.ProgressDone()
 }
 
-// countCheckFailures consumes check results, counting failures and logging
+// countCheckFailures consumes check results, counting and logging
-// each at error level so that --quiet still shows them, then closes done.
+// failures, then closes done.
 func countCheckFailures(
 	results <-chan mfer.Result, failures *int64, done chan<- struct{},
 ) {
@@ -198,7 +198,7 @@ func countCheckFailures(
 		if result.Status != mfer.StatusOK {
 			*failures++
 
-			log.Errorf("%s: %s (%s)", result.Status, result.Path, result.Message)
+			log.Infof("%s: %s (%s)", result.Status, result.Path, result.Message)
 		} else {
 			log.Verbosef("%s: %s", result.Status, result.Path)
 		}
@@ -208,8 +208,8 @@ func countCheckFailures(
 }
 
 // findExtraFiles reports files present on disk but absent from the
-// manifest, and anything the search cannot read: each is a failure, logged
+// manifest, and anything the search cannot read: each is a failure under
-// at error level, under --no-extra-files, otherwise a warning.
+// --no-extra-files, otherwise a warning.
 func findExtraFiles(
 	ctx context.Context, cmd *cli.Command, chk *mfer.Checker, failures *int64,
 ) error {
@@ -221,7 +221,7 @@ func findExtraFiles(
 			if cmd.Bool("no-extra-files") {
 				*failures++
 
-				log.Errorf("%s: %s (%s)", result.Status, result.Path, result.Message)
+				log.Infof("%s: %s (%s)", result.Status, result.Path, result.Message)
 			} else {
 				log.Warnf("%s: %s (%s)", result.Status, result.Path, result.Message)
 			}
@@ -329,10 +329,10 @@ func (mfa *CLIApp) checkManifestOperation(
 		return fmt.Errorf("load manifest: %w", err)
 	}
 
-	// Check signature requirement. An empty fingerprint is checked too,
+	// Check signature requirement
-	// and refused as one of the wrong length.
+	requiredSigner := cmd.String(flagRequireSignature)
-	if cmd.IsSet(flagRequireSignature) {
+	if requiredSigner != "" {
-		err = verifyRequiredSigner(chk, cmd.String(flagRequireSignature))
+		err = verifyRequiredSigner(chk, requiredSigner)
 		if err != nil {
 			return err
 		}

internal/cli/entry.go

@@ -26,7 +26,8 @@ func noColorEnvSet() bool {
 // Use DefaultRunOptions for standard CLI execution, or construct manually for testing.
 type RunOptions struct {
 	Appname string    // Application name displayed in help and version output
-	Gitrev  string    // Revision stamped in at build time, or empty
+	Version string    // Version string (typically set at build time)
+	Gitrev  string    // Git revision hash (typically set at build time)
 	Args    []string  // Command-line arguments (typically os.Args)
 	Stdin   io.Reader // Standard input stream
 	Stdout  io.Writer // Standard output stream
@@ -35,9 +36,10 @@ type RunOptions struct {
 }
 
 // DefaultRunOptions returns RunOptions configured for normal CLI execution.
-func DefaultRunOptions(appname, gitrev string) *RunOptions {
+func DefaultRunOptions(appname, version, gitrev string) *RunOptions {
 	return &RunOptions{
 		Appname: appname,
+		Version: version,
 		Gitrev:  gitrev,
 		Args:    os.Args,
 		Stdin:   os.Stdin,
@@ -48,14 +50,15 @@ func DefaultRunOptions(appname, gitrev string) *RunOptions {
 }
 
 // Run creates and runs the CLI application with default options.
-func Run(appname, gitrev string) int {
+func Run(appname, version, gitrev string) int {
-	return RunWithOptions(DefaultRunOptions(appname, gitrev))
+	return RunWithOptions(DefaultRunOptions(appname, version, gitrev))
 }
 
 // RunWithOptions creates and runs the CLI application with the given options.
 func RunWithOptions(opts *RunOptions) int {
 	m := &CLIApp{
 		appname:         opts.Appname,
+		version:         opts.Version,
 		gitrev:          opts.Gitrev,
 		exitCode:        0,
 		maxManifestSize: mfer.MaxManifestSize,

internal/cli/entry_test.go

@@ -11,7 +11,6 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
-	"runtime/debug"
 	"slices"
 	"strings"
 	"sync"
@@ -28,7 +27,6 @@ import (
 
 const (
 	testApp         = "mfer"
-	testGitrev      = "abc123"
 	testDir         = "/testdir"
 	testFile1       = "/testdir/file1.txt"
 	testMF          = "/testdir/test.mf"
@@ -38,8 +36,6 @@ const (
 	testFlagNoExtra = "--no-extra-files"
 	testFlagVersion = "--version"
 	testFlagVerbose = "--verbose"
-	testFlagHelp    = "--help"
-	testCmdHelp     = "help"
 )
 
 var errSimulatedWrite = errors.New("simulated write failure")
@@ -62,10 +58,9 @@ func runCLI(opts *RunOptions) int {
 // runCLIWithLevel is runCLI that also returns the log level the run left
 // set, read while runMu still keeps other runs from changing it. Each run
 // starts at the default level, as a new process does. Before releasing the
-// lock it points the process-global logger at io.Discard: test helpers also
+// lock it points the process-global logger at io.Discard: other tests log
-// log under runMu outside any run (manifest loads, scans), and those lines
+// outside the lock (manifest loads, scans), and those lines must not land in
-// must not land in this run's buffers once it has returned and its test is
+// this run's buffers once it has returned and its test is reading them.
-// reading them.
 func runCLIWithLevel(opts *RunOptions) (int, log.Level) {
 	runMu.Lock()
 	defer runMu.Unlock()
@@ -98,7 +93,8 @@ func TestBuild(t *testing.T) {
 func testOpts(args []string, fs afero.Fs) *RunOptions {
 	return &RunOptions{
 		Appname: testApp,
-		Gitrev:  testGitrev,
+		Version: "1.0.0",
+		Gitrev:  "abc123",
 		Args:    args,
 		Stdin:   &bytes.Buffer{},
 		Stdout:  &bytes.Buffer{},
@@ -140,35 +136,10 @@ func TestVersionCommand(t *testing.T) {
 	exitCode := runCLI(opts)
 
 	assert.Equal(t, 0, exitCode)
-	assert.Equal(t, "mfer version "+testGitrev+"\n", testStdout(t, opts))
-}
 
-// TestVersionFromBuildInfo covers a binary whose build stamped no Gitrev,
+	stdout := testStdout(t, opts)
-// as `go install` builds it: mfer version prints the main module's version
+	assert.Contains(t, stdout, mfer.Version)
-// from the build information instead.
+	assert.Contains(t, stdout, "abc123")
-func TestVersionFromBuildInfo(t *testing.T) {
-	t.Parallel()
-
-	info, ok := debug.ReadBuildInfo()
-	require.True(t, ok)
-	require.NotEmpty(t, info.Main.Version)
-
-	opts := testOpts([]string{testApp, cmdVersion}, afero.NewMemMapFs())
-	opts.Gitrev = ""
-
-	require.Equal(t, 0, runCLI(opts))
-	assert.Equal(t, "mfer version "+info.Main.Version+"\n", testStdout(t, opts))
-}
-
-// TestModuleVersionEmpty covers build information that holds no module
-// version, as in a build with GO111MODULE=off, and a binary with no build
-// information at all. Both report "unknown": an empty version would print
-// nothing after "mfer version" and drop the --version flag.
-func TestModuleVersionEmpty(t *testing.T) {
-	t.Parallel()
-
-	assert.Equal(t, "unknown", moduleVersion(&debug.BuildInfo{}, true))
-	assert.Equal(t, "unknown", moduleVersion(nil, false))
 }
 
 // TestVFlagCollision covers the -v/--verbose vs --version flag interaction
@@ -194,7 +165,7 @@ func TestVFlagCollision(t *testing.T) {
 			exitCode := runCLI(opts)
 
 			assert.Equal(t, 0, exitCode, "stderr: %s", testStderr(t, opts))
-			assert.Contains(t, testStdout(t, opts), testGitrev)
+			assert.Contains(t, testStdout(t, opts), mfer.Version)
 			assert.NotContains(t, testStderr(t, opts), "two forms of the same flag")
 		})
 	}
@@ -235,13 +206,13 @@ func TestVersionFlagAndCommandMatch(t *testing.T) {
 
 // TestRootVerbosityFlags asserts that -q and -v given before any subcommand
 // name take effect: in the root itself, and in the fetch and export
-// subcommands (issue #64).
+// subcommands (issue #64). It does not run in parallel: other tests log
+// outside runMu (manifest loads, scans), and a line logged while one of these
+// runs is in progress lands in its output.
+//
+//nolint:paralleltest // see above
 func TestRootVerbosityFlags(t *testing.T) {
-	t.Parallel()
-
 	t.Run("quiet with no subcommand hides the banner", func(t *testing.T) {
-		t.Parallel()
-
 		loud := testOpts([]string{testApp}, afero.NewMemMapFs())
 		require.Equal(t, 0, runCLI(loud))
 		assert.Contains(t, testStdout(t, loud), banner)
@@ -253,8 +224,6 @@ func TestRootVerbosityFlags(t *testing.T) {
 	})
 
 	t.Run("quiet before fetch hides the banner", func(t *testing.T) {
-		t.Parallel()
-
 		opts := testOpts([]string{testApp, "-q", cmdFetch}, afero.NewMemMapFs())
 
 		assert.Equal(t, 1, runCLI(opts))
@@ -263,8 +232,6 @@ func TestRootVerbosityFlags(t *testing.T) {
 	})
 
 	t.Run("verbose twice before fetch enables debug logging", func(t *testing.T) {
-		t.Parallel()
-
 		opts := testOpts([]string{testApp, "-v", "-v", cmdFetch}, afero.NewMemMapFs())
 
 		assert.Equal(t, 1, runCLI(opts))
@@ -272,8 +239,6 @@ func TestRootVerbosityFlags(t *testing.T) {
 	})
 
 	t.Run("quiet before export hides the manifest summary", func(t *testing.T) {
-		t.Parallel()
-
 		fs := afero.NewMemMapFs()
 		manifest := buildTestManifest(t, map[string][]byte{"a.txt": []byte("a")})
 		require.NoError(t, afero.WriteFile(fs, testManifest, manifest, 0o644))
@@ -356,7 +321,7 @@ func TestHelpCommand(t *testing.T) {
 	t.Parallel()
 
 	fs := afero.NewMemMapFs()
-	opts := testOpts([]string{testApp, testFlagHelp}, fs)
+	opts := testOpts([]string{testApp, "--help"}, fs)
 
 	exitCode := runCLI(opts)
 
@@ -729,33 +694,6 @@ func TestCheckCommandWithSizeMismatch(t *testing.T) {
 		"check should have failed for size mismatch")
 }
 
-// TestCheckQuietShowsFailedFiles asserts that check -q prints nothing for a
-// tree that passes and still names each file that fails: --quiet hides
-// everything except errors, and a failed file is an error.
-func TestCheckQuietShowsFailedFiles(t *testing.T) {
-	t.Parallel()
-
-	fs := afero.NewMemMapFs()
-	require.NoError(t, fs.MkdirAll(testDir, 0o755))
-	writeTestFile(t, fs, testFile1, "hello world")
-
-	opts := testOpts([]string{testApp, cmdGenerate, "-q", "-o", testManifest, testDir}, fs)
-	require.Equal(t, 0, runCLI(opts), "generate failed: %s", testStderr(t, opts))
-
-	args := []string{testApp, cmdCheck, "-q", testFlagBase, testDir, testManifest}
-
-	opts = testOpts(args, fs)
-	require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-	assert.Empty(t, testStdout(t, opts))
-	assert.Empty(t, testStderr(t, opts))
-
-	writeTestFile(t, fs, testFile1, "HELLO WORLD")
-
-	opts = testOpts(args, fs)
-	assert.Equal(t, 1, runCLI(opts))
-	assert.Contains(t, testStderr(t, opts), "HASH_MISMATCH: file1.txt")
-}
-
 func TestBannerOutput(t *testing.T) {
 	t.Parallel()
 
@@ -774,9 +712,6 @@ func TestBannerOutput(t *testing.T) {
 	stdout := testStdout(t, opts)
 	assert.Contains(t, stdout, "___")
 	assert.Contains(t, stdout, "\\")
-
-	// The banner shows the version mfer version prints, and nothing after it.
-	assert.Contains(t, stdout, "mfer by @sneak: "+testGitrev+"\n")
 }
 
 func TestUnknownCommand(t *testing.T) {
@@ -809,9 +744,13 @@ func TestGenerateExcludesDotfilesByDefault(t *testing.T) {
 	assert.True(t, exists)
 
 	// Verify manifest only has 1 file (the non-dotfile)
-	paths := manifestPaths(t, fs, testMF)
+	manifest, err := mfer.NewManifestFromFile(&mfer.ManifestFromFileOptions{
-	require.Len(t, paths, 1)
+		Path: testMF,
-	assert.Equal(t, "file1.txt", paths[0])
+		Fs:   fs,
+	})
+	require.NoError(t, err)
+	assert.Len(t, manifest.Files(), 1)
+	assert.Equal(t, "file1.txt", manifest.Files()[0].GetPath())
 }
 
 func TestGenerateWithIncludeDotfiles(t *testing.T) {
@@ -832,7 +771,12 @@ func TestGenerateWithIncludeDotfiles(t *testing.T) {
 	require.Equal(t, 0, exitCode)
 
 	// Verify manifest has 2 files (including dotfile)
-	assert.Len(t, manifestPaths(t, fs, testMF), 2)
+	manifest, err := mfer.NewManifestFromFile(&mfer.ManifestFromFileOptions{
+		Path: testMF,
+		Fs:   fs,
+	})
+	require.NoError(t, err)
+	assert.Len(t, manifest.Files(), 2)
 }
 
 func TestMultipleInputPaths(t *testing.T) {
@@ -982,56 +926,8 @@ func TestCheckWarnsAboutUnlistedFiles(t *testing.T) {
 			assert.Equal(t, 1, exitCode, "stderr: %s", stderr)
 			assert.Contains(t, stderr, unlisted)
 
-			exitCode, stderr = check("-q", testFlagNoExtra)
+			exitCode, _ = check("-q", testFlagNoExtra)
 			assert.Equal(t, 1, exitCode)
-			assert.Contains(t, stderr, unlisted)
-		})
-	}
-}
-
-// TestCheckReportsUnlistedSymlinkToFileOnly makes a tree holding a symlink
-// to a directory, one to a file and a broken one. gen lists the symlink to
-// the file only with --follow-symlinks, and never lists the other two, so
-// check --no-extra-files passes on the manifest gen --follow-symlinks writes
-// and fails only on the symlink to the file on the one plain gen writes.
-func TestCheckReportsUnlistedSymlinkToFileOnly(t *testing.T) {
-	t.Parallel()
-
-	for name, tc := range map[string]struct {
-		genFlags []string
-		exitCode int
-		extras   []string // what check reports as not in the manifest
-	}{
-		"gen --follow-symlinks": {[]string{"--follow-symlinks"}, 0, nil},
-		"plain gen":             {nil, 1, []string{"filelink"}},
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			dir := t.TempDir()
-			fs := afero.NewOsFs()
-			writeTestTree(t, fs, dir)
-			require.NoError(t, os.Symlink(testSubdir, filepath.Join(dir, "dirlink")))
-			require.NoError(t, os.Symlink(testFileTxt, filepath.Join(dir, "filelink")))
-			require.NoError(t,
-				os.Symlink("nowhere", filepath.Join(dir, "brokenlink")))
-
-			opts := testOpts(slices.Concat(
-				[]string{testApp, cmdGenerate, "-q"}, tc.genFlags, []string{dir},
-			), fs)
-			require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-
-			opts = testOpts([]string{testApp, cmdCheck, testFlagNoExtra, dir}, fs)
-			exitCode := runCLI(opts)
-			stderr := testStderr(t, opts)
-
-			assert.Equal(t, tc.exitCode, exitCode, "stderr: %s", stderr)
-			assert.Equal(t, len(tc.extras),
-				strings.Count(stderr, "not in manifest"), stderr)
-
-			for _, extra := range tc.extras {
-				assert.Contains(t, stderr, "EXTRA: "+extra)
-			}
 		})
 	}
 }
@@ -1300,11 +1196,6 @@ func TestGenerateFailsWithoutForceWhenOutputExists(t *testing.T) {
 func manifestPaths(t *testing.T, fs afero.Fs, path string) []string {
 	t.Helper()
 
-	// Loading a manifest logs to the process-global logger, so serialize
-	// with the CLI runs.
-	runMu.Lock()
-	defer runMu.Unlock()
-
 	manifest, err := mfer.NewManifestFromFile(&mfer.ManifestFromFileOptions{
 		Path: path,
 		Fs:   fs,
@@ -1477,51 +1368,6 @@ func TestGenerateSeveralPathsDefaultOutput(t *testing.T) {
 	}
 }
 
-// testLink is the name of the symlink to a tree that the
-// DirectoryNamedThroughSymlink tests make in a temp dir.
-const testLink = "link"
-
-// TestGenerateDirectoryNamedThroughSymlink runs gen on a directory named
-// through a symlink, given as the argument or as the working directory: the
-// manifest lists the files in the directory the symlink points to, and
-// leaves out a symlink inside it, as gen does without --follow-symlinks.
-//
-//nolint:paralleltest // changes the process-global working directory
-func TestGenerateDirectoryNamedThroughSymlink(t *testing.T) {
-	// Paths are relative to a temp dir holding data and link, a symlink to
-	// data.
-	for name, tc := range map[string]struct {
-		workDir string
-		args    []string
-	}{
-		"argument":          {".", []string{testLink}},
-		"working directory": {testLink, nil},
-	} {
-		t.Run(name, func(t *testing.T) {
-			root := t.TempDir()
-			data := filepath.Join(root, "data")
-
-			fs := afero.NewOsFs()
-			writeTestTree(t, fs, data)
-			require.NoError(t,
-				os.Symlink(testFileTxt, filepath.Join(data, "alias.txt")))
-			require.NoError(t, os.Symlink(data, filepath.Join(root, testLink)))
-
-			// t.Chdir sets PWD to the path it is given, as a shell does, and
-			// os.Getwd returns PWD when it names the working directory.
-			t.Chdir(filepath.Join(root, tc.workDir))
-
-			opts := testOpts(slices.Concat(
-				[]string{testApp, cmdGenerate, "-q"}, tc.args,
-			), fs)
-			require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-
-			assert.ElementsMatch(t, []string{testFileTxt, "sub/nested.txt"},
-				manifestPaths(t, fs, filepath.Join(data, defaultManifestName)))
-		})
-	}
-}
-
 // TestGenerateBytesDoNotDependOnOutput runs gen --seed on one tree, each
 // time writing to another file, over a file already there and beside an
 // earlier run's temp file: neither is listed, and what is listed depends
@@ -1773,200 +1619,20 @@ func TestGenerateValidatesInputPaths(t *testing.T) {
 	})
 }
 
-// generateTestDir writes testFile1 and runs gen on testDir, which writes
+// TestFlagAfterArgumentIsArgument asserts that flags are read only before a
-// the manifest to testDir/index.mf.
+// command's first argument: after it, -v is a path, not the verbose flag.
-func generateTestDir(t *testing.T, fs afero.Fs) {
+func TestFlagAfterArgumentIsArgument(t *testing.T) {
-	t.Helper()
-
-	require.NoError(t, fs.MkdirAll(testDir, 0o755))
-	writeTestFile(t, fs, testFile1, "content")
-
-	opts := testOpts([]string{testApp, cmdGenerate, "-q", testDir}, fs)
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-}
-
-// TestCheckReadsOptionAfterPath runs check on an unsigned manifest with
-// --require-signature after the directory. check must refuse the manifest.
-func TestCheckReadsOptionAfterPath(t *testing.T) {
 	t.Parallel()
 
 	fs := afero.NewMemMapFs()
-	generateTestDir(t, fs)
+	require.NoError(t, fs.MkdirAll(testDir, 0o755))
+	writeTestFile(t, fs, testFile1, "content")
 
-	opts := testOpts([]string{
+	opts := testOpts([]string{testApp, cmdGenerate, testDir, "-v"}, fs)
-		testApp, cmdCheck, "-q", testDir, "--" + flagRequireSignature, msgFpA,
+	exitCode := runCLI(opts)
-	}, fs)
-	assert.Equal(t, 1, runCLI(opts))
-	assert.Contains(t, testStderr(t, opts), "manifest is not signed")
-}
 
-// TestFreshenReadsOptionAfterPath runs freshen with --include-permissions
+	assert.Equal(t, 1, exitCode)
-// after the directory. freshen must record the file's mode.
+	assert.Contains(t, testStderr(t, opts), "path does not exist: -v")
-func TestFreshenReadsOptionAfterPath(t *testing.T) {
-	t.Parallel()
-
-	fs := afero.NewOsFs()
-	root, manifestPath := setupFreshenDir(t, fs,
-		map[string]string{testFileTxt: "a file"})
-	require.NoError(t, fs.Chmod(filepath.Join(root, testFileTxt), 0o640))
-
-	opts := testOpts([]string{
-		testApp, cmdFreshen, "-q", root, "--" + flagIncludePermissions,
-	}, fs)
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-	files := manifestFiles(t, fs, manifestPath)
-	require.Len(t, files, 1)
-	assert.Equal(t, uint32(0o640), files[0].GetMode())
-}
-
-// TestFetchReadsOptionAfterURL runs fetch with --dest after the URL. The
-// file and the manifest must land in that directory and nothing in the
-// current one.
-//
-//nolint:paralleltest // changes the process-global working directory
-func TestFetchReadsOptionAfterURL(t *testing.T) {
-	content := []byte("fetched")
-	manifest := manifestOf(t, map[string][]byte{testFileTxt: content})
-
-	server := httptest.NewServer(fetchTestHandler(manifest,
-		map[string][]byte{testFileTxt: content}))
-	defer server.Close()
-
-	cwd := chdirTemp(t)
-	dest := t.TempDir()
-
-	opts := testOpts([]string{
-		testApp, cmdFetch, "-q", server.URL, "--" + flagDest, dest,
-	}, afero.NewOsFs())
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-	assert.Equal(t,
-		map[string][]byte{testFileTxt: content, defaultManifestName: manifest},
-		filesUnder(t, dest))
-	assert.Empty(t, filesUnder(t, cwd), "fetch wrote outside --dest")
-}
-
-// TestOneArgumentCommandsRefuseSecond runs each command that takes one
-// argument with two. It must fail naming the second.
-func TestOneArgumentCommandsRefuseSecond(t *testing.T) {
-	t.Parallel()
-
-	for _, command := range []string{
-		cmdCheck, cmdFreshen, cmdList, cmdExport, cmdFetch,
-	} {
-		t.Run(command, func(t *testing.T) {
-			t.Parallel()
-
-			fs := afero.NewMemMapFs()
-			generateTestDir(t, fs)
-
-			opts := testOpts([]string{testApp, command, testDir, "/second"}, fs)
-			assert.Equal(t, 1, runCLI(opts))
-			assert.Contains(t, testStderr(t, opts),
-				`unexpected argument "/second"`)
-		})
-	}
-}
-
-// TestGenerateReadsPathAfterDoubleDash runs gen -- -x where -x is a
-// directory. -x must be read as the path to list, not as an option.
-//
-//nolint:paralleltest // changes the process-global working directory
-func TestGenerateReadsPathAfterDoubleDash(t *testing.T) {
-	chdirTemp(t)
-
-	fs := afero.NewOsFs()
-	require.NoError(t, fs.Mkdir("-x", 0o755))
-	writeTestFile(t, fs, filepath.Join("-x", testFileTxt), "content")
-
-	opts := testOpts([]string{testApp, cmdGenerate, "-q", "--", "-x"}, fs)
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-	files := manifestFiles(t, fs, filepath.Join("-x", defaultManifestName))
-	require.Len(t, files, 1)
-	assert.Equal(t, testFileTxt, files[0].GetPath())
-}
-
-// TestPathNamedHelp runs gen, then check with --require-signature, on a
-// directory named help and on one named h, the two names of urfave/cli's
-// help command. gen must write the manifest into the directory, and check
-// must refuse it as unsigned.
-//
-//nolint:paralleltest // changes the process-global working directory
-func TestPathNamedHelp(t *testing.T) {
-	for _, name := range []string{testCmdHelp, "h"} {
-		t.Run(name, func(t *testing.T) {
-			chdirTemp(t)
-
-			fs := afero.NewOsFs()
-			require.NoError(t, fs.Mkdir(name, 0o755))
-			writeTestFile(t, fs, filepath.Join(name, testFileTxt), "content")
-
-			opts := testOpts([]string{testApp, cmdGenerate, "-q", name}, fs)
-			require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-			files := manifestFiles(t, fs, filepath.Join(name, defaultManifestName))
-			require.Len(t, files, 1)
-
-			opts = testOpts([]string{
-				testApp, cmdCheck, "-q", name, "--" + flagRequireSignature, msgFpA,
-			}, fs)
-			assert.Equal(t, 1, runCLI(opts))
-			assert.Contains(t, testStderr(t, opts), "manifest is not signed")
-		})
-	}
-}
-
-// TestCommandsReadHelpAsArgument runs each command that takes a path or URL
-// on help and on h where nothing by that name exists. Each must fail on the
-// missing path or bad URL instead of printing its help.
-func TestCommandsReadHelpAsArgument(t *testing.T) {
-	t.Parallel()
-
-	for _, command := range []string{
-		cmdGenerate, cmdCheck, cmdFreshen, cmdList, cmdExport, cmdFetch,
-	} {
-		for _, name := range []string{testCmdHelp, "h"} {
-			t.Run(command+" "+name, func(t *testing.T) {
-				t.Parallel()
-
-				opts := testOpts([]string{testApp, command, name}, afero.NewMemMapFs())
-				assert.Equal(t, 1, runCLI(opts))
-				assert.NotContains(t, testStdout(t, opts), "USAGE:")
-			})
-		}
-	}
-}
-
-// TestHelpBesideArgument runs each command that takes a path or URL with
-// --help or -h before and after a directory, and runs help on that command.
-// Each must print what the command's own --help prints.
-func TestHelpBesideArgument(t *testing.T) {
-	t.Parallel()
-
-	for _, command := range []string{
-		cmdGenerate, cmdCheck, cmdFreshen, cmdList, cmdExport, cmdFetch,
-	} {
-		want := testOpts([]string{testApp, command, testFlagHelp}, afero.NewMemMapFs())
-		require.Equal(t, 0, runCLI(want))
-		require.Contains(t, testStdout(t, want), testApp+" "+command)
-
-		for _, args := range [][]string{
-			{command, testDir, testFlagHelp},
-			{command, testFlagHelp, testDir},
-			{command, testDir, "-h"},
-			{testCmdHelp, command},
-		} {
-			t.Run(strings.Join(args, " "), func(t *testing.T) {
-				t.Parallel()
-
-				opts := testOpts(slices.Concat([]string{testApp}, args), afero.NewMemMapFs())
-				assert.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-				assert.Equal(t, testStdout(t, want), testStdout(t, opts))
-			})
-		}
-	}
 }
 
 func TestCheckDetectsManifestCorruption(t *testing.T) {

internal/cli/errmsg_test.go

@@ -54,11 +54,6 @@ func runLocked(fn func() error) error {
 func unsignedChecker(t *testing.T) *mfer.Checker {
 	t.Helper()
 
-	// The scan and the manifest load log to the process-global logger, so
-	// serialize with the CLI runs.
-	runMu.Lock()
-	defer runMu.Unlock()
-
 	fs := afero.NewMemMapFs()
 	require.NoError(t, fs.MkdirAll("/d", 0o755))
 	require.NoError(t, afero.WriteFile(fs, "/d/f.txt", []byte("hi"), 0o644))
@@ -133,19 +128,13 @@ func TestSignerMismatchMessage(t *testing.T) {
 
 // testSecretKey returns a new OpenPGP key with its secret key, armored, as
 // gpg --export-secret-keys --armor writes it, and the key's fingerprint.
-// The key is protected by passphrase unless that is nil. config sets how
+// The key is protected by passphrase unless that is nil. It is an Ed25519
-// the key is made; without one it is an Ed25519 key, which is quick to
+// key, which is quick to make.
-// make.
+func testSecretKey(t *testing.T, passphrase []byte) ([]byte, string) {
-func testSecretKey(
-	t *testing.T, passphrase []byte, config *packet.Config,
-) ([]byte, string) {
 	t.Helper()
 
-	if config == nil {
+	key, err := openpgp.NewEntity("MFER Test Key", "", "test@mfer.test",
-		config = &packet.Config{Algorithm: packet.PubKeyAlgoEdDSA}
+		&packet.Config{Algorithm: packet.PubKeyAlgoEdDSA})
-	}
-
-	key, err := openpgp.NewEntity("MFER Test Key", "", "test@mfer.test", config)
 	require.NoError(t, err)
 
 	if passphrase != nil {
@@ -166,7 +155,7 @@ func testSecretKey(
 func signedManifest(t *testing.T, files map[string][]byte) []byte {
 	t.Helper()
 
-	secretKey, _ := testSecretKey(t, nil, nil)
+	secretKey, _ := testSecretKey(t, nil)
 
 	b := mfer.NewBuilder()
 	b.SetSigningOptions(&mfer.SigningOptions{SecretKey: secretKey})
@@ -188,11 +177,6 @@ func signedManifest(t *testing.T, files map[string][]byte) []byte {
 func signedChecker(t *testing.T, manifest []byte) *mfer.Checker {
 	t.Helper()
 
-	// Loading a manifest logs to the process-global logger, so serialize
-	// with the CLI runs.
-	runMu.Lock()
-	defer runMu.Unlock()
-
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, "/index.mf", manifest, 0o644))
 
@@ -483,49 +467,6 @@ func TestFreshenReadErrorMessage(t *testing.T) {
 		"read "+filepath.Join(root, "sub")+": is a directory")
 }
 
-// TestFreshenSizeChangedMessage has freshen hash a file that has grown or
-// shrunk since the scan recorded its size.
-func TestFreshenSizeChangedMessage(t *testing.T) {
-	t.Parallel()
-
-	fs := afero.NewMemMapFs()
-	writeTestFile(t, fs, "/d/log.txt", "hello")
-
-	t.Run("grown", func(t *testing.T) {
-		t.Parallel()
-
-		hasher := &freshenHasher{
-			fs:      fs,
-			absBase: "/d",
-			builder: mfer.NewBuilder(),
-		}
-
-		err := hasher.processEntry(
-			&freshenEntry{path: "log.txt", size: 3, needsHash: true})
-		require.ErrorIs(t, err, errSizeMismatch)
-		assert.EqualError(t, err, `size mismatch for "log.txt": `+
-			`3 bytes when scanned but 5 bytes when read; `+
-			`the file changed while freshen ran`)
-	})
-
-	t.Run("shrunk", func(t *testing.T) {
-		t.Parallel()
-
-		hasher := &freshenHasher{
-			fs:      fs,
-			absBase: "/d",
-			builder: mfer.NewBuilder(),
-		}
-
-		err := hasher.processEntry(
-			&freshenEntry{path: "log.txt", size: 8, needsHash: true})
-		require.ErrorIs(t, err, errSizeMismatch)
-		assert.EqualError(t, err, `size mismatch for "log.txt": `+
-			`8 bytes when scanned but 5 bytes when read; `+
-			`the file changed while freshen ran`)
-	})
-}
-
 func TestURLRequiredMessage(t *testing.T) {
 	t.Parallel()
 

internal/cli/export_test.go

@@ -20,11 +20,6 @@ const testCmdExport = "export"
 func buildTestManifest(t *testing.T, files map[string][]byte) []byte {
 	t.Helper()
 
-	// The scan logs to the process-global logger, so serialize with the
-	// CLI runs.
-	runMu.Lock()
-	defer runMu.Unlock()
-
 	sourceFs := afero.NewMemMapFs()
 	for path, content := range files {
 		require.NoError(t, sourceFs.MkdirAll("/", 0o755))

internal/cli/fetch.go

@@ -86,8 +86,7 @@ var (
 	// symlink that already exists in the target directory.
 	errSymlinkInPath = errors.New("symlink in path not allowed")
 	// errSizeMismatch indicates a downloaded file with an unexpected
-	// size, or a file freshen read at a size other than the one its scan
+	// size.
-	// recorded.
 	errSizeMismatch = errors.New("size mismatch")
 	// errHashMismatch indicates a downloaded file whose hash matches no
 	// manifest hash.
@@ -126,9 +125,8 @@ type retryingClient struct {
 // to a limit that doubles each time, unless the server's Retry-After
 // header says how long to wait. Any other failure, an error from use
 // included, is returned at once and unwrapped; a non-OK status is
-// returned as errHTTPStatus. If ctx ends before a retry, the error wraps
+// returned as errHTTPStatus. use must start over each time it is called,
-// both ctx's error and the last try's error. use must start over each
+// since a retry calls it again with a new response.
-// time it is called, since a retry calls it again with a new response.
 func (c retryingClient) get(
 	ctx context.Context, rawURL string, use func(*http.Response) error,
 ) error {
@@ -170,19 +168,15 @@ func (c retryingClient) get(
 			}
 		}
 
-		if !retry || attempt == fetchAttempts {
+		if !retry || attempt == fetchAttempts || ctx.Err() != nil {
 			return err
 		}
 
-		if ctx.Err() != nil {
-			return fmt.Errorf("%w: %w", ctx.Err(), err)
-		}
-
 		log.Warnf("%s: %s, retrying in %s", rawURL, err, wait.Round(time.Millisecond))
 
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf("%w: %w", ctx.Err(), err)
+			return ctx.Err()
 		case <-time.After(wait):
 		}
 
@@ -435,14 +429,6 @@ func (mfa *CLIApp) fetchManifestOperation(
 func (mfa *CLIApp) fetchManifest(
 	ctx context.Context, cmd *cli.Command, client retryingClient, manifestURL string,
 ) ([]byte, []*mfer.MFFilePath, error) {
-	// An empty fingerprint is refused before anything is requested, with
-	// the message check gives for it; any other is checked against the
-	// manifest once it is downloaded.
-	requiredSigner := cmd.String(flagRequireSignature)
-	if cmd.IsSet(flagRequireSignature) && requiredSigner == "" {
-		return nil, nil, fmt.Errorf("%w, got 0", errInvalidFingerprint)
-	}
-
 	log.Infof("fetching manifest from %s", manifestURL)
 
 	// Read the whole manifest before parsing it, so that a connection
@@ -474,6 +460,7 @@ func (mfa *CLIApp) fetchManifest(
 		return nil, nil, fmt.Errorf("parse manifest: %w", err)
 	}
 
+	requiredSigner := cmd.String(flagRequireSignature)
 	if requiredSigner != "" {
 		err = verifyFetchedSigner(manifestData, requiredSigner)
 		if err != nil {
@@ -692,26 +679,21 @@ func resolveManifestURL(inputURL string) (string, error) {
 	return parsed.JoinPath(defaultManifestName).String(), nil
 }
 
-// progressWriter wraps an io.Writer and reports progress to a channel,
+// progressWriter wraps an io.Writer and reports progress to a channel.
-// at most once per second and once more when the last byte is written.
 type progressWriter struct {
-	w            io.Writer
+	w         io.Writer
-	path         string
+	path      string
-	total        int64
+	total     int64
-	written      int64
+	written   int64
-	startTime    time.Time
+	startTime time.Time
-	lastProgress time.Time
+	progress  chan<- DownloadProgress
-	progress     chan<- DownloadProgress
 }
 
 func (pw *progressWriter) Write(p []byte) (int, error) {
 	n, err := pw.w.Write(p)
 
 	pw.written += int64(n)
-
+	if pw.progress != nil {
-	isLast := pw.written == pw.total
-	if pw.progress != nil &&
-		(isLast || time.Since(pw.lastProgress) >= time.Second) {
 		var (
 			bytesPerSec float64
 			eta         time.Duration
@@ -733,8 +715,6 @@ func (pw *progressWriter) Write(p []byte) (int, error) {
 			BytesPerSec: bytesPerSec,
 			ETA:         eta,
 		})
-
-		pw.lastProgress = time.Now()
 	}
 
 	return n, err
@@ -919,16 +899,13 @@ func saveResponse(
 	// Set up hash computation
 	h := sha256.New()
 
-	// Create progress-reporting writer that also computes hash. The first
+	// Create progress-reporting writer that also computes hash
-	// update waits a second, as gen's and check's do.
-	start := time.Now()
 	pw := &progressWriter{
-		w:            io.MultiWriter(out, h),
+		w:         io.MultiWriter(out, h),
-		path:         localPath,
+		path:      localPath,
-		total:        totalBytes,
+		total:     totalBytes,
-		startTime:    start,
+		startTime: time.Now(),
-		lastProgress: start,
+		progress:  progress,
-		progress:     progress,
 	}
 
 	// Copy content while hashing and reporting progress. One byte past

internal/cli/fetch_test.go

@@ -171,11 +171,6 @@ func TestResolveManifestURL(t *testing.T) {
 func scanToManifest(t *testing.T, sourceFs afero.Fs) []byte {
 	t.Helper()
 
-	// The scan logs to the process-global logger, so serialize with the
-	// CLI runs.
-	runMu.Lock()
-	defer runMu.Unlock()
-
 	s := mfer.NewScannerWithOptions(&mfer.ScannerOptions{Fs: sourceFs})
 	require.NoError(t, s.EnumerateFS(sourceFs, "/", nil))
 
@@ -319,11 +314,8 @@ func TestFetchFromHTTP(t *testing.T) {
 	// Change to a fresh destination directory for the test
 	destDir := chdirTemp(t)
 
-	// Parse the manifest to get file entries. Loading a manifest logs to
+	// Parse the manifest to get file entries
-	// the process-global logger.
-	runMu.Lock()
 	manifest, err := mfer.NewManifestFromReader(bytes.NewReader(manifestData))
-	runMu.Unlock()
 	require.NoError(t, err)
 
 	files := manifest.Files()
@@ -373,10 +365,7 @@ func TestFetchHashMismatch(t *testing.T) {
 	// Generate and parse manifest
 	manifestData := scanToManifest(t, sourceFs)
 
-	// Loading a manifest logs to the process-global logger.
-	runMu.Lock()
 	manifest, err := mfer.NewManifestFromReader(bytes.NewReader(manifestData))
-	runMu.Unlock()
 	require.NoError(t, err)
 
 	files := manifest.Files()
@@ -422,10 +411,7 @@ func TestFetchSizeMismatch(t *testing.T) {
 	// Generate and parse manifest
 	manifestData := scanToManifest(t, sourceFs)
 
-	// Loading a manifest logs to the process-global logger.
-	runMu.Lock()
 	manifest, err := mfer.NewManifestFromReader(bytes.NewReader(manifestData))
-	runMu.Unlock()
 	require.NoError(t, err)
 
 	files := manifest.Files()
@@ -530,17 +516,14 @@ func TestManifestDownloadStopsAtLimit(t *testing.T) {
 func TestFetchProgress(t *testing.T) {
 	// Create source filesystem with a larger test file
 	sourceFs := afero.NewMemMapFs()
-	// Content large enough that io.Copy writes it in at least four chunks
+	// Create content large enough to trigger multiple progress updates
 	content := bytes.Repeat([]byte("x"), 100*1024) // 100KB
 	require.NoError(t, afero.WriteFile(sourceFs, "/large.txt", content, 0o644))
 
 	// Generate and parse manifest
 	manifestData := scanToManifest(t, sourceFs)
 
-	// Loading a manifest logs to the process-global logger.
-	runMu.Lock()
 	manifest, err := mfer.NewManifestFromReader(bytes.NewReader(manifestData))
-	runMu.Unlock()
 	require.NoError(t, err)
 
 	files := manifest.Files()
@@ -576,11 +559,8 @@ func TestFetchProgress(t *testing.T) {
 	}()
 
 	// Download
-	start := time.Now()
 	err = downloadFile(context.Background(), testClient(),
 		server.URL+"/large.txt", ".", "large.txt", files[0], progress)
-	elapsed := time.Since(start)
-
 	close(progress)
 	<-done
 
@@ -589,12 +569,6 @@ func TestFetchProgress(t *testing.T) {
 	// Verify we got progress updates
 	assert.NotEmpty(t, progressUpdates, "should have received progress updates")
 
-	// At most one update per second, plus the one reporting the file
-	// complete: a download that takes under a second sends two at most,
-	// however many chunks it writes.
-	assert.LessOrEqual(t, len(progressUpdates), 2+int(elapsed/time.Second),
-		"one progress update per second at most, plus the last")
-
 	// Verify final progress shows complete
 	if len(progressUpdates) > 0 {
 		last := progressUpdates[len(progressUpdates)-1]
@@ -897,59 +871,23 @@ func TestGetHonorsRetryAfter(t *testing.T) {
 	}
 }
 
-// instant503Transport answers every request with a 503 at once, so the
+// TestGetStopsWaitingWhenCanceled gives get a server that always answers
-// 503 is in hand before any deadline can pass.
+// 503 and an hour's wait before each retry, then lets the context expire
-type instant503Transport struct{}
+// during that wait. get returning at all shows it stopped waiting.
-
-func (instant503Transport) RoundTrip(*http.Request) (*http.Response, error) {
-	return &http.Response{
-		StatusCode: http.StatusServiceUnavailable,
-		Body:       http.NoBody,
-	}, nil
-}
-
-// TestGetStopsWaitingWhenCanceled answers every request with a 503 and
-// sets an hour's wait before each retry, then lets the context expire
-// during that wait. get returning at all shows it stopped waiting; it must
-// return the deadline error and keep the 503 with it.
 func TestGetStopsWaitingWhenCanceled(t *testing.T) {
 	t.Parallel()
 
+	server := httptest.NewServer(
+		http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+			w.WriteHeader(http.StatusServiceUnavailable)
+		}))
+	defer server.Close()
+
 	client := testClient()
-	client.client.Transport = instant503Transport{}
 	client.firstDelay = time.Hour
 
-	err := getNothing(client, "http://example.invalid/", 50*time.Millisecond)
+	err := getNothing(client, server.URL, 50*time.Millisecond)
 	require.ErrorIs(t, err, context.DeadlineExceeded)
-	require.ErrorIs(t, err, errHTTPStatus)
-}
-
-// late503Transport answers every request with a 503, but only once the
-// request's context has ended. A real server cannot stand in for it: the
-// client drops a response still on its way when the context ends.
-type late503Transport struct{}
-
-func (late503Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	<-req.Context().Done()
-
-	return &http.Response{
-		StatusCode: http.StatusServiceUnavailable,
-		Body:       http.NoBody,
-	}, nil
-}
-
-// TestGetStopsWhenContextEndsDuringRequest lets the context expire while
-// the first request is still waiting for its 503. get must return the
-// deadline error and keep the 503 with it.
-func TestGetStopsWhenContextEndsDuringRequest(t *testing.T) {
-	t.Parallel()
-
-	client := testClient()
-	client.client.Transport = late503Transport{}
-
-	err := getNothing(client, "http://example.invalid/", 50*time.Millisecond)
-	require.ErrorIs(t, err, context.DeadlineExceeded)
-	require.ErrorIs(t, err, errHTTPStatus)
 }
 
 // TestDownloadFileRetriesToSuccess serves a file that fails twice before
@@ -959,12 +897,9 @@ func TestGetStopsWhenContextEndsDuringRequest(t *testing.T) {
 //nolint:paralleltest // changes the process-global working directory
 func TestDownloadFileRetriesToSuccess(t *testing.T) {
 	content := []byte("the whole file, every byte of it")
-	manifestData := manifestOf(t, map[string][]byte{testFileTxt: content})
 
-	// Loading a manifest logs to the process-global logger.
+	manifest, err := mfer.NewManifestFromReader(bytes.NewReader(
-	runMu.Lock()
+		manifestOf(t, map[string][]byte{testFileTxt: content})))
-	manifest, err := mfer.NewManifestFromReader(bytes.NewReader(manifestData))
-	runMu.Unlock()
 	require.NoError(t, err)
 
 	var requests atomic.Int32
@@ -987,11 +922,8 @@ func TestDownloadFileRetriesToSuccess(t *testing.T) {
 
 	chdirTemp(t)
 
-	// downloadFile logs each retry to the process-global logger.
+	err = downloadFile(context.Background(), testClient(),
-	err = runLocked(func() error {
+		server.URL+"/"+testFileTxt, ".", testFileTxt, manifest.Files()[0], nil)
-		return downloadFile(context.Background(), testClient(),
-			server.URL+"/"+testFileTxt, ".", testFileTxt, manifest.Files()[0], nil)
-	})
 	require.NoError(t, err)
 	assert.Equal(t, int32(3), requests.Load())
 
@@ -1311,10 +1243,10 @@ func TestFetchRequireSignature(t *testing.T) {
 
 // TestFetchRefusesListedManifestName fetches manifests that list, at the
 // top of the tree, the name fetch saves the manifest under or that name's
-// temp file: as a file, as a directory and in capitals. Saving the
+// temp file: as a file, as a directory, in capitals, and with a leading
-// manifest would replace or remove what is listed there, so fetch must
+// "./". Saving the manifest would replace or remove what is listed there,
-// refuse the manifest before it creates the destination or requests any
+// so fetch must refuse the manifest before it creates the destination or
-// file.
+// requests any file.
 func TestFetchRefusesListedManifestName(t *testing.T) {
 	t.Parallel()
 
@@ -1323,6 +1255,7 @@ func TestFetchRefusesListedManifestName(t *testing.T) {
 		tempPathFor(defaultManifestName),
 		defaultManifestName + "/" + testFileTxt,
 		"INDEX.MF",
+		"./" + defaultManifestName,
 	} {
 		t.Run(listed, func(t *testing.T) {
 			t.Parallel()
@@ -1398,9 +1331,9 @@ func TestFetchRefusesListedTempName(t *testing.T) {
 // directory, one of them under a spelling the manifest does not list,
 // and check reports that file as not in the manifest. So fetch must
 // refuse each on every filesystem before it creates the destination or
-// requests any file. A file and a directory with the same name are
+// requests any file. A file and a directory with the same name, and a
-// refused the same way. A manifest whose names differ in more than
+// file listed twice, are refused the same way. A manifest whose names
-// letter case is fetched in full.
+// differ in more than letter case is fetched in full.
 func TestFetchRefusesNamesEqualIgnoringCase(t *testing.T) {
 	t.Parallel()
 
@@ -1410,6 +1343,7 @@ func TestFetchRefusesNamesEqualIgnoringCase(t *testing.T) {
 		{"Dir", "dir/x", "dir/x (the file Dir)"},
 		{"Dir/a.txt", "dir/b.txt", "dir/b.txt (the directory Dir)"},
 		{"dir", "dir/x", "dir/x (the file dir)"},
+		{"./x.txt", "x.txt", "x.txt (the file ./x.txt)"},
 	} {
 		t.Run(tc.first+" and "+tc.second, func(t *testing.T) {
 			t.Parallel()
@@ -1470,18 +1404,14 @@ func TestFetchSetsRecordedMode(t *testing.T) {
 		require.NoError(t, afero.WriteFile(sourceFs, "/"+p, content, modes[p]))
 	}
 
+	scanner := mfer.NewScannerWithOptions(&mfer.ScannerOptions{
+		Fs:                 sourceFs,
+		IncludePermissions: true,
+	})
+	require.NoError(t, scanner.EnumerateFS(sourceFs, "/", nil))
+
 	var manifest bytes.Buffer
-
+	require.NoError(t, scanner.ToManifest(context.Background(), &manifest, nil))
-	// The scan logs to the process-global logger.
-	require.NoError(t, runLocked(func() error {
-		scanner := mfer.NewScannerWithOptions(&mfer.ScannerOptions{
-			Fs:                 sourceFs,
-			IncludePermissions: true,
-		})
-		require.NoError(t, scanner.EnumerateFS(sourceFs, "/", nil))
-
-		return scanner.ToManifest(context.Background(), &manifest, nil)
-	}))
 
 	tree := fetchTestHandler(manifest.Bytes(), files)
 
@@ -1643,7 +1573,8 @@ func manifestWithMode(t *testing.T, path string, content []byte, mode uint32) []
 }
 
 // builtManifest returns a manifest of files, built directly rather than
-// scanned, since a scan lists no hidden files.
+// scanned, since a scan lists no hidden files and never a path starting
+// with "./".
 func builtManifest(t *testing.T, files map[string][]byte) []byte {
 	t.Helper()
 

internal/cli/freshen.go

@@ -28,19 +28,9 @@ const (
 	scanProgressInterval = 100
 )
 
-var (
+// errEntryMissingMtime indicates a manifest entry that carries no
-	// errEntryMissingMtime indicates a manifest entry that carries no
+// modification time where one is required to carry it forward unchanged.
-	// modification time where one is required to carry it forward unchanged.
+var errEntryMissingMtime = errors.New("manifest entry has no mtime")
-	errEntryMissingMtime = errors.New("manifest entry has no mtime")
-
-	// errEntryMissingHash indicates a manifest entry that carries no hash
-	// to carry forward.
-	errEntryMissingHash = errors.New("manifest entry has no hash")
-)
-
-// errSignKeyNeeded indicates a signed manifest given to freshen with no
-// key to sign the rewritten one.
-var errSignKeyNeeded = errors.New("give --sign-key to keep it signed")
 
 // FreshenStatus contains progress information for the freshen operation.
 type FreshenStatus struct {
@@ -202,13 +192,6 @@ func (s *freshenScanner) walk(path string, info fs.FileInfo, walkErr error) erro
 		info = realInfo
 	}
 
-	// Opening a named pipe can block, and reading a device may never end.
-	if !info.Mode().IsRegular() {
-		log.Verbosef("skipping %s: not a regular file", relPath)
-
-		return nil
-	}
-
 	for _, excluded := range s.excluded {
 		if os.SameFile(info, excluded) {
 			return nil
@@ -315,16 +298,6 @@ func (h *freshenHasher) processEntry(e *freshenEntry) error {
 		return err
 	}
 
-	// The scan recorded the size; a file that grew or shrank since would
-	// get an entry whose size and hash describe different contents.
-	if bytesRead != e.size {
-		return fmt.Errorf(
-			"%w for %q: %d bytes when scanned but %d bytes when read; "+
-				"the file changed while freshen ran",
-			errSizeMismatch, e.path, e.size, bytesRead,
-		)
-	}
-
 	h.hashedBytes += bytesRead
 	h.hashedFiles++
 
@@ -365,39 +338,24 @@ func writeFreshenedManifest(
 }
 
 // newFreshenBuilder constructs the manifest builder configured from CLI
-// flags, and returns the fingerprint of the --sign-key key, or "" when
+// flags.
-// none is given. A --sign-key given with an empty value is refused.
+func (mfa *CLIApp) newFreshenBuilder(cmd *cli.Command) (*mfer.Builder, error) {
-func (mfa *CLIApp) newFreshenBuilder(
-	cmd *cli.Command,
-) (*mfer.Builder, string, error) {
 	builder := mfer.NewBuilder()
 	if cmd.Bool("include-timestamps") {
 		builder.SetIncludeTimestamps(true)
 	}
 
-	var signKeyFingerprint string
-
 	// Set up signing options if sign-key is provided
-	if cmd.IsSet("sign-key") {
+	if signKey := cmd.String("sign-key"); signKey != "" {
-		signKey := cmd.String("sign-key")
-		if signKey == "" {
-			return nil, "", errEmptySignKey
-		}
-
 		signing, err := mfa.signingOptions(signKey)
 		if err != nil {
-			return nil, "", err
+			return nil, err
-		}
-
-		signKeyFingerprint, err = mfer.SecretKeyFingerprint(signing.SecretKey)
-		if err != nil {
-			return nil, "", fmt.Errorf("%s: %w", signKey, err)
 		}
 
 		builder.SetSigningOptions(signing)
 	}
 
-	return builder, signKeyFingerprint, nil
+	return builder, nil
 }
 
 // freshenScan runs the scan phase against the loaded manifest entries
@@ -423,14 +381,6 @@ func (mfa *CLIApp) freshenScan(
 		}
 	}
 
-	// The walk does not follow a symlink at its top, so a base directory
-	// named through one is resolved first. If that fails, the base is
-	// walked as named and the walk reports the problem.
-	resolved, err := filepath.EvalSymlinks(absBase)
-	if err == nil {
-		absBase = resolved
-	}
-
 	scanner := &freshenScanner{
 		fs:                 mfa.Fs,
 		absBase:            absBase,
@@ -442,7 +392,7 @@ func (mfa *CLIApp) freshenScan(
 		existingByPath:     existingByPath,
 	}
 
-	err = afero.Walk(mfa.Fs, absBase, scanner.walk)
+	err := afero.Walk(mfa.Fs, absBase, scanner.walk)
 
 	if showProgress {
 		log.ProgressDone()
@@ -509,19 +459,11 @@ func runFreshenHash(
 	return nil
 }
 
-// existingManifest is what freshen uses of the manifest it rewrites.
+// loadExistingEntries loads the manifest and indexes its file entries
-type existingManifest struct {
+// by path.
-	entriesByPath map[string]*mfer.MFFilePath
+func (mfa *CLIApp) loadExistingEntries(
-	signer        string // fingerprint of the key it is signed with, "" if unsigned
+	manifestPath string,
-	hasCreatedAt  bool
+) (map[string]*mfer.MFFilePath, error) {
-}
-
-// loadExistingManifest loads the manifest and indexes its file entries
-// by path. It refuses a signed manifest when no --sign-key is given, as
-// the rewritten manifest would be unsigned.
-func (mfa *CLIApp) loadExistingManifest(
-	cmd *cli.Command, manifestPath string,
-) (*existingManifest, error) {
 	log.Infof("loading manifest from %s", manifestPath)
 
 	// Load existing manifest
@@ -533,10 +475,6 @@ func (mfa *CLIApp) loadExistingManifest(
 		return nil, fmt.Errorf("load manifest: %w", err)
 	}
 
-	if signer := manifest.Signer(); signer != nil && cmd.String("sign-key") == "" {
-		return nil, fmt.Errorf("manifest is signed by %s: %w", signer, errSignKeyNeeded)
-	}
-
 	existingFiles := manifest.Files()
 	log.Infof("manifest contains %d files", len(existingFiles))
 
@@ -546,11 +484,7 @@ func (mfa *CLIApp) loadExistingManifest(
 		existingByPath[f.GetPath()] = f
 	}
 
-	return &existingManifest{
+	return existingByPath, nil
-		entriesByPath: existingByPath,
-		signer:        string(manifest.Signer()),
-		hasCreatedAt:  manifest.CreatedAt() != nil,
-	}, nil
 }
 
 func (mfa *CLIApp) freshenManifestOperation(
@@ -558,18 +492,20 @@ func (mfa *CLIApp) freshenManifestOperation(
 ) error {
 	log.Debug("freshenManifestOperation()")
 
+	showProgress := cmd.Bool("progress")
+
 	// Find manifest file
 	manifestPath, err := mfa.resolveFreshenManifestPath(cmd)
 	if err != nil {
 		return err
 	}
 
-	builder, signKeyFingerprint, err := mfa.newFreshenBuilder(cmd)
+	builder, err := mfa.newFreshenBuilder(cmd)
 	if err != nil {
 		return err
 	}
 
-	existing, err := mfa.loadExistingManifest(cmd, manifestPath)
+	existingByPath, err := mfa.loadExistingEntries(manifestPath)
 	if err != nil {
 		return err
 	}
@@ -581,7 +517,7 @@ func (mfa *CLIApp) freshenManifestOperation(
 
 	// Phase 1: Scan filesystem
 	scanner, removed, err := mfa.freshenScan(cmd, manifestPath, absBase,
-		existing.entriesByPath)
+		existingByPath)
 	if err != nil {
 		return err
 	}
@@ -598,7 +534,7 @@ func (mfa *CLIApp) freshenManifestOperation(
 	hasher := &freshenHasher{
 		fs:             mfa.Fs,
 		absBase:        absBase,
-		showProgress:   cmd.Bool("progress"),
+		showProgress:   showProgress,
 		totalHashBytes: totalHashBytes,
 		filesToHash:    filesToHash,
 		startHash:      time.Now(),
@@ -614,14 +550,8 @@ func (mfa *CLIApp) freshenManifestOperation(
 	log.Infof("freshen complete: %d unchanged, %d changed, %d added, %d removed",
 		scanner.unchanged, scanner.changed, scanner.added, removed)
 
-	// Skip writing only when the manifest would come out the same: nothing
+	// Skip writing if nothing changed
-	// in the tree changed, and the manifest already holds what --sign-key,
+	if scanner.changed == 0 && scanner.added == 0 && removed == 0 {
-	// --include-timestamps and --include-permissions ask for. The scan
-	// counts a file whose recorded mode is not what --include-permissions
-	// asks for as changed.
-	if scanner.changed == 0 && scanner.added == 0 && removed == 0 &&
-		existing.signer == signKeyFingerprint &&
-		existing.hasCreatedAt == cmd.Bool("include-timestamps") {
 		log.Infof("manifest unchanged, skipping write")
 
 		return nil
@@ -699,8 +629,6 @@ func addFileToBuilder(
 // Entries reach this path only when recordEntry classified them as
 // unchanged, which requires a recorded mtime, so an absent mtime here is
 // an error rather than something to paper over with the Unix epoch.
-// Loading refuses an entry with no hash; one that got here anyway is an
-// error too, not a file to leave out of the manifest.
 func addExistingToBuilder(b *mfer.Builder, entry *mfer.MFFilePath) error {
 	mtime, ok := entryMtime(entry)
 	if !ok {
@@ -708,7 +636,7 @@ func addExistingToBuilder(b *mfer.Builder, entry *mfer.MFFilePath) error {
 	}
 
 	if len(entry.GetHashes()) == 0 {
-		return fmt.Errorf("%w: %s", errEntryMissingHash, entry.GetPath())
+		return nil
 	}
 
 	err := b.AddFileWithHash(mfer.RelFilePath(entry.GetPath()),

internal/cli/freshen_test.go

@@ -70,11 +70,6 @@ func runFreshen(t *testing.T, fs afero.Fs, root, manifestPath string) {
 func manifestFiles(t *testing.T, fs afero.Fs, path string) []*mfer.MFFilePath {
 	t.Helper()
 
-	// Loading a manifest logs to the process-global logger, so serialize
-	// with the CLI runs.
-	runMu.Lock()
-	defer runMu.Unlock()
-
 	manifest, err := mfer.NewManifestFromFile(&mfer.ManifestFromFileOptions{
 		Path: path,
 		Fs:   fs,
@@ -84,23 +79,6 @@ func manifestFiles(t *testing.T, fs afero.Fs, path string) []*mfer.MFFilePath {
 	return manifest.Files()
 }
 
-// manifestCreatedAt returns the createdAt timestamp of the manifest at
-// path, or nil if it has none.
-func manifestCreatedAt(t *testing.T, fs afero.Fs, path string) *mfer.Timestamp {
-	t.Helper()
-
-	runMu.Lock()
-	defer runMu.Unlock()
-
-	manifest, err := mfer.NewManifestFromFile(&mfer.ManifestFromFileOptions{
-		Path: path,
-		Fs:   fs,
-	})
-	require.NoError(t, err)
-
-	return manifest.CreatedAt()
-}
-
 // TestFreshenUnchanged freshens a tree that has not changed since gen
 // made its manifest: the manifest must list the same entries as before.
 func TestFreshenUnchanged(t *testing.T) {
@@ -158,41 +136,6 @@ func TestFreshenRecordsModeOnlyWhenAsked(t *testing.T) {
 		recordedModes())
 }
 
-// TestFreshenIncludeTimestampsOnUnchangedTree runs freshen
-// --include-timestamps on a tree that has not changed since gen made its
-// manifest, which has no createdAt timestamp. freshen must rewrite the
-// manifest with one. Run again with the flag it must leave the manifest as
-// it is; run without it, it must rewrite the manifest without one.
-func TestFreshenIncludeTimestampsOnUnchangedTree(t *testing.T) {
-	t.Parallel()
-
-	fs := afero.NewOsFs()
-	root, manifestPath := setupFreshenDir(t, fs, map[string]string{testFileTxt: "hello"})
-
-	freshenWithTimestamps := func() {
-		opts := testOpts([]string{
-			testApp, cmdFreshen, "-q", "--include-timestamps",
-			testFlagBase, root, manifestPath,
-		}, fs)
-		require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-	}
-
-	freshenWithTimestamps()
-	assert.NotNil(t, manifestCreatedAt(t, fs, manifestPath))
-
-	before, err := afero.ReadFile(fs, manifestPath)
-	require.NoError(t, err)
-
-	freshenWithTimestamps()
-
-	after, err := afero.ReadFile(fs, manifestPath)
-	require.NoError(t, err)
-	assert.Equal(t, before, after, "manifest that has a createdAt was rewritten")
-
-	runFreshen(t, fs, root, manifestPath)
-	assert.Nil(t, manifestCreatedAt(t, fs, manifestPath))
-}
-
 // assertManifestLists asserts that the manifest at manifestPath lists
 // exactly the files in want, each with the size and SHA-256 hash of its
 // content in want and the mtime of the file of that name under root.
@@ -300,58 +243,6 @@ func TestFreshenWithChanges(t *testing.T) {
 	}
 }
 
-// growingFileFs appends to one file each time it is opened, as a program
-// still writing to the file would between freshen's scan and its hash.
-type growingFileFs struct {
-	afero.Fs
-
-	path string
-}
-
-//nolint:ireturn // Open must return afero.File to satisfy afero.Fs.
-func (f growingFileFs) Open(name string) (afero.File, error) {
-	if name == f.path {
-		file, err := f.OpenFile(name, os.O_APPEND|os.O_WRONLY, 0)
-		if err != nil {
-			return nil, err
-		}
-
-		_, err = file.WriteString(" world")
-		_ = file.Close()
-
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return f.Fs.Open(name)
-}
-
-// TestFreshenFileChangedSinceScan has a new file grow after freshen's scan
-// recorded its size and before freshen hashes it: freshen must fail and
-// leave the manifest as it was.
-func TestFreshenFileChangedSinceScan(t *testing.T) {
-	t.Parallel()
-
-	osFs := afero.NewOsFs()
-	root, manifestPath := setupFreshenDir(t, osFs,
-		map[string]string{testFileTxt: "content"})
-	grown := filepath.Join(root, "log.txt")
-	writeTestFile(t, osFs, grown, "hello")
-
-	before, err := afero.ReadFile(osFs, manifestPath)
-	require.NoError(t, err)
-
-	opts := testOpts([]string{
-		testApp, cmdFreshen, "-q", testFlagBase, root, manifestPath,
-	}, growingFileFs{Fs: osFs, path: grown})
-	assert.Equal(t, 1, runCLI(opts), "stderr: %s", testStderr(t, opts))
-
-	after, err := afero.ReadFile(osFs, manifestPath)
-	require.NoError(t, err)
-	assert.Equal(t, before, after, "manifest changed")
-}
-
 // TestFreshenLeavesManifestOutOfListing freshens a manifest kept in a
 // subdirectory of the tree it lists: the manifest is not listed, while an
 // ordinary file of the same name at the top of the tree is. The manifest
@@ -445,49 +336,6 @@ func TestFreshenResolvesEntriesAgainstManifestDirectory(t *testing.T) {
 	}
 }
 
-// TestFreshenDirectoryNamedThroughSymlink adds a file to a tree after gen
-// made its manifest, then freshens it with the tree named through a symlink,
-// given as the argument or as the working directory: the manifest lists the
-// files in the tree, and leaves out a symlink inside it, as freshen does
-// without --follow-symlinks.
-//
-//nolint:paralleltest // changes the process-global working directory
-func TestFreshenDirectoryNamedThroughSymlink(t *testing.T) {
-	// Paths are relative to a temp dir holding link, a symlink to the tree.
-	for name, tc := range map[string]struct {
-		workDir string
-		args    []string
-	}{
-		"argument":          {".", []string{testLink}},
-		"working directory": {testLink, nil},
-	} {
-		t.Run(name, func(t *testing.T) {
-			fs := afero.NewOsFs()
-			tree, manifestPath := setupFreshenDir(t, fs,
-				map[string]string{testFileTxt: "in the tree"})
-			writeTestFile(t, fs, filepath.Join(tree, "later.txt"), "added later")
-			require.NoError(t,
-				os.Symlink(testFileTxt, filepath.Join(tree, "alias.txt")))
-
-			root := t.TempDir()
-			require.NoError(t, os.Symlink(tree, filepath.Join(root, testLink)))
-
-			// t.Chdir sets PWD to the path it is given, as a shell does, and
-			// os.Getwd returns PWD when it names the working directory.
-			t.Chdir(filepath.Join(root, tc.workDir))
-
-			opts := testOpts(slices.Concat(
-				[]string{testApp, cmdFreshen, "-q"}, tc.args,
-			), fs)
-			require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-
-			assertManifestLists(t, fs, tree, manifestPath, map[string]string{
-				testFileTxt: "in the tree", "later.txt": "added later",
-			})
-		})
-	}
-}
-
 // TestFreshenRecordEntryMtimePresence pins the behavior of recordEntry
 // with respect to MFFilePath.Mtime, which is a message pointer with
 // proto3 field presence and may legitimately be absent.
@@ -545,11 +393,7 @@ func TestFreshenRecordEntryMtimePresence(t *testing.T) {
 			s := &freshenScanner{
 				existingByPath: map[string]*mfer.MFFilePath{relPath: tc.entry},
 			}
-
-			// recordEntry logs to the process-global logger.
-			runMu.Lock()
 			s.recordEntry(relPath, info)
-			runMu.Unlock()
 
 			require.Len(t, s.entries, 1)
 			assert.Equal(t, tc.needsHash, s.entries[0].needsHash)
@@ -584,24 +428,6 @@ func TestFreshenAddExistingRejectsMissingMtime(t *testing.T) {
 	assert.Contains(t, err.Error(), "file1.txt")
 }
 
-// TestFreshenAddExistingRejectsMissingHash pins that an entry with no hash
-// is an error rather than a file left out of the rebuilt manifest.
-func TestFreshenAddExistingRejectsMissingHash(t *testing.T) {
-	t.Parallel()
-
-	b := mfer.NewBuilder()
-	entry := &mfer.MFFilePath{
-		Path:  "data.bin",
-		Size:  8,
-		Mtime: &mfer.Timestamp{Seconds: 1_700_000_000},
-	}
-
-	err := addExistingToBuilder(b, entry)
-	require.ErrorIs(t, err, errEntryMissingHash)
-	assert.Contains(t, err.Error(), "data.bin")
-	assert.Zero(t, b.FileCount())
-}
-
 // TestFreshenAddExistingRejectsShortHash pins that an existing manifest
 // entry whose hash the builder refuses is reported as a problem with the
 // manifest, with the command that fixes it.

internal/cli/gen.go

@@ -29,8 +29,6 @@ var (
 		"already exists (use --force to overwrite)")
 	// errEmptyOutput indicates --output given with an empty value.
 	errEmptyOutput = errors.New("--output must not be empty")
-	// errEmptySignKey indicates --sign-key given with an empty value.
-	errEmptySignKey = errors.New("--sign-key must not be empty")
 )
 
 // reportEnumProgress renders enumeration progress until the channel
@@ -123,8 +121,7 @@ func (mfa *CLIApp) outputPath(cmd *cli.Command) (string, error) {
 }
 
 // buildScannerOptions constructs scanner options from the CLI flags and
-// the path the manifest is written to. A --sign-key given with an empty
+// the path the manifest is written to.
-// value is refused.
 func (mfa *CLIApp) buildScannerOptions(
 	cmd *cli.Command, output string,
 ) (*mfer.ScannerOptions, error) {
@@ -147,12 +144,7 @@ func (mfa *CLIApp) buildScannerOptions(
 	}
 
 	// Set up signing options if sign-key is provided
-	if cmd.IsSet("sign-key") {
+	if signKey := cmd.String("sign-key"); signKey != "" {
-		signKey := cmd.String("sign-key")
-		if signKey == "" {
-			return nil, errEmptySignKey
-		}
-
 		signing, err := mfa.signingOptions(signKey)
 		if err != nil {
 			return nil, err

internal/cli/mfer.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"runtime/debug"
 	"time"
 
 	"github.com/spf13/afero"
 	"github.com/urfave/cli/v3"
 	"sneak.berlin/go/mfer/internal/log"
+	"sneak.berlin/go/mfer/mfer"
 )
 
 // Command and flag names shared across command definitions and tests.
@@ -48,16 +48,13 @@ func manifestTempPath(out string) string {
 // errUnknownCommand indicates an unrecognized command argument.
 var errUnknownCommand = errors.New("unknown command")
 
-// errUnexpectedArgument indicates a second argument to a command that takes
-// one.
-var errUnexpectedArgument = errors.New("unexpected argument")
-
 // CLIApp is the main CLI application container. It holds configuration,
 // I/O streams, and filesystem abstraction to enable testing and flexibility.
 //
 //nolint:revive // established name used throughout the codebase and tests
 type CLIApp struct {
 	appname     string
+	version     string
 	gitrev      string
 	startupTime time.Time
 	exitCode    int
@@ -86,26 +83,13 @@ const banner = `
    \  \:\        \  \:\      \  \::/       \  \:\
     \__\/         \__\/       \__\/         \__\/`
 
-// VersionString returns the version mfer reports: the revision the build
+// VersionString returns the version and git revision formatted for display.
-// stamped into main.Gitrev or, when it stamped none, as with `go install`,
-// the main module's version from the binary's build information.
 func (mfa *CLIApp) VersionString() string {
 	if mfa.gitrev != "" {
-		return mfa.gitrev
+		return fmt.Sprintf("%s (%s)", mfer.Version, mfa.gitrev)
 	}
 
-	return moduleVersion(debug.ReadBuildInfo())
+	return mfer.Version
-}
-
-// moduleVersion returns the main module's version from the binary's build
-// information, or "unknown" when the binary has none or it holds no version,
-// as in a build with GO111MODULE=off.
-func moduleVersion(info *debug.BuildInfo, ok bool) string {
-	if !ok || info.Main.Version == "" {
-		return "unknown"
-	}
-
-	return info.Main.Version
 }
 
 // printVersion writes the version line shared by the --version flag and the
@@ -118,7 +102,8 @@ func (mfa *CLIApp) printBanner() {
 	if log.GetLevel() <= log.InfoLevel {
 		_, _ = fmt.Fprintln(mfa.Stdout, banner)
 		_, _ = fmt.Fprintf(mfa.Stdout,
-			"        mfer by @sneak: %s\n", mfa.VersionString())
+			"        mfer by @sneak: v%s released %s\n",
+			mfer.Version, mfer.ReleaseDate)
 		_, _ = fmt.Fprintln(mfa.Stdout, "            https://sneak.berlin/go/mfer")
 	}
 }
@@ -169,25 +154,13 @@ func commonFlags() []cli.Flag {
 	}
 }
 
-// refuseExtraArgs is the ArgValidator of the commands that take one
+// stopOnFirstArg returns the StopOnNthArg setting every command uses: flags
-// argument: it refuses a second one, naming it.
+// are read only before the command's first argument, and everything after it
-func refuseExtraArgs(_ context.Context, cmd *cli.Command) error {
+// is an argument, as with urfave/cli v2. So `mfer gen d -v` names a path "-v".
-	if cmd.Args().Len() > 1 {
+func stopOnFirstArg() *int {
-		return fmt.Errorf("%w %q", errUnexpectedArgument, cmd.Args().Get(1))
+	n := 1
-	}
 
-	return nil
+	return &n
-}
-
-// showCommandHelp is the CommandNotFound of the commands that take a path or
-// URL. Those commands set HideHelpCommand, so that a path or URL named help or
-// h is an argument rather than urfave/cli's help command; each sets it itself,
-// because on the root it would also remove `mfer help`. With --help,
-// urfave/cli looks the command's first argument up as a help topic, so
-// `check DIR --help` asks for a topic DIR and finds none; this prints the
-// command's own help instead, as `check --help` does.
-func showCommandHelp(ctx context.Context, cmd *cli.Command, _ string) {
-	_ = cli.ShowCommandHelp(ctx, cmd.Root(), cmd.Name)
 }
 
 // requireSignatureFlag returns the --require-signature flag taken by the
@@ -213,12 +186,11 @@ func includePermissionsFlag() *cli.BoolFlag {
 
 func (mfa *CLIApp) generateCommand() *cli.Command {
 	return &cli.Command{
-		Name:            cmdGenerate,
+		Name:         cmdGenerate,
-		Aliases:         []string{"gen"},
+		Aliases:      []string{"gen"},
-		Usage:           "Generate manifest file",
+		Usage:        "Generate manifest file",
-		ArgsUsage:       "[path ...]",
+		ArgsUsage:    "[path ...]",
-		HideHelpCommand: true,
+		StopOnNthArg: stopOnFirstArg(),
-		CommandNotFound: showCommandHelp,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			mfa.setVerbosity(cmd)
 			mfa.printBanner()
@@ -277,12 +249,10 @@ func (mfa *CLIApp) generateCommand() *cli.Command {
 
 func (mfa *CLIApp) checkCommand() *cli.Command {
 	return &cli.Command{
-		Name:            cmdCheck,
+		Name:         cmdCheck,
-		Usage:           "Validate files using manifest file",
+		Usage:        "Validate files using manifest file",
-		ArgsUsage:       manifestArgsUsage,
+		ArgsUsage:    manifestArgsUsage,
-		ArgValidator:    refuseExtraArgs,
+		StopOnNthArg: stopOnFirstArg(),
-		HideHelpCommand: true,
-		CommandNotFound: showCommandHelp,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			mfa.setVerbosity(cmd)
 			mfa.printBanner()
@@ -313,12 +283,10 @@ func (mfa *CLIApp) checkCommand() *cli.Command {
 
 func (mfa *CLIApp) freshenCommand() *cli.Command {
 	return &cli.Command{
-		Name:            cmdFreshen,
+		Name:         cmdFreshen,
-		Usage:           "Update manifest with changed, new, and removed files",
+		Usage:        "Update manifest with changed, new, and removed files",
-		ArgsUsage:       manifestArgsUsage,
+		ArgsUsage:    manifestArgsUsage,
-		ArgValidator:    refuseExtraArgs,
+		StopOnNthArg: stopOnFirstArg(),
-		HideHelpCommand: true,
-		CommandNotFound: showCommandHelp,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			mfa.setVerbosity(cmd)
 			mfa.printBanner()
@@ -366,12 +334,10 @@ func (mfa *CLIApp) freshenCommand() *cli.Command {
 
 func (mfa *CLIApp) exportCommand() *cli.Command {
 	return &cli.Command{
-		Name:            cmdExport,
+		Name:         cmdExport,
-		Usage:           "Export manifest contents as JSON",
+		Usage:        "Export manifest contents as JSON",
-		ArgsUsage:       "[manifest file or URL]",
+		ArgsUsage:    "[manifest file or URL]",
-		ArgValidator:    refuseExtraArgs,
+		StopOnNthArg: stopOnFirstArg(),
-		HideHelpCommand: true,
-		CommandNotFound: showCommandHelp,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			mfa.setVerbosity(cmd)
 
@@ -382,8 +348,9 @@ func (mfa *CLIApp) exportCommand() *cli.Command {
 
 func (mfa *CLIApp) versionCommand() *cli.Command {
 	return &cli.Command{
-		Name:  cmdVersion,
+		Name:         cmdVersion,
-		Usage: "Show version",
+		Usage:        "Show version",
+		StopOnNthArg: stopOnFirstArg(),
 		Action: func(context.Context, *cli.Command) error {
 			mfa.printVersion()
 
@@ -394,14 +361,12 @@ func (mfa *CLIApp) versionCommand() *cli.Command {
 
 func (mfa *CLIApp) listCommand() *cli.Command {
 	return &cli.Command{
-		Name:            cmdList,
+		Name:         cmdList,
-		Aliases:         []string{"ls"},
+		Aliases:      []string{"ls"},
-		Usage:           "List files in manifest",
+		Usage:        "List files in manifest",
-		ArgsUsage:       manifestArgsUsage,
+		ArgsUsage:    manifestArgsUsage,
-		ArgValidator:    refuseExtraArgs,
+		StopOnNthArg: stopOnFirstArg(),
-		HideHelpCommand: true,
+		Action:       mfa.listManifestOperation,
-		CommandNotFound: showCommandHelp,
-		Action:          mfa.listManifestOperation,
 		Flags: []cli.Flag{
 			&cli.BoolFlag{
 				Name:    "long",
@@ -418,12 +383,10 @@ func (mfa *CLIApp) listCommand() *cli.Command {
 
 func (mfa *CLIApp) fetchCommand() *cli.Command {
 	return &cli.Command{
-		Name:            cmdFetch,
+		Name:         cmdFetch,
-		Usage:           "fetch manifest and referenced files",
+		Usage:        "fetch manifest and referenced files",
-		ArgsUsage:       "URL",
+		ArgsUsage:    "URL",
-		ArgValidator:    refuseExtraArgs,
+		StopOnNthArg: stopOnFirstArg(),
-		HideHelpCommand: true,
-		CommandNotFound: showCommandHelp,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			mfa.setVerbosity(cmd)
 			mfa.printBanner()
@@ -482,8 +445,9 @@ func (mfa *CLIApp) run(args []string) {
 		Writer:                mfa.Stdout,
 		// v3 writes its "Incorrect Usage" line to ErrWriter; v2 wrote it to
 		// stdout, before the help, so it stays on stdout.
-		ErrWriter: mfa.Stdout,
+		ErrWriter:    mfa.Stdout,
-		Flags:     commonFlags(),
+		Flags:        commonFlags(),
+		StopOnNthArg: stopOnFirstArg(),
 		Action: func(_ context.Context, cmd *cli.Command) error {
 			if cmd.Args().Len() > 0 {
 				return fmt.Errorf("%w %q", errUnknownCommand, cmd.Args().First())

internal/cli/pipe_test.go

@@ -1,94 +0,0 @@
-//go:build unix
-
-//nolint:testpackage // white-box tests exercise unexported internals
-package cli
-
-import (
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-	"time"
-
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const (
-	// testPipe is the name of the named pipe the pipe tests make in a tree.
-	testPipe = "pipe"
-
-	// pipeDeadline is how long a test lets a run go before it opens the
-	// test's named pipes for writing.
-	pipeDeadline = 5 * time.Second
-)
-
-// makePipe makes a named pipe at path. Opening a named pipe for reading
-// blocks until it is opened for writing, so once pipeDeadline has passed,
-// unless the test has ended, makePipe opens it for writing and closes it
-// again. A run that wrongly reads the pipe then ends, and the test fails on
-// what it reports instead of hanging. That lets one read through, so each
-// path a wrong run would read gets a pipe of its own.
-func makePipe(t *testing.T, path string) {
-	t.Helper()
-
-	require.NoError(t, syscall.Mkfifo(path, 0o600))
-
-	timer := time.AfterFunc(pipeDeadline, func() {
-		f, err := os.OpenFile(path, os.O_WRONLY, 0) //nolint:gosec // test-controlled path
-		if err == nil {
-			_ = f.Close()
-		}
-	})
-
-	t.Cleanup(func() { timer.Stop() })
-}
-
-// TestGenerateSkipsPipe runs gen -v on a tree holding a named pipe: the
-// manifest lists the regular file only, and gen names the pipe it skipped.
-func TestGenerateSkipsPipe(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	fs := afero.NewOsFs()
-	writeTestFile(t, fs, filepath.Join(dir, testFileTxt), "regular")
-	makePipe(t, filepath.Join(dir, testPipe))
-
-	opts := testOpts([]string{testApp, cmdGenerate, "-v", dir}, fs)
-	require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-
-	assert.Equal(t, []string{testFileTxt},
-		manifestPaths(t, fs, filepath.Join(dir, defaultManifestName)))
-	assert.Contains(t, testStderr(t, opts), "skipping pipe: not a regular file")
-}
-
-// TestFreshenSkipsPipes adds a named pipe to a tree after gen made its
-// manifest, and a symlink to another pipe. freshen -v --follow-symlinks
-// leaves the manifest listing the regular file only, and names both entries
-// it skipped.
-func TestFreshenSkipsPipes(t *testing.T) {
-	t.Parallel()
-
-	fs := afero.NewOsFs()
-	root, manifestPath := setupFreshenDir(t, fs,
-		map[string]string{testFileTxt: "regular"})
-	makePipe(t, filepath.Join(root, testPipe))
-
-	// The symlink points outside the tree, so no pipe is read twice.
-	target := filepath.Join(t.TempDir(), testPipe)
-	makePipe(t, target)
-	require.NoError(t, os.Symlink(target, filepath.Join(root, testLink)))
-
-	opts := testOpts([]string{
-		testApp, cmdFreshen, "-v", "--follow-symlinks",
-		testFlagBase, root, manifestPath,
-	}, fs)
-	require.Equal(t, 0, runCLI(opts), "stderr: %s", testStderr(t, opts))
-
-	assert.Equal(t, []string{testFileTxt}, manifestPaths(t, fs, manifestPath))
-
-	stderr := testStderr(t, opts)
-	assert.Contains(t, stderr, "skipping pipe: not a regular file")
-	assert.Contains(t, stderr, "skipping link: not a regular file")
-}

internal/cli/signing.go

@@ -23,9 +23,9 @@ var errNoPassphrase = errors.New(
 	"signing key is protected: set " + envSignKeyPassphrase + " to its passphrase")
 
 // signingOptions returns the signing options for the OpenPGP secret key in
-// the file path, which must be able to sign. The passphrase of a protected
+// the file path. The passphrase of a protected key comes from
-// key comes from MFER_SIGN_KEY_PASSPHRASE, or else from the terminal on
+// MFER_SIGN_KEY_PASSPHRASE, or else from the terminal on stdin, and must
-// stdin, and must unlock the key.
+// unlock the key.
 func (mfa *CLIApp) signingOptions(path string) (*mfer.SigningOptions, error) {
 	secretKey, err := afero.ReadFile(mfa.Fs, path)
 	if err != nil {
@@ -40,16 +40,17 @@ func (mfa *CLIApp) signingOptions(path string) (*mfer.SigningOptions, error) {
 	log.Infof("signing manifest with the OpenPGP key in %s", path)
 
 	opts := &mfer.SigningOptions{SecretKey: secretKey}
-	if protected {
+	if !protected {
-		opts.Passphrase, err = mfa.readPassphrase(path)
+		return opts, nil
-		if err != nil {
-			return nil, err
-		}
 	}
 
-	// gen and freshen read the signing options before any file, so a key
+	opts.Passphrase, err = mfa.readPassphrase(path)
-	// that cannot sign, or a wrong passphrase, stops them before they hash
+	if err != nil {
-	// anything.
+		return nil, err
+	}
+
+	// gen and freshen read the signing options before any file, so a
+	// wrong passphrase stops them before they hash anything.
 	err = mfer.CheckSigningKey(opts)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", path, err)

internal/cli/signing_test.go

@@ -4,16 +4,10 @@ package cli
 import (
 	"bufio"
 	"io"
-	"net/http"
-	"net/http/httptest"
 	"path/filepath"
-	"slices"
 	"strings"
-	"sync/atomic"
 	"testing"
-	"time"
 
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/creack/pty"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
@@ -39,7 +33,7 @@ func TestGenAndFreshenSignWithKeyFile(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Setenv(envSignKeyPassphrase, string(passphrase))
 
-			secretKey, fingerprint := testSecretKey(t, passphrase, nil)
+			secretKey, fingerprint := testSecretKey(t, passphrase)
 
 			fs := afero.NewOsFs()
 			keyFile := filepath.Join(t.TempDir(), "key.asc")
@@ -77,110 +71,13 @@ func TestGenAndFreshenSignWithKeyFile(t *testing.T) {
 	}
 }
 
-// TestFreshenSignedManifestNeedsSignKey runs freshen on a signed manifest
-// after a file is added. Without --sign-key it must fail, naming the
-// signer and --sign-key, and leave the manifest as it was; with --sign-key
-// it must rewrite the manifest, signed.
-func TestFreshenSignedManifestNeedsSignKey(t *testing.T) {
-	t.Setenv(envSignKeyPassphrase, "")
-
-	secretKey, fingerprint := testSecretKey(t, nil, nil)
-
-	fs := afero.NewOsFs()
-	keyFile := filepath.Join(t.TempDir(), "key.asc")
-	root := t.TempDir()
-	manifestPath := filepath.Join(root, defaultManifestName)
-
-	require.NoError(t, afero.WriteFile(fs, keyFile, secretKey, 0o600))
-	writeTestFile(t, fs, filepath.Join(root, testFileTxt), "hello")
-
-	opts := testOpts([]string{
-		testApp, cmdGenerate, "-q", testFlagSignKey, keyFile,
-		"-o", manifestPath, root,
-	}, fs)
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-	before, err := afero.ReadFile(fs, manifestPath)
-	require.NoError(t, err)
-
-	writeTestFile(t, fs, filepath.Join(root, "added.txt"), "added")
-
-	opts = testOpts([]string{testApp, cmdFreshen, "-q", manifestPath}, fs)
-	assert.Equal(t, 1, runCLI(opts))
-	assert.Contains(t, testStderr(t, opts), fingerprint)
-	assert.Contains(t, testStderr(t, opts), testFlagSignKey)
-
-	after, err := afero.ReadFile(fs, manifestPath)
-	require.NoError(t, err)
-	assert.Equal(t, before, after)
-
-	opts = testOpts([]string{
-		testApp, cmdFreshen, "-q", testFlagSignKey, keyFile, manifestPath,
-	}, fs)
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-	opts = testOpts([]string{
-		testApp, cmdCheck, "-q",
-		"--" + flagRequireSignature, fingerprint, manifestPath,
-	}, fs)
-	require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-	assert.Len(t, manifestFiles(t, fs, manifestPath), 2)
-}
-
-// TestFreshenSignsUnchangedTree runs freshen with --sign-key on a tree that
-// has not changed since gen made its unsigned manifest. freshen must
-// rewrite the manifest signed by that key. Run again with the same key it
-// must leave the manifest as it is; with another key it must rewrite it
-// signed by that one.
-func TestFreshenSignsUnchangedTree(t *testing.T) {
-	t.Setenv(envSignKeyPassphrase, "")
-
-	fs := afero.NewOsFs()
-	_, manifestPath := setupFreshenDir(t, fs, map[string]string{testFileTxt: "hello"})
-
-	newKeyFile := func() (string, string) {
-		secretKey, fingerprint := testSecretKey(t, nil, nil)
-		keyFile := filepath.Join(t.TempDir(), "key.asc")
-		require.NoError(t, afero.WriteFile(fs, keyFile, secretKey, 0o600))
-
-		return keyFile, fingerprint
-	}
-
-	freshenAndCheckSignedBy := func(keyFile, fingerprint string) {
-		opts := testOpts([]string{
-			testApp, cmdFreshen, "-q", testFlagSignKey, keyFile, manifestPath,
-		}, fs)
-		require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-
-		opts = testOpts([]string{
-			testApp, cmdCheck, "-q",
-			"--" + flagRequireSignature, fingerprint, manifestPath,
-		}, fs)
-		require.Equal(t, 0, runCLI(opts), testStderr(t, opts))
-	}
-
-	keyFile, fingerprint := newKeyFile()
-	freshenAndCheckSignedBy(keyFile, fingerprint)
-
-	before, err := afero.ReadFile(fs, manifestPath)
-	require.NoError(t, err)
-
-	freshenAndCheckSignedBy(keyFile, fingerprint)
-
-	after, err := afero.ReadFile(fs, manifestPath)
-	require.NoError(t, err)
-	assert.Equal(t, before, after, "manifest already signed by the key was rewritten")
-
-	freshenAndCheckSignedBy(newKeyFile())
-}
-
 // TestSignWithProtectedKeyNeedsPassphrase runs gen with a protected key,
 // with MFER_SIGN_KEY_PASSPHRASE empty and no terminal to ask on. gen must
 // fail, naming the variable, and write no manifest.
 func TestSignWithProtectedKeyNeedsPassphrase(t *testing.T) {
 	t.Setenv(envSignKeyPassphrase, "")
 
-	secretKey, _ := testSecretKey(t, []byte("secret"), nil)
+	secretKey, _ := testSecretKey(t, []byte("secret"))
 
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, testKeyFile, secretKey, 0o600))
@@ -200,48 +97,29 @@ func TestSignWithProtectedKeyNeedsPassphrase(t *testing.T) {
 	assert.False(t, exists)
 }
 
-// TestSignWithKeyThatCannotSignFailsFirst runs gen on a directory and
+// TestSignWithWrongPassphraseFailsFirst runs gen on a directory and
-// freshen on a manifest, neither of which exists, with keys that cannot
+// freshen on a manifest, neither of which exists, with a protected key and
-// sign: a protected key with a wrong MFER_SIGN_KEY_PASSPHRASE, a key that
+// a wrong MFER_SIGN_KEY_PASSPHRASE. Each must fail to unlock the key: it
-// expired in 2020, and a version 6 key. Each run must fail on the key: it
+// does that before it reads any file, so a missing file goes unnoticed.
-// checks the key before it reads any file, so a missing file goes
+func TestSignWithWrongPassphraseFailsFirst(t *testing.T) {
-// unnoticed.
-func TestSignWithKeyThatCannotSignFailsFirst(t *testing.T) {
 	t.Setenv(envSignKeyPassphrase, "wrong")
 
-	wrongPassphrase, _ := testSecretKey(t, []byte("right"), nil)
+	secretKey, _ := testSecretKey(t, []byte("right"))
 
-	made := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
+	fs := afero.NewMemMapFs()
-	expired, _ := testSecretKey(t, nil, &packet.Config{
+	require.NoError(t, afero.WriteFile(fs, testKeyFile, secretKey, 0o600))
-		Algorithm:       packet.PubKeyAlgoEdDSA,
-		Time:            func() time.Time { return made },
-		KeyLifetimeSecs: uint32((24 * time.Hour).Seconds()),
-	})
 
-	version6, _ := testSecretKey(t, nil, &packet.Config{
+	for _, args := range [][]string{
-		Algorithm: packet.PubKeyAlgoEd25519,
+		{
-		V6Keys:    true,
+			testApp, cmdGenerate, "-q", testFlagSignKey, testKeyFile,
-	})
+			"-o", testMF, "/missing",
-
+		},
-	for want, secretKey := range map[string][]byte{
+		{testApp, cmdFreshen, "-q", testFlagSignKey, testKeyFile, "/missing.mf"},
-		"unlock signing key":                           wrongPassphrase,
-		"signing key cannot sign":                      expired,
-		"signing key must be an OpenPGP version 4 key": version6,
 	} {
-		fs := afero.NewMemMapFs()
+		opts := testOpts(args, fs)
-		require.NoError(t, afero.WriteFile(fs, testKeyFile, secretKey, 0o600))
+		assert.Equal(t, 1, runCLI(opts), args[1])
-
+		assert.Contains(t, testStderr(t, opts),
-		for _, args := range [][]string{
+			testKeyFile+": unlock signing key", args[1])
-			{
-				testApp, cmdGenerate, "-q", testFlagSignKey, testKeyFile,
-				"-o", testMF, "/missing",
-			},
-			{testApp, cmdFreshen, "-q", testFlagSignKey, testKeyFile, "/missing.mf"},
-		} {
-			opts := testOpts(args, fs)
-			assert.Equal(t, 1, runCLI(opts), args[1], want)
-			assert.Contains(t, testStderr(t, opts), testKeyFile+": "+want, args[1])
-		}
 	}
 }
 
@@ -252,7 +130,7 @@ func TestSignWithKeyThatCannotSignFailsFirst(t *testing.T) {
 func TestGenAsksForPassphraseOnTerminal(t *testing.T) {
 	t.Setenv(envSignKeyPassphrase, "")
 
-	secretKey, fingerprint := testSecretKey(t, []byte("passphrase"), nil)
+	secretKey, fingerprint := testSecretKey(t, []byte("passphrase"))
 
 	fs := afero.NewOsFs()
 	keyFile := filepath.Join(t.TempDir(), "key.asc")
@@ -308,105 +186,3 @@ func TestGenAsksForPassphraseOnTerminal(t *testing.T) {
 	}, fs)
 	require.Equal(t, 0, runCLI(check), testStderr(t, check))
 }
-
-// assertEmptySignKeyRefused runs gen and freshen, each with flags, on a
-// directory holding a file and an unsigned manifest. Each must fail,
-// naming --sign-key, and leave the manifest as it was.
-func assertEmptySignKeyRefused(t *testing.T, flags ...string) {
-	t.Helper()
-
-	manifest := manifestOf(t, map[string][]byte{testFileTxt: []byte("listed")})
-
-	for command, rest := range map[string][]string{
-		cmdGenerate: {"-q", "-f", "-o", testMF, testDir},
-		cmdFreshen:  {"-q", testMF},
-	} {
-		fs := afero.NewMemMapFs()
-		require.NoError(t, fs.MkdirAll(testDir, 0o755))
-		writeTestFile(t, fs, testFile1, "hello")
-		require.NoError(t, afero.WriteFile(fs, testMF, manifest, 0o644))
-
-		opts := testOpts(slices.Concat([]string{testApp, command}, flags, rest), fs)
-		assert.Equal(t, 1, runCLI(opts), command)
-		assert.Contains(t, testStderr(t, opts), errEmptySignKey.Error(), command)
-
-		content, err := afero.ReadFile(fs, testMF)
-		require.NoError(t, err)
-		assert.Equal(t, manifest, content, command)
-	}
-}
-
-// TestGenAndFreshenRefuseEmptySignKey runs gen and freshen with --sign-key
-// given an empty value, as an unset shell variable gives it.
-func TestGenAndFreshenRefuseEmptySignKey(t *testing.T) {
-	t.Parallel()
-
-	assertEmptySignKeyRefused(t, testFlagSignKey, "")
-}
-
-// TestGenAndFreshenRefuseEmptySignKeyFromEnvironment runs gen and freshen
-// with MFER_SIGN_KEY set to an empty string.
-func TestGenAndFreshenRefuseEmptySignKeyFromEnvironment(t *testing.T) {
-	t.Setenv("MFER_SIGN_KEY", "")
-
-	assertEmptySignKeyRefused(t)
-}
-
-// assertEmptyFingerprintRefused runs check on an unsigned manifest, and
-// fetch of that manifest from a server, each with flags. Each must refuse
-// the empty fingerprint as malformed, and fetch must request nothing.
-func assertEmptyFingerprintRefused(t *testing.T, flags ...string) {
-	t.Helper()
-
-	const want = "invalid fingerprint: must be exactly 40 hex characters, got 0"
-
-	files := map[string][]byte{testFileTxt: []byte("listed")}
-	manifest := manifestOf(t, files)
-
-	fs := afero.NewMemMapFs()
-	require.NoError(t, fs.MkdirAll(testDir, 0o755))
-	writeTestFile(t, fs, filepath.Join(testDir, testFileTxt), "listed")
-	require.NoError(t, afero.WriteFile(fs, testMF, manifest, 0o644))
-
-	opts := testOpts(slices.Concat(
-		[]string{testApp, cmdCheck, "-q"}, flags, []string{testMF},
-	), fs)
-	assert.Equal(t, 1, runCLI(opts), cmdCheck)
-	assert.Contains(t, testStderr(t, opts), want, cmdCheck)
-
-	var requests atomic.Int32
-
-	tree := fetchTestHandler(manifest, files)
-
-	server := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			requests.Add(1)
-			tree.ServeHTTP(w, r)
-		}))
-	defer server.Close()
-
-	opts = testOpts(slices.Concat(
-		[]string{testApp, cmdFetch, "-q", "--" + flagDest, t.TempDir()},
-		flags, []string{server.URL},
-	), afero.NewOsFs())
-	assert.Equal(t, 1, runCLI(opts), cmdFetch)
-	assert.Contains(t, testStderr(t, opts), want, cmdFetch)
-	assert.Zero(t, requests.Load(), "fetch made a request")
-}
-
-// TestCheckAndFetchRefuseEmptyRequireSignature runs check and fetch with
-// --require-signature given an empty value, as an unset shell variable
-// gives it.
-func TestCheckAndFetchRefuseEmptyRequireSignature(t *testing.T) {
-	t.Parallel()
-
-	assertEmptyFingerprintRefused(t, "--"+flagRequireSignature, "")
-}
-
-// TestCheckAndFetchRefuseEmptyRequireSignatureFromEnvironment runs check
-// and fetch with MFER_REQUIRE_SIGNATURE set to an empty string.
-func TestCheckAndFetchRefuseEmptyRequireSignatureFromEnvironment(t *testing.T) {
-	t.Setenv("MFER_REQUIRE_SIGNATURE", "")
-
-	assertEmptyFingerprintRefused(t)
-}

mfer/builder.go

@@ -34,7 +34,6 @@ var (
 	errPathAbsolute     = errors.New("is absolute; must be relative")
 	errPathEmptySegment = errors.New("contains empty segment")
 	errPathDotDot       = errors.New("contains '..' segment")
-	errPathDot          = errors.New("contains '.' segment")
 	errSizeMismatch     = errors.New("size mismatch")
 	errNegativeSize     = errors.New("size cannot be negative")
 	errHashNotMultihash = errors.New("hash is not a valid multihash")
@@ -47,7 +46,6 @@ var (
 //   - Must use forward slashes only (no backslashes)
 //   - Must be relative (no leading /)
 //   - Must not contain ".." segments
-//   - Must not contain "." segments
 //   - Must not contain empty segments (no "//")
 //   - Must not be empty
 func ValidatePath(p string) error {
@@ -75,10 +73,6 @@ func ValidatePath(p string) error {
 		if seg == ".." {
 			return fmt.Errorf("path %q %w", p, errPathDotDot)
 		}
-
-		if seg == "." {
-			return fmt.Errorf("path %q %w", p, errPathDot)
-		}
 	}
 
 	return nil

mfer/builder_test.go

@@ -286,9 +286,6 @@ func TestValidatePath(t *testing.T) {
 		{"has/../traversal", "dot-dot segment"},
 		{"has//double", "empty segment"},
 		{"..", "just dot-dot"},
-		{"./a.txt", "leading dot segment"},
-		{"has/./dot", "interior dot segment"},
-		{".", "just dot"},
 		{string([]byte{0xff, 0xfe}), "invalid UTF-8"},
 	}
 	for _, tt := range invalid {

mfer/checker.go

@@ -264,12 +264,11 @@ func (c *Checker) Check(
 	return nil
 }
 
-// FindExtraFiles walks the filesystem and reports the regular files, and
+// FindExtraFiles walks the filesystem and reports files not in the manifest,
-// symlinks to them, that are not in the manifest, hidden files and
+// hidden files and directories included. The manifest file itself is not
-// directories included. The manifest file itself is not reported. Anything
+// reported. Anything the search cannot read, such as a directory that cannot
-// the search cannot read, such as a directory that cannot be listed, is
+// be listed, is reported with StatusError and the search goes on. Results are
-// reported with StatusError and the search goes on. Results are sent to the
+// sent to the results channel. The channel is closed when done.
-// results channel. The channel is closed when done.
 func (c *Checker) FindExtraFiles(ctx context.Context, results chan<- Result) error {
 	if results != nil {
 		defer close(results)
@@ -328,13 +327,6 @@ func (c *Checker) FindExtraFiles(ctx context.Context, results chan<- Result) err
 			}
 		}
 
-		// gen lists regular files and symlinks to them only, so a named
-		// pipe, a socket, a device, a symlink to a directory and a broken
-		// symlink are never reported.
-		if !info.Mode().IsRegular() {
-			return nil
-		}
-
 		// Skip the manifest file itself, however its path is spelled
 		if os.SameFile(info, c.manifestInfo) {
 			return nil
@@ -379,15 +371,6 @@ func (c *Checker) checkFile(entry *MFFilePath, checkedBytes *FileSize) Result {
 		return Result{Path: relPath, Status: StatusError, Message: err.Error()}
 	}
 
-	// Opening a named pipe can block, and reading a device may never end.
-	if !info.Mode().IsRegular() {
-		return Result{
-			Path:    relPath,
-			Status:  StatusError,
-			Message: "not a regular file",
-		}
-	}
-
 	// Check size
 	if info.Size() != entry.GetSize() {
 		*checkedBytes += FileSize(info.Size())

mfer/constants.go

@@ -1,6 +1,12 @@
 package mfer
 
 const (
+	// Version is the current mfer release version.
+	Version = "0.1.0"
+
+	// ReleaseDate is the date on which Version was released.
+	ReleaseDate = "2025-12-17"
+
 	// MaxDecompressedSize is the maximum allowed size of decompressed manifest
 	// data (256 MiB). This prevents decompression bombs from consuming excessive
 	// memory.

mfer/deserialize.go

@@ -27,7 +27,6 @@ var (
 	errUUIDMismatch         = errors.New("outer and inner UUID mismatch")
 	errInvalidFileFormat    = errors.New("invalid file format")
 	errInvalidManifestPath  = errors.New("invalid file entry")
-	errEntryMissingHash     = errors.New("file entry has no hash")
 	errDecodedTooLarge      = errors.New("too much memory needed")
 	errSignerNotSigningKey  = errors.New(
 		"signer is not the fingerprint of the key that made the signature")
@@ -294,8 +293,7 @@ func (m *manifest) deserializeInner() error {
 	// untrusted .mf. Reject loudly on the first offender rather than
 	// dropping entries, which would let a hostile manifest hide files from a
 	// check. A path listed twice is refused too: check would check the one
-	// file against both entries. So is an entry with no hash: there is
+	// file against both entries.
-	// nothing to check the file against.
 	seen := make(map[string]bool, len(m.pbInner.GetFiles()))
 
 	for _, f := range m.pbInner.GetFiles() {
@@ -304,10 +302,6 @@ func (m *manifest) deserializeInner() error {
 			return fmt.Errorf("%w: %w", errInvalidManifestPath, err)
 		}
 
-		if len(f.GetHashes()) == 0 {
-			return fmt.Errorf("%w: %q", errEntryMissingHash, f.GetPath())
-		}
-
 		if seen[f.GetPath()] {
 			return fmt.Errorf("%w %q", errDuplicatePath, f.GetPath())
 		}

mfer/deserialize_path_test.go

@@ -80,8 +80,6 @@ func TestDeserializeRejectsInvalidEntryPaths(t *testing.T) {
 	}{
 		{"parent traversal", "../escape"},
 		{"interior traversal", "a/../../escape"},
-		{"leading dot segment", "./a.txt"},
-		{"interior dot segment", "dir/./a.txt"},
 		{"absolute path", "/etc/passwd"},
 		{"backslash path", `a\b`},
 		{"double slash", "a//b"},
@@ -167,24 +165,6 @@ func TestDeserializeRefusesPathListedTwice(t *testing.T) {
 	}
 }
 
-// A manifest holding a file entry with no hash is refused as it is loaded,
-// naming the path: there is nothing to check the file against.
-func TestDeserializeRefusesEntryWithNoHash(t *testing.T) {
-	t.Parallel()
-
-	id := uuid.NewV4()
-	inner, err := proto.Marshal(&MFFile{
-		Version: MFFile_VERSION_ONE,
-		Files:   []*MFFilePath{{Path: "x", Size: 1}},
-		Uuid:    id[:],
-	})
-	require.NoError(t, err)
-
-	_, err = NewManifestFromReader(bytes.NewReader(wrapInner(t, id, inner)))
-	require.ErrorIs(t, err, errEntryMissingHash)
-	require.EqualError(t, err, `file entry has no hash: "x"`)
-}
-
 // Entries of a path, an empty hash, an empty MIME type and empty modification
 // and change times are counted at 432 bytes each (176 + 112 + 16 + 64 + 64)
 // and take 16 bytes plus the path to encode. A 37-character path makes that
@@ -249,8 +229,6 @@ func TestDeserializeDropsUnknownFields(t *testing.T) {
 
 	entry := protowire.AppendTag(nil, 1, protowire.BytesType) // MFFilePath.path
 	entry = protowire.AppendString(entry, "a")
-	entry = protowire.AppendTag(entry, 3, protowire.BytesType) // MFFilePath.hashes
-	entry = protowire.AppendBytes(entry, nil)
 	entry = append(entry, unknown...)
 
 	id := uuid.NewV4()

mfer/deserialize_test.go

@@ -3,9 +3,6 @@ package mfer
 
 import (
 	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
-	"os"
 	"testing"
 	"uuid"
 
@@ -55,38 +52,3 @@ func TestReadAtMost(t *testing.T) {
 		"file exceeds maximum allowed size of 65536 bytes")
 	assert.Equal(t, maxSize-1, input.Len(), "bytes left unread")
 }
-
-// TestFormatTestVector checks the test vector that docs/FORMAT.md shows: the
-// SHA-256 of the whole file, so that any change to the file fails, then loads
-// it, verifies its signature, and checks the canonical string and the signer
-// the document gives for it.
-func TestFormatTestVector(t *testing.T) {
-	t.Parallel()
-
-	const (
-		path       = "testdata/test-vector.mf"
-		fileSHA256 = "5864187d671b2a55f8e015f858248f92c51956b549cf548b6bb54477c2407fd4"
-		signer     = "5E962A37590D855B467D20294947A60319611E6F"
-	)
-
-	data, err := os.ReadFile(path)
-	require.NoError(t, err)
-
-	sum := sha256.Sum256(data)
-	require.Equal(t, fileSHA256, hex.EncodeToString(sum[:]))
-
-	m, err := NewManifestFromFile(&ManifestFromFileOptions{Path: path})
-	require.NoError(t, err)
-
-	canonicalString, err := m.signatureString()
-	require.NoError(t, err)
-	assert.Equal(t, "ZNAVSRFG-92197fd532bc40908aa9f86e5518b56c-"+
-		"12202353553205f036a88cefee3d0d9049ccd8e68bb24011a0b462b5867f1fcc6352",
-		canonicalString)
-
-	keyFingerprint, err := verifySignature([]byte(canonicalString),
-		m.pbOuter.GetSignature(), m.pbOuter.GetSigningPubKey())
-	require.NoError(t, err)
-	assert.Equal(t, signer, keyFingerprint)
-	assert.Equal(t, signer, string(m.pbOuter.GetSigner()))
-}

mfer/errmsg_test.go

@@ -62,12 +62,6 @@ func TestValidatePathMessagesVerbatim(t *testing.T) {
 			want: `path "a/../b" contains '..' segment`,
 			is:   errPathDotDot,
 		},
-		{
-			name: "dot segment",
-			path: "a/./b",
-			want: `path "a/./b" contains '.' segment`,
-			is:   errPathDot,
-		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()

mfer/manifest.go

@@ -47,23 +47,6 @@ func (m *manifest) Files() []*MFFilePath {
 	return m.pbInner.GetFiles()
 }
 
-// Signer returns the fingerprint of the key that made a loaded manifest's
-// signature, which loading the manifest checked, or nil if the manifest is
-// not signed.
-func (m *manifest) Signer() []byte {
-	if len(m.pbOuter.GetSignature()) == 0 {
-		return nil
-	}
-
-	return m.pbOuter.GetSigner()
-}
-
-// CreatedAt returns the createdAt timestamp of a loaded manifest, or nil
-// if the manifest has none.
-func (m *manifest) CreatedAt() *Timestamp {
-	return m.pbInner.GetCreatedAt()
-}
-
 // signatureString generates the canonical string used for signing/verification.
 // Format: MAGIC-UUID-MULTIHASH where UUID and multihash are hex-encoded.
 // Requires pbOuter to be set with Uuid and Sha256 fields.

mfer/manifest_test.go

@@ -1,30 +0,0 @@
-//nolint:testpackage // white-box tests exercise unexported internals
-package mfer
-
-import (
-	"encoding/hex"
-	"testing"
-	"uuid"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestSignatureString checks the canonical string for the UUID and sha256
-// of the example in the Signature Scheme section of docs/FORMAT.md, which
-// shows the same string.
-func TestSignatureString(t *testing.T) {
-	t.Parallel()
-
-	manifestUUID := uuid.MustParse("b0fb6918-6298-443b-ada2-1b162f4dc0b3")
-	sha256Hash, err := hex.DecodeString(
-		"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
-	require.NoError(t, err)
-
-	m := &manifest{pbOuter: &MFFileOuter{Uuid: manifestUUID[:], Sha256: sha256Hash}}
-
-	got, err := m.signatureString()
-	require.NoError(t, err)
-	assert.Equal(t, "ZNAVSRFG-b0fb69186298443bada21b162f4dc0b3-"+
-		"1220e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", got)
-}

mfer/mf.pb.go

@@ -223,14 +223,11 @@ type MFFileOuter struct {
 	// uuid must match the uuid in the inner message
 	Uuid         []byte `protobuf:"bytes,105,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	InnerMessage []byte `protobuf:"bytes,199,opt,name=innerMessage,proto3" json:"innerMessage,omitempty"`
-	// one OpenPGP signature, armored or binary, over the canonical string
+	//detached signature, ascii or binary
-	// ZNAVSRFG-<uuid>-<sha256 as a multihash>, with the uuid as 32
-	// lower-case hex digits and no hyphens, and the multihash in lower-case
-	// hex (see docs/FORMAT.md). A signature is never stored anywhere else.
 	Signature []byte `protobuf:"bytes,201,opt,name=signature,proto3,oneof" json:"signature,omitempty"`
-	// fingerprint of the signing primary key, in upper-case hex
+	//full GPG key id
 	Signer []byte `protobuf:"bytes,202,opt,name=signer,proto3,oneof" json:"signer,omitempty"`
-	// OpenPGP public key of the signer, one primary key, armored or binary
+	//full GPG signing public key, ascii or binary
 	SigningPubKey []byte `protobuf:"bytes,203,opt,name=signingPubKey,proto3,oneof" json:"signingPubKey,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
@@ -333,8 +330,8 @@ type MFFilePath struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// required attributes:
 	// Path invariants: must be valid UTF-8, use forward slashes only,
-	// be relative (no leading /), contain no ".." or "." segments, and
+	// be relative (no leading /), contain no ".." segments, and no
-	// no empty segments (no "//").
+	// empty segments (no "//").
 	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	Size int64  `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
 	// gotta have at least one:

mfer/mf.proto

@@ -32,25 +32,23 @@ message MFFileOuter {
     bytes uuid = 105;
 
     bytes innerMessage = 199;
-
     // 2xx for optional manifest root attributes
+    // think we might use gosignify instead of gpg:
+    // github.com/frankbraun/gosignify
 
-    // one OpenPGP signature, armored or binary, over the canonical string
+    //detached signature, ascii or binary
-    // ZNAVSRFG-<uuid>-<sha256 as a multihash>, with the uuid as 32
-    // lower-case hex digits and no hyphens, and the multihash in lower-case
-    // hex (see docs/FORMAT.md). A signature is never stored anywhere else.
     optional bytes signature = 201;
-    // fingerprint of the signing primary key, in upper-case hex
+    //full GPG key id
     optional bytes signer = 202;
-    // OpenPGP public key of the signer, one primary key, armored or binary
+    //full GPG signing public key, ascii or binary
     optional bytes signingPubKey = 203;
 }
 
 message MFFilePath {
     // required attributes:
     // Path invariants: must be valid UTF-8, use forward slashes only,
-    // be relative (no leading /), contain no ".." or "." segments, and
+    // be relative (no leading /), contain no ".." segments, and no
-    // no empty segments (no "//").
+    // empty segments (no "//").
     string path = 1;
     int64 size = 2;
 

mfer/mf.proto.sha256

@@ -1 +1 @@
-1668b2f6b8639a9213873474e58dbacb3a4ef77cc27c42253cad8dd076e5f206  mf.proto
+3d4dcb0b2f4640dd3ae6bb48b833e9f26ae9771e2d3e88bd646e7f1724dda654  mf.proto

mfer/openpgp.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"slices"
 	"strings"
-	"time"
 
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/armor"
@@ -17,26 +16,12 @@ import (
 )
 
 const (
-	// The tags of OpenPGP signature, key and subkey packets (RFC 9580,
+	// The tags of OpenPGP signature, secret key and public key packets
-	// section 5). Subkeys have tags of their own, so each secret or public
+	// (RFC 9580, section 5). Subkeys have tags of their own, so each
-	// key packet is one primary key.
+	// secret or public key packet is one primary key.
-	signaturePacketTag    = 2
+	signaturePacketTag = 2
-	secretKeyPacketTag    = 5
+	secretKeyPacketTag = 5
-	publicKeyPacketTag    = 6
+	publicKeyPacketTag = 6
-	secretSubkeyPacketTag = 7
-	publicSubkeyPacketTag = 14
-
-	// In the body of a key or subkey packet the algorithm octet follows
-	// the version octet and the four-octet creation time, and from version
-	// 5 on a four-octet length as well (RFC 9580, section 5.5.2).
-	keyAlgorithmOffset            = 5
-	firstKeyVersionWithLength     = 5
-	keyAlgorithmOffsetAfterLength = 9
-
-	// signingKeyVersion is the only OpenPGP key version mfer signs with.
-	// Its fingerprints are 40 hex characters, the length
-	// --require-signature takes.
-	signingKeyVersion = 4
 
 	// armorBegin and armorEnd start the lines that begin and end an
 	// armored block.
@@ -45,21 +30,14 @@ const (
 )
 
 var (
-	errKeyCount    = errors.New("must hold exactly one key")
+	errKeyCount     = errors.New("must hold exactly one key")
-	errDSAKey      = errors.New("must not hold a DSA key")
+	errNoSecretKey  = errors.New("signing key file holds no secret key")
-	errSecretKey   = errors.New("must not hold a secret key")
-	errNoSecretKey = errors.New("signing key file holds no secret key")
-	errNotV4Key    = errors.New("signing key must be an OpenPGP version 4 key, " +
-		"the only kind whose fingerprint --require-signature takes")
 	errNoPassphrase = errors.New(
 		"signing key is protected and no passphrase was given")
 	errNotOneSignature = errors.New(
 		"signature must hold exactly one signature")
 	errNotOneArmoredBlock = errors.New(
 		"must be exactly one armored block and nothing else")
-	errMalformedArmor        = errors.New("armor is malformed")
-	errKeyNotValidWhenSigned = errors.New(
-		"signature was made when its key was not valid")
 )
 
 // SigningOptions holds the key a manifest is signed with.
@@ -73,7 +51,7 @@ type SigningOptions struct {
 
 // SecretKeyIsProtected reports whether the OpenPGP secret key secretKey,
 // armored or binary, needs a passphrase to sign. It fails unless
-// secretKey holds one version 4 primary key with its secret key.
+// secretKey holds one primary key with its secret key.
 func SecretKeyIsProtected(secretKey []byte) (bool, error) {
 	key, err := readSecretKey(secretKey)
 	if err != nil {
@@ -83,37 +61,14 @@ func SecretKeyIsProtected(secretKey []byte) (bool, error) {
 	return isProtected(key), nil
 }
 
-// SecretKeyFingerprint returns the fingerprint of the OpenPGP secret key
+// CheckSigningKey fails unless opts can sign: opts.SecretKey must hold one
-// secretKey, armored or binary, as a manifest signed with it records its
+// primary key with its secret key, and opts.Passphrase must unlock it when
-// signer. It fails unless secretKey holds one version 4 primary key with
+// it is protected. It lets a caller find a wrong passphrase before it
-// its secret key.
+// builds a manifest.
-func SecretKeyFingerprint(secretKey []byte) (string, error) {
-	key, err := readSecretKey(secretKey)
-	if err != nil {
-		return "", err
-	}
-
-	return fingerprint(key), nil
-}
-
-// CheckSigningKey fails unless opts can sign now: opts.SecretKey must hold
-// one version 4 primary key with a secret key that may sign and has not
-// expired or been revoked, and opts.Passphrase must unlock it when it is
-// protected. It lets a caller find a key that cannot sign before it builds
-// a manifest.
 func CheckSigningKey(opts *SigningOptions) error {
-	key, err := readSigningKey(opts)
+	_, err := readSigningKey(opts)
-	if err != nil {
-		return err
-	}
 
-	// Signing nothing fails wherever signing the manifest would.
+	return err
-	err = openpgp.DetachSign(io.Discard, key, bytes.NewReader(nil), nil)
-	if err != nil {
-		return fmt.Errorf("signing key cannot sign: %w", err)
-	}
-
-	return nil
 }
 
 // readSigningKey returns the key in opts.SecretKey, unlocked with
@@ -141,18 +96,13 @@ func readSigningKey(opts *SigningOptions) (*openpgp.Entity, error) {
 }
 
 // readSecretKey returns the one key in secretKey, armored or binary,
-// which must be a version 4 key and include its secret key.
+// which must include its secret key.
 func readSecretKey(secretKey []byte) (*openpgp.Entity, error) {
-	key, err := readOneKey(secretKey, "signing key file", false)
+	key, err := readOneKey(secretKey, "signing key file")
 	if err != nil {
 		return nil, err
 	}
 
-	if key.PrimaryKey.Version != signingKeyVersion {
-		return nil, fmt.Errorf("%w; this key is version %d",
-			errNotV4Key, key.PrimaryKey.Version)
-	}
-
 	if key.PrivateKey == nil {
 		return nil, errNoSecretKey
 	}
@@ -161,9 +111,8 @@ func readSecretKey(secretKey []byte) (*openpgp.Entity, error) {
 }
 
 // readOneKey returns the key in data, armored or binary, which must hold
-// exactly one primary key and no DSA key or subkey, and when publicOnly no
+// exactly one primary key. what names data in errors.
-// secret key or subkey either. what names data in errors.
+func readOneKey(data []byte, what string) (*openpgp.Entity, error) {
-func readOneKey(data []byte, what string, publicOnly bool) (*openpgp.Entity, error) {
 	packets, err := dearmor(data)
 	if err != nil {
 		return nil, fmt.Errorf("read %s: %w", what, err)
@@ -178,29 +127,6 @@ func readOneKey(data []byte, what string, publicOnly bool) (*openpgp.Entity, err
 		return nil, fmt.Errorf("%s %w, found %d", what, errKeyCount, keys)
 	}
 
-	// openpgp.ReadKeyRing checks the numbers of every secret key it reads,
-	// and an ElGamal secret subkey with a very large prime makes that take
-	// minutes.
-	secretKeys, err := countPackets(packets, secretKeyPacketTag, secretSubkeyPacketTag)
-	if err != nil {
-		return nil, fmt.Errorf("read %s: %w", what, err)
-	}
-
-	if publicOnly && secretKeys != 0 {
-		return nil, fmt.Errorf("%s %w", what, errSecretKey)
-	}
-
-	// openpgp.ReadKeyRing also checks every self-signature, and a DSA key
-	// with very large numbers makes each check take seconds to minutes.
-	dsa, err := holdsDSAKey(packets)
-	if err != nil {
-		return nil, fmt.Errorf("read %s: %w", what, err)
-	}
-
-	if dsa {
-		return nil, fmt.Errorf("%s %w", what, errDSAKey)
-	}
-
 	keyring, err := openpgp.ReadKeyRing(bytes.NewReader(packets))
 	if err != nil {
 		return nil, fmt.Errorf("read %s: %w", what, err)
@@ -258,13 +184,12 @@ func fingerprint(key *openpgp.Entity) string {
 	return strings.ToUpper(hex.EncodeToString(key.PrimaryKey.Fingerprint))
 }
 
-// verifySignature checks that signature is one good, unexpired OpenPGP
+// verifySignature checks that signature is one good OpenPGP signature
-// signature over data, made by the one primary key in pubKey or one of its
+// over data, made by the one primary key in pubKey or one of its subkeys,
-// subkeys while that key was valid, and returns that primary key's
+// and returns that primary key's fingerprint. signature and pubKey may each
-// fingerprint. The key may have expired since. signature and pubKey may
+// be armored or binary.
-// each be armored or binary.
 func verifySignature(data, signature, pubKey []byte) (string, error) {
-	key, err := readOneKey(pubKey, "embedded public key block", true)
+	key, err := readOneKey(pubKey, "embedded public key block")
 	if err != nil {
 		return "", err
 	}
@@ -283,40 +208,14 @@ func verifySignature(data, signature, pubKey []byte) (string, error) {
 		return "", fmt.Errorf("%w, found %d", errNotOneSignature, sigs)
 	}
 
-	sig, _, err := openpgp.VerifyDetachedSignature(openpgp.EntityList{key},
+	_, err = openpgp.CheckDetachedSignature(openpgp.EntityList{key},
 		bytes.NewReader(data), bytes.NewReader(sigData), nil)
 	// A manifest outlives its signing key, so a signature by a key that
-	// has expired since is still good, unless the signature has expired
+	// has expired since is still good.
-	// itself. The library does not check that once it finds the key
-	// expired.
-	if errors.Is(err, pgperrors.ErrKeyExpired) && sig.SigExpired(time.Now()) {
-		err = pgperrors.ErrSignatureExpired
-	}
-
 	if err != nil && !errors.Is(err, pgperrors.ErrKeyExpired) {
 		return "", fmt.Errorf("verify signature: %w", err)
 	}
 
-	// The check above judges the key as of now. Checking the signature a
-	// second time with the library's clock set to its creation time
-	// requires the primary key, and the subkey that made the signature, to
-	// have been valid then under the key validity rules of RFC 9580. The
-	// key is judged by its current self-signatures and binding signatures:
-	// for a version 4 key the newest self-signature on its primary user
-	// ID, for a version 6 key its newest direct-key signature, and for a
-	// subkey its newest binding signature with the signature embedded in
-	// it. So a signature made before the newest of those is refused.
-	signedAt := &packet.Config{
-		Time: func() time.Time { return sig.CreationTime },
-	}
-
-	_, _, err = openpgp.VerifyDetachedSignature(openpgp.EntityList{key},
-		bytes.NewReader(data), bytes.NewReader(sigData), signedAt)
-	if err != nil {
-		return "", fmt.Errorf("verify signature: %w: %w",
-			errKeyNotValidWhenSigned, err)
-	}
-
 	return fingerprint(key), nil
 }
 
@@ -341,20 +240,12 @@ func dearmor(data []byte) ([]byte, error) {
 		return nil, errNotOneArmoredBlock
 	}
 
-	// armor.Decode passes over a block it cannot read, such as one with a
-	// header line that has no colon, and returns io.EOF on finding no
-	// other.
 	block, err := armor.Decode(bytes.NewReader(text))
 	if err != nil {
-		return nil, errMalformedArmor
+		return nil, err
 	}
 
-	body, err := io.ReadAll(block.Body)
+	return io.ReadAll(block.Body)
-	if err != nil {
-		return nil, fmt.Errorf("%w: %w", errMalformedArmor, err)
-	}
-
-	return body, nil
 }
 
 // countPackets returns how many packets in the binary OpenPGP data have
@@ -380,40 +271,3 @@ func countPackets(data []byte, tags ...uint8) (int, error) {
 		}
 	}
 }
-
-// holdsDSAKey reports whether any key or subkey packet in the binary
-// OpenPGP data holds a DSA key. It reads each packet's algorithm octet
-// rather than parsing the packet, since parsing a secret key packet checks
-// its numbers, which for a DSA key with very large numbers is as slow as
-// checking a self-signature.
-func holdsDSAKey(data []byte) (bool, error) {
-	packets := packet.NewOpaqueReader(bytes.NewReader(data))
-
-	for {
-		p, err := packets.Next()
-		if errors.Is(err, io.EOF) {
-			return false, nil
-		}
-
-		if err != nil {
-			return false, err
-		}
-
-		if !slices.Contains([]uint8{
-			secretKeyPacketTag, publicKeyPacketTag,
-			secretSubkeyPacketTag, publicSubkeyPacketTag,
-		}, p.Tag) {
-			continue
-		}
-
-		offset := keyAlgorithmOffset
-		if len(p.Contents) > 0 && p.Contents[0] >= firstKeyVersionWithLength {
-			offset = keyAlgorithmOffsetAfterLength
-		}
-
-		if len(p.Contents) > offset &&
-			packet.PublicKeyAlgorithm(p.Contents[offset]) == packet.PubKeyAlgoDSA {
-			return true, nil
-		}
-	}
-}

mfer/openpgp_test.go

@@ -4,10 +4,7 @@ package mfer
 import (
 	"bytes"
 	"context"
-	"crypto"
-	"crypto/dsa" //nolint:staticcheck // SA1019: tests need a DSA key to refuse
 	"io"
-	"math/big"
 	"os"
 	"path/filepath"
 	"slices"
@@ -18,8 +15,6 @@ import (
 
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/armor"
-	"github.com/ProtonMail/go-crypto/openpgp/elgamal"
-	pgperrors "github.com/ProtonMail/go-crypto/openpgp/errors"
 	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
@@ -177,25 +172,6 @@ func TestBuilderWithSigning(t *testing.T) {
 		"-----BEGIN PGP PUBLIC KEY BLOCK-----")
 }
 
-// TestManifestSigner checks that Signer gives the signing key's
-// fingerprint for a signed manifest, and nil once the signature is taken
-// out, although the signer field is still there.
-func TestManifestSigner(t *testing.T) {
-	t.Parallel()
-
-	key := newTestKey(t, nil)
-	data := signedTestManifest(t, &SigningOptions{SecretKey: armoredSecretKeys(t, key)})
-
-	signed, err := NewManifestFromReader(bytes.NewReader(data))
-	require.NoError(t, err)
-	assert.Equal(t, fingerprint(key), string(signed.Signer()))
-
-	unsigned, err := NewManifestFromReader(bytes.NewReader(
-		rewriteOuter(t, data, func(outer *MFFileOuter) { outer.Signature = nil })))
-	require.NoError(t, err)
-	assert.Nil(t, unsigned.Signer())
-}
-
 func TestScannerWithSigning(t *testing.T) {
 	t.Parallel()
 
@@ -281,21 +257,6 @@ func TestSecretKeyIsProtectedWithoutPassphrase(t *testing.T) {
 	assert.False(t, protected)
 }
 
-// TestSecretKeyFingerprint checks that SecretKeyFingerprint gives the
-// signer that a manifest signed with the key records.
-func TestSecretKeyFingerprint(t *testing.T) {
-	t.Parallel()
-
-	opts := testSigningOptions(t)
-
-	got, err := SecretKeyFingerprint(opts.SecretKey)
-	require.NoError(t, err)
-
-	m, err := NewManifestFromReader(bytes.NewReader(signedTestManifest(t, opts)))
-	require.NoError(t, err)
-	assert.Equal(t, string(m.Signer()), got)
-}
-
 // TestSigningKeyFileWithTwoKeys signs with a key file that holds two keys,
 // as gpg writes it for a user ID that two keys have. It names no one key
 // to sign with, so signing must fail.
@@ -323,97 +284,6 @@ func TestSigningKeyFileWithoutSecretKey(t *testing.T) {
 	require.ErrorIs(t, b.Build(context.Background(), io.Discard), errNoSecretKey)
 }
 
-// TestCheckSigningKeyRefusesKeyThatCannotSign checks a key that can sign,
-// and keys that read and need no passphrase but cannot sign now: one that
-// expired in 2020 and one that has been revoked. CheckSigningKey must
-// refuse each of the two, as signing a manifest with it would fail.
-func TestCheckSigningKeyRefusesKeyThatCannotSign(t *testing.T) {
-	t.Parallel()
-
-	require.NoError(t, CheckSigningKey(testSigningOptions(t)))
-
-	made := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
-	expired := newTestKey(t, &packet.Config{
-		Time:            func() time.Time { return made },
-		KeyLifetimeSecs: uint32((24 * time.Hour).Seconds()),
-	})
-
-	revoked := newTestKey(t, nil)
-	require.NoError(t, revoked.RevokeKey(packet.KeyRetired, "", nil))
-
-	for name, key := range map[string]*openpgp.Entity{
-		"expired": expired,
-		"revoked": revoked,
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			assert.ErrorContains(t, CheckSigningKey(
-				&SigningOptions{SecretKey: armoredSecretKeys(t, key)}),
-				"signing key cannot sign")
-		})
-	}
-}
-
-// TestSigningRefusesVersion6Key signs with an OpenPGP version 6 key, whose
-// fingerprint is 64 hex characters. mfer signs only with version 4 keys.
-func TestSigningRefusesVersion6Key(t *testing.T) {
-	t.Parallel()
-
-	key, err := openpgp.NewEntity("MFER Test Key", "", "test@mfer.test",
-		&packet.Config{V6Keys: true, Algorithm: packet.PubKeyAlgoEd25519})
-	require.NoError(t, err)
-
-	secretKey := armoredSecretKeys(t, key)
-
-	_, err = SecretKeyIsProtected(secretKey)
-	require.ErrorIs(t, err, errNotV4Key)
-
-	b := NewBuilder()
-	b.SetSigningOptions(&SigningOptions{SecretKey: secretKey})
-	require.ErrorIs(t, b.Build(context.Background(), io.Discard), errNotV4Key)
-}
-
-// TestMalformedArmorIsNamed reads a signing key file, a signature and an
-// embedded public key block whose armor is malformed: a header line with
-// no colon, or no blank line after the BEGIN line. Each must fail saying
-// the armor is malformed.
-func TestMalformedArmorIsNamed(t *testing.T) {
-	t.Parallel()
-
-	opts := testSigningOptions(t)
-	manifest := signedTestManifest(t, opts)
-
-	for name, change := range map[string]func([]byte) []byte{
-		"header line with no colon": func(block []byte) []byte {
-			return bytes.Replace(block,
-				[]byte("-----\n"), []byte("-----\nno colon\n"), 1)
-		},
-		"no blank line after the BEGIN line": func(block []byte) []byte {
-			return bytes.Replace(block, []byte("-----\n\n"), []byte("-----\n"), 1)
-		},
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			_, err := SecretKeyIsProtected(change(opts.SecretKey))
-			require.ErrorIs(t, err, errMalformedArmor)
-
-			for _, changed := range [][]byte{
-				rewriteOuter(t, manifest, func(outer *MFFileOuter) {
-					outer.Signature = change(outer.GetSignature())
-				}),
-				rewriteOuter(t, manifest, func(outer *MFFileOuter) {
-					outer.SigningPubKey = change(outer.GetSigningPubKey())
-				}),
-			} {
-				_, err = NewManifestFromReader(bytes.NewReader(changed))
-				require.ErrorIs(t, err, errMalformedArmor)
-			}
-		})
-	}
-}
-
 func TestVerifySignature(t *testing.T) {
 	t.Parallel()
 
@@ -452,11 +322,8 @@ func TestVerifySignature(t *testing.T) {
 	assert.Error(t, err)
 }
 
-// TestVerifySignatureKeyExpiredSince verifies two signatures made in 2020
+// TestVerifySignatureKeyExpiredSince verifies a signature made in 2020 by
-// by a key that expired a day after it was made. A signature with no
+// a key that expired a day after it was made. The signature is still good.
-// expiry time is still good, as is one made then by a signing subkey that
-// expired a day after it was made. One that expired an hour after it was
-// made is refused, although the key has expired too.
 func TestVerifySignatureKeyExpiredSince(t *testing.T) {
 	t.Parallel()
 
@@ -468,14 +335,9 @@ func TestVerifySignatureKeyExpiredSince(t *testing.T) {
 	key := newTestKey(t, config)
 	data := []byte("signed in 2020")
 
-	var sig, expiringSig bytes.Buffer
+	var sig bytes.Buffer
 
 	require.NoError(t, openpgp.ArmoredDetachSign(&sig, key, bytes.NewReader(data), config))
-	require.NoError(t, openpgp.ArmoredDetachSign(&expiringSig, key,
-		bytes.NewReader(data), &packet.Config{
-			Time:            config.Time,
-			SigLifetimeSecs: uint32(time.Hour.Seconds()),
-		}))
 
 	pubKey, err := armoredPublicKey(key)
 	require.NoError(t, err)
@@ -483,131 +345,6 @@ func TestVerifySignatureKeyExpiredSince(t *testing.T) {
 	signer, err := verifySignature(data, sig.Bytes(), pubKey)
 	require.NoError(t, err)
 	assert.Equal(t, fingerprint(key), signer)
-
-	withSubkey := newTestKey(t, &packet.Config{Time: config.Time})
-	require.NoError(t, withSubkey.AddSigningSubkey(&packet.Config{
-		Algorithm: packet.PubKeyAlgoEdDSA, Time: config.Time,
-		KeyLifetimeSecs: config.KeyLifetimeSecs,
-	}))
-
-	var subkeySig bytes.Buffer
-
-	require.NoError(t, openpgp.ArmoredDetachSign(&subkeySig, withSubkey,
-		bytes.NewReader(data), config))
-
-	subkeyPubKey, err := armoredPublicKey(withSubkey)
-	require.NoError(t, err)
-
-	_, err = verifySignature(data, subkeySig.Bytes(), subkeyPubKey)
-	require.NoError(t, err)
-
-	_, err = verifySignature(data, expiringSig.Bytes(), pubKey)
-	require.ErrorIs(t, err, pgperrors.ErrSignatureExpired)
-}
-
-// signDated returns a detached signature over data by signer, dated when.
-// openpgp.DetachSign signs only with a key that is valid at the time its
-// config gives, so this makes the signature packet without that check.
-func signDated(t *testing.T, signer *packet.PrivateKey, data []byte,
-	when time.Time,
-) []byte {
-	t.Helper()
-
-	sig := &packet.Signature{
-		SigType:      packet.SigTypeBinary,
-		PubKeyAlgo:   signer.PubKeyAlgo,
-		Hash:         crypto.SHA256,
-		CreationTime: when,
-		IssuerKeyId:  &signer.KeyId,
-	}
-
-	h, err := sig.PrepareSign(nil)
-	require.NoError(t, err)
-
-	_, err = h.Write(data)
-	require.NoError(t, err)
-
-	require.NoError(t, sig.Sign(h, signer, nil))
-
-	var buf bytes.Buffer
-
-	require.NoError(t, sig.Serialize(&buf))
-
-	return buf.Bytes()
-}
-
-// TestVerifySignatureRefusesKeyNotValidWhenSigned verifies signatures
-// dated when the key or subkey that made them was not valid: after the key
-// expired; after the key's self-signature, or the signing subkey's binding
-// signature, expired, the key or subkey having expired since as well; and
-// before the key was made, also by a key made in 2100. Each must be
-// refused.
-func TestVerifySignatureRefusesKeyNotValidWhenSigned(t *testing.T) {
-	t.Parallel()
-
-	made := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
-	twoDaysLater := made.Add(48 * time.Hour)
-	day := uint32((24 * time.Hour).Seconds())
-	clock := func(when time.Time) func() time.Time {
-		return func() time.Time { return when }
-	}
-
-	expiredAfterADay := newTestKey(t, &packet.Config{
-		Time: clock(made), KeyLifetimeSecs: day,
-	})
-	selfSignatureExpiredAfterADay := newTestKey(t, &packet.Config{
-		Time: clock(made), KeyLifetimeSecs: 30 * day, SigLifetimeSecs: day,
-	})
-
-	withSubkey := newTestKey(t, &packet.Config{Time: clock(made)})
-	require.NoError(t, withSubkey.AddSigningSubkey(&packet.Config{
-		Algorithm: packet.PubKeyAlgoEdDSA, Time: clock(made),
-		KeyLifetimeSecs: 30 * day, SigLifetimeSecs: day,
-	}))
-	subkey := withSubkey.Subkeys[len(withSubkey.Subkeys)-1].PrivateKey
-
-	madeADayLater := newTestKey(t, &packet.Config{
-		Time: clock(made.Add(24 * time.Hour)),
-	})
-	madeIn2100 := newTestKey(t, &packet.Config{
-		Time: clock(time.Date(2100, 1, 1, 0, 0, 0, 0, time.UTC)),
-	})
-
-	for name, test := range map[string]struct {
-		key    *openpgp.Entity
-		signer *packet.PrivateKey
-		when   time.Time
-	}{
-		"after the key expired": {
-			expiredAfterADay, expiredAfterADay.PrivateKey, twoDaysLater,
-		},
-		"after the self-signature expired": {
-			selfSignatureExpiredAfterADay,
-			selfSignatureExpiredAfterADay.PrivateKey, twoDaysLater,
-		},
-		"after the binding signature expired": {
-			withSubkey, subkey, twoDaysLater,
-		},
-		"before the key was made": {
-			madeADayLater, madeADayLater.PrivateKey, made,
-		},
-		"before a key made in 2100": {
-			madeIn2100, madeIn2100.PrivateKey, made,
-		},
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			data := []byte("signed in 2020")
-
-			pubKey, err := armoredPublicKey(test.key)
-			require.NoError(t, err)
-
-			_, err = verifySignature(data,
-				signDated(t, test.signer, data, test.when), pubKey)
-			require.ErrorIs(t, err, errKeyNotValidWhenSigned)
-		})
-	}
 }
 
 func TestManifestSignatureVerification(t *testing.T) {
@@ -726,105 +463,6 @@ func TestManifestRefusesSecondEmbeddedKeyWithoutUserID(t *testing.T) {
 	require.ErrorIs(t, err, errKeyCount)
 }
 
-// dsaKeyPacket returns a public key packet holding a DSA key, or a public
-// subkey packet when isSubkey. Its numbers are not a working key: loading
-// must refuse the packet before it uses them.
-func dsaKeyPacket(t *testing.T, isSubkey bool) []byte {
-	t.Helper()
-
-	key := packet.NewDSAPublicKey(time.Now(), &dsa.PublicKey{
-		P: big.NewInt(23), Q: big.NewInt(11), G: big.NewInt(4), Y: big.NewInt(8),
-	})
-	key.IsSubkey = isSubkey
-
-	var buf bytes.Buffer
-
-	require.NoError(t, key.Serialize(&buf))
-
-	return buf.Bytes()
-}
-
-// TestManifestRefusesDSAKey loads manifests whose embedded public key
-// block holds a DSA key: alone, or as a subkey after the key that signed
-// the manifest. openpgp.ReadKeyRing checks a key's self-signatures, which
-// for a DSA key with very large numbers takes minutes each. Loading must
-// refuse each block before that.
-func TestManifestRefusesDSAKey(t *testing.T) {
-	t.Parallel()
-
-	signer := newTestKey(t, nil)
-	manifest := signedTestManifest(t,
-		&SigningOptions{SecretKey: armoredSecretKeys(t, signer)})
-
-	var signerKey bytes.Buffer
-
-	require.NoError(t, signer.Serialize(&signerKey))
-
-	for name, block := range map[string][]byte{
-		"DSA key":    dsaKeyPacket(t, false),
-		"DSA subkey": slices.Concat(signerKey.Bytes(), dsaKeyPacket(t, true)),
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			embedded := rewriteOuter(t, manifest, func(outer *MFFileOuter) {
-				outer.SigningPubKey = block
-			})
-
-			_, err := NewManifestFromReader(bytes.NewReader(embedded))
-			require.ErrorIs(t, err, errDSAKey)
-		})
-	}
-}
-
-// elGamalSecretSubkeyPacket returns a secret subkey packet holding an
-// ElGamal key. Its numbers are not a working key: loading must refuse the
-// packet before it uses them.
-func elGamalSecretSubkeyPacket(t *testing.T) []byte {
-	t.Helper()
-
-	key := packet.NewElGamalPrivateKey(time.Now(), &elgamal.PrivateKey{
-		P: big.NewInt(23), G: big.NewInt(4), Y: big.NewInt(8), X: big.NewInt(3),
-	})
-	key.IsSubkey = true
-
-	var buf bytes.Buffer
-
-	require.NoError(t, key.Serialize(&buf))
-
-	return buf.Bytes()
-}
-
-// TestManifestRefusesSecretKey loads manifests whose embedded public key
-// block holds a secret key: the key that signed the manifest with its
-// secret key, or its public key followed by an ElGamal secret subkey.
-// openpgp.ReadKeyRing checks the numbers of every secret key it reads,
-// which for an ElGamal key with a very large prime takes minutes. Loading
-// must refuse each block before that.
-func TestManifestRefusesSecretKey(t *testing.T) {
-	t.Parallel()
-
-	signer := newTestKey(t, nil)
-	manifest := signedTestManifest(t,
-		&SigningOptions{SecretKey: armoredSecretKeys(t, signer)})
-
-	var signerKey bytes.Buffer
-
-	require.NoError(t, signer.Serialize(&signerKey))
-
-	for _, block := range [][]byte{
-		armoredSecretKeys(t, signer),
-		slices.Concat(signerKey.Bytes(), elGamalSecretSubkeyPacket(t)),
-	} {
-		embedded := rewriteOuter(t, manifest, func(outer *MFFileOuter) {
-			outer.SigningPubKey = block
-		})
-
-		_, err := NewManifestFromReader(bytes.NewReader(embedded))
-		require.ErrorIs(t, err, errSecretKey)
-	}
-}
-
 // TestManifestRefusesTwoSignatures loads a manifest whose signature field
 // holds its good signature twice, not armored. Loading must refuse it.
 func TestManifestRefusesTwoSignatures(t *testing.T) {

mfer/pipe_test.go

@@ -1,123 +0,0 @@
-//go:build unix
-
-//nolint:testpackage // white-box tests exercise unexported internals
-package mfer
-
-import (
-	"bytes"
-	"context"
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-	"time"
-
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// pipeDeadline is how long a test lets a run go before it opens the test's
-// named pipes for writing.
-const pipeDeadline = 5 * time.Second
-
-// makePipe makes a named pipe at path. Opening a named pipe for reading
-// blocks until it is opened for writing, so once pipeDeadline has passed,
-// unless the test has ended, makePipe opens it for writing and closes it
-// again. A run that wrongly reads the pipe then ends, and the test fails on
-// what it reports instead of hanging. That lets one read through, so each
-// path a wrong run would read gets a pipe of its own.
-func makePipe(t *testing.T, path string) {
-	t.Helper()
-
-	require.NoError(t, syscall.Mkfifo(path, 0o600))
-
-	timer := time.AfterFunc(pipeDeadline, func() {
-		f, err := os.OpenFile(path, os.O_WRONLY, 0) //nolint:gosec // test-controlled path
-		if err == nil {
-			_ = f.Close()
-		}
-	})
-
-	t.Cleanup(func() { timer.Stop() })
-}
-
-// TestScannerSkipsPipes scans a tree holding a named pipe and a symlink to
-// another one, following symlinks: the manifest lists the regular file only.
-func TestScannerSkipsPipes(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	require.NoError(t, os.WriteFile(filepath.Join(dir, testFile1), []byte("a"), 0o600))
-	makePipe(t, filepath.Join(dir, "pipe"))
-
-	// The symlink points outside the tree, so no pipe is read twice.
-	target := filepath.Join(t.TempDir(), "pipe")
-	makePipe(t, target)
-	require.NoError(t, os.Symlink(target, filepath.Join(dir, "link")))
-
-	s := NewScannerWithOptions(&ScannerOptions{FollowSymLinks: true})
-	require.NoError(t, s.EnumeratePath(dir, nil))
-
-	var buf bytes.Buffer
-	require.NoError(t, s.ToManifest(context.Background(), &buf, nil))
-
-	m, err := NewManifestFromReader(&buf)
-	require.NoError(t, err)
-	require.Len(t, m.Files(), 1)
-	assert.Equal(t, testFile1, m.Files()[0].GetPath())
-}
-
-// TestCheckPipes checks a tree against a manifest that lists, as an empty
-// file, a path that is a named pipe on disk. The tree holds another pipe the
-// manifest does not list. check reports the listed pipe as an error without
-// reading it, and the search for extra files does not report the other.
-func TestCheckPipes(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	manifestPath := filepath.Join(dir, "index.mf")
-	content := []byte("in manifest")
-	listedPipe := RelFilePath("listed-pipe")
-
-	fs := afero.NewOsFs()
-	createTestManifest(t, fs, manifestPath, map[string][]byte{
-		testFile1:          content,
-		string(listedPipe): {},
-	})
-	require.NoError(t, afero.WriteFile(fs, filepath.Join(dir, testFile1), content, 0o600))
-	makePipe(t, filepath.Join(dir, string(listedPipe)))
-	makePipe(t, filepath.Join(dir, "unlisted-pipe"))
-
-	chk, err := NewChecker(&CheckerOptions{
-		ManifestPath: manifestPath,
-		BasePath:     dir,
-		Fs:           fs,
-	})
-	require.NoError(t, err)
-
-	results := make(chan Result, 10)
-	require.NoError(t, chk.Check(context.Background(), results, nil))
-
-	byPath := map[RelFilePath]Result{}
-	for r := range results {
-		byPath[r.Path] = r
-	}
-
-	assert.Equal(t, StatusOK, byPath[testFile1].Status)
-	assert.Equal(t, Result{
-		Path:    listedPipe,
-		Status:  StatusError,
-		Message: "not a regular file",
-	}, byPath[listedPipe])
-
-	extras := make(chan Result, 10)
-	require.NoError(t, chk.FindExtraFiles(context.Background(), extras))
-
-	var extraPaths []RelFilePath
-	for r := range extras {
-		extraPaths = append(extraPaths, r.Path)
-	}
-
-	assert.Empty(t, extraPaths)
-}

mfer/scanner.go

@@ -139,15 +139,25 @@ func (s *Scanner) EnumerateFile(filePath string) error {
 	return s.enumerateFileWithInfo(filepath.Base(abs), basePath, info, nil)
 }
 
-// EnumeratePath adds inputPath, a directory or a file, to the scanner as
+// EnumeratePath walks a directory path and adds all files to the scanner.
-// EnumeratePaths adds each of its paths.
 // If progress is non-nil, status updates are sent as files are discovered.
 // The progress channel is closed when the method returns.
 func (s *Scanner) EnumeratePath(
 	inputPath string,
 	progress chan<- EnumerateStatus,
 ) error {
-	return s.EnumeratePaths(progress, inputPath)
+	if progress != nil {
+		defer close(progress)
+	}
+
+	abs, err := filepath.Abs(inputPath)
+	if err != nil {
+		return err
+	}
+
+	afs := afero.NewReadOnlyFs(afero.NewBasePathFs(s.fs, abs))
+
+	return s.enumerateFS(afs, abs, progress)
 }
 
 // EnumeratePaths adds to the scanner the files under each directory path,
@@ -175,14 +185,6 @@ func (s *Scanner) EnumeratePaths(
 		}
 
 		if info.IsDir() {
-			// The walk does not follow a symlink at its top, so a directory
-			// named through one is resolved first. If that fails, the
-			// directory is walked as named and the walk reports the problem.
-			resolved, evalErr := filepath.EvalSymlinks(abs)
-			if evalErr == nil {
-				abs = resolved
-			}
-
 			afs := afero.NewReadOnlyFs(afero.NewBasePathFs(s.fs, abs))
 			err = s.enumerateFS(afs, abs, progress)
 		} else {
@@ -474,13 +476,6 @@ func (s *Scanner) enumerateFileWithInfo(
 		info = realInfo
 	}
 
-	// Opening a named pipe can block, and reading a device may never end.
-	if !info.Mode().IsRegular() {
-		log.Verbosef("skipping %s: not a regular file", cleanPath)
-
-		return nil
-	}
-
 	for _, excluded := range s.excluded {
 		if os.SameFile(info, excluded) {
 			return nil

mfer/scanner_test.go

@@ -118,27 +118,6 @@ func TestScannerEnumeratePathWithProgress(t *testing.T) {
 	assert.Equal(t, FileSize(6), final.BytesFound)
 }
 
-// TestScannerEnumeratePathFile gives EnumeratePath a file: it is listed
-// by its name, as EnumerateFile lists it, and the manifest can be built.
-func TestScannerEnumeratePathFile(t *testing.T) {
-	t.Parallel()
-
-	fs := afero.NewMemMapFs()
-	require.NoError(t, fs.MkdirAll("/dir", 0o755))
-	require.NoError(t, afero.WriteFile(fs, "/dir/one.txt", []byte("1"), 0o644))
-
-	s := NewScannerWithOptions(&ScannerOptions{Fs: fs})
-	require.NoError(t, s.EnumeratePath("/dir/one.txt", nil))
-
-	var buf bytes.Buffer
-	require.NoError(t, s.ToManifest(context.Background(), &buf, nil))
-
-	m, err := NewManifestFromReader(&buf)
-	require.NoError(t, err)
-	require.Len(t, m.Files(), 1)
-	assert.Equal(t, "one.txt", m.Files()[0].GetPath())
-}
-
 func TestScannerEnumeratePaths(t *testing.T) {
 	t.Parallel()