All checks were successful
check / check (push) Successful in 43s
Bumps golangci-lint from v2.1.6 (digest-only pin in the `Dockerfile` lint stage) to v2.12.2, pinned by tag and digest (Debian-based image). Replaces `.golangci.yml` with the canonical strict config: all linters enabled except the standard disable list (`exhaustruct`, `depguard`, `godot`, `wsl`, `wrapcheck`, `varnamelen`), `lll` at 88, `funlen` 80/50, `cyclop` 15, `dupl` 100, and test files are now linted (the old config had `tests: false`, an enable-only list of ~20 linters, `lll` 120, and a blanket exclusion of `internal/macse`). The stricter config surfaced ~1550 findings, all fixed: - `wsl_v5` (439) / `nlreturn` (24): blank-line insertions - `lll` (309): line wrapping at 88 columns; long literals split with `+` concatenation, values unchanged - `noinlineerr` (130): `if err := ...` split into assignment plus check - `paralleltest` (116): `t.Parallel()` added to tests without shared state; reasoned `//nolint` where `t.Setenv` or shared fixtures forbid it - `err113` (97): package-level sentinel errors (new `internal/vault/errors.go`), `%w` wrapping, `errors.Is` - `perfsprint` (74) / `modernize` (39) / `intrange`: `strconv`, `errors.New`, `slices.Contains`, `any`, `SplitSeq` - `goconst` (40) / `dupword` (41) / `testifylint` (42) / `thelper` (33): constants, assertion fixes, `t.Helper()` - `noctx` (22): `exec.CommandContext` for gpg/CLI invocations - `testpackage` (18): black-box tests moved to `_test` packages where they use only exported identifiers; white-box files carry a reasoned `//nolint` - `funlen`/`cyclop`/`gocognit`/`nestif`/`dupl`: behavior-preserving helper extraction - assorted singletons: `gosec`, `gosmopolitan`, `funcorder`, `nonamedreturns`, `makezero`, `prealloc`, `godox`, `nolintlint`, `ireturn`, `nilnil`, `gochecknoinits` ## User-visible strings **None changed.** Every error message this branch composes is byte-identical to the one `main` composes. The `err113` sentinels are shaped so `fmt.Errorf` reassembles the original text around them: the sentinel carries the fixed words and the caller supplies the interpolated value in the position it has always occupied. Where the value sits mid-sentence the sentinel holds only a fragment (e.g. `vault.ErrVaultNotFound` is `"does not exist"`, composed by its caller as `vault <name> does not exist`); each such sentinel documents the message it participates in. Verified mechanically, not by inspection: every `fmt.Errorf` and `errors.New` call site in both trees is parsed, the `Error()` text of any sentinel passed to `%w` is substituted in, and the resulting sets of composed message templates are compared. All 350 templates `main` produces are still produced, character for character. The set of lost or altered messages is empty. ## `unlocker list` `findUnlockerIDByMetadata` returns `(string, error)` rather than signalling failure with an empty ID, so an unreadable `unlockers.d` is no longer indistinguishable from "no matching entry". `UnlockersList` skips such an entry with a warning naming the directory — its behavior before the scan was extracted into a helper — instead of emitting a row under a synthesized fallback ID that no `unlocker remove` or `unlocker select` can match and that suppresses the current-unlocker marker. The duplicate-check and shell-completion callers skip on the same condition, matching their pre-extraction behavior. Covered by `internal/cli/unlockers_list_test.go`. `TODO.md` records the change plus follow-ups (version-completion TODOs formerly in code comments, darwin-gated files exceeding 88 columns that Linux CI does not lint). `make check` is green and the pinned v2.12.2 image reports `0 issues.` Note the test suite needs the memlock ulimit from `script/cibuild` for the 10MB memguard test; that requirement is pre-existing. Not changed: `script/bootstrap` installs golangci-lint via the system package manager (no version pin to bump), and `script/lint` invokes whatever `golangci-lint` is on PATH. golangci-lint v2.12 deprecates `gomodguard` in favor of `gomodguard_v2` (warning only); the canonical config owns that decision. Co-authored-by: sneak <sneak@sneak.berlin> Reviewed-on: #29 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
157 lines
4.6 KiB
Go
157 lines
4.6 KiB
Go
// Package agehd derives deterministic X25519 age identities from a
|
||
// BIP-39 seed using a vendor/application-scoped BIP-85 path:
|
||
//
|
||
// m / 83696968′ / <vendor id>′ / <application id>′ / n′
|
||
//
|
||
// • vendor id = 592 366 788 (sha256("berlin.sneak") & 0x7fffffff)
|
||
// • app id = 733 482 323 (sha256("secret") & 0x7fffffff)
|
||
// • n = sequential index (0,1,…)
|
||
package agehd
|
||
|
||
import (
|
||
"errors"
|
||
"fmt"
|
||
"strings"
|
||
|
||
"filippo.io/age"
|
||
"git.eeqj.de/sneak/secret/pkg/bip85"
|
||
"github.com/btcsuite/btcd/btcutil/hdkeychain"
|
||
"github.com/btcsuite/btcd/chaincfg"
|
||
"github.com/btcsuite/btcutil/bech32"
|
||
"github.com/tyler-smith/go-bip39"
|
||
)
|
||
|
||
const (
|
||
purpose = uint32(83696968) // fixed by BIP-85 ("bip")
|
||
vendorID = uint32(592366788) // berlin.sneak
|
||
appID = uint32(733482323) // secret
|
||
hrp = "age-secret-key-" // Bech32 HRP used by age
|
||
x25519KeySize = 32 // 256-bit key size for X25519
|
||
)
|
||
|
||
// errInvalidScalarSize is returned when the entropy is not exactly 32
|
||
// bytes long.
|
||
var errInvalidScalarSize = errors.New("need 32-byte scalar")
|
||
|
||
// clamp applies RFC-7748 clamping to a 32-byte scalar.
|
||
func clamp(k []byte) {
|
||
k[0] &= 248
|
||
k[31] &= 127
|
||
k[31] |= 64
|
||
}
|
||
|
||
// IdentityFromEntropy converts 32 deterministic bytes into an
|
||
// *age.X25519Identity by round-tripping through Bech32.
|
||
func IdentityFromEntropy(ent []byte) (*age.X25519Identity, error) {
|
||
if len(ent) != x25519KeySize {
|
||
return nil, fmt.Errorf("%w, got %d", errInvalidScalarSize, len(ent))
|
||
}
|
||
|
||
// Make a copy to avoid modifying the original
|
||
key := make([]byte, x25519KeySize)
|
||
copy(key, ent)
|
||
clamp(key)
|
||
|
||
const (
|
||
bech32BitSize8 = 8 // Standard 8-bit encoding
|
||
bech32BitSize5 = 5 // Bech32 5-bit encoding
|
||
)
|
||
|
||
data, err := bech32.ConvertBits(key, bech32BitSize8, bech32BitSize5, true)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("bech32 convert: %w", err)
|
||
}
|
||
|
||
s, err := bech32.Encode(hrp, data)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("bech32 encode: %w", err)
|
||
}
|
||
|
||
return age.ParseX25519Identity(strings.ToUpper(s))
|
||
}
|
||
|
||
// DeriveEntropy derives 32 bytes of application-scoped entropy from the
|
||
// supplied BIP-39 mnemonic and index n using BIP85.
|
||
func DeriveEntropy(mnemonic string, n uint32) ([]byte, error) {
|
||
// Convert mnemonic to seed
|
||
seed := bip39.NewSeed(mnemonic, "")
|
||
|
||
// Create master key from seed
|
||
masterKey, err := hdkeychain.NewMaster(seed, &chaincfg.MainNetParams)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("failed to create master key: %w", err)
|
||
}
|
||
|
||
// Build the BIP85 derivation path: m/83696968'/vendor'/app'/n'
|
||
path := fmt.Sprintf("m/%d'/%d'/%d'/%d'", purpose, vendorID, appID, n)
|
||
|
||
// Derive BIP85 entropy (64 bytes)
|
||
entropy, err := bip85.DeriveBIP85Entropy(masterKey, path)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("failed to derive BIP85 entropy: %w", err)
|
||
}
|
||
|
||
// Use BIP85 DRNG to generate deterministic 32 bytes for the age key
|
||
drng := bip85.NewBIP85DRNG(entropy)
|
||
key := make([]byte, x25519KeySize)
|
||
|
||
_, err = drng.Read(key)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("failed to read from DRNG: %w", err)
|
||
}
|
||
|
||
return key, nil
|
||
}
|
||
|
||
// DeriveEntropyFromXPRV derives 32 bytes of application-scoped entropy from the
|
||
// supplied extended private key (xprv) and index n using BIP85.
|
||
func DeriveEntropyFromXPRV(xprv string, n uint32) ([]byte, error) {
|
||
// Parse the extended private key
|
||
masterKey, err := bip85.ParseMasterKey(xprv)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("failed to parse master key: %w", err)
|
||
}
|
||
|
||
// Build the BIP85 derivation path: m/83696968'/vendor'/app'/n'
|
||
path := fmt.Sprintf("m/%d'/%d'/%d'/%d'", purpose, vendorID, appID, n)
|
||
|
||
// Derive BIP85 entropy (64 bytes)
|
||
entropy, err := bip85.DeriveBIP85Entropy(masterKey, path)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("failed to derive BIP85 entropy: %w", err)
|
||
}
|
||
|
||
// Use BIP85 DRNG to generate deterministic 32 bytes for the age key
|
||
drng := bip85.NewBIP85DRNG(entropy)
|
||
key := make([]byte, x25519KeySize)
|
||
|
||
_, err = drng.Read(key)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("failed to read from DRNG: %w", err)
|
||
}
|
||
|
||
return key, nil
|
||
}
|
||
|
||
// DeriveIdentity is the primary public helper that derives a deterministic
|
||
// age identity from a BIP39 mnemonic and index.
|
||
func DeriveIdentity(mnemonic string, n uint32) (*age.X25519Identity, error) {
|
||
ent, err := DeriveEntropy(mnemonic, n)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
return IdentityFromEntropy(ent)
|
||
}
|
||
|
||
// DeriveIdentityFromXPRV derives a deterministic age identity from an
|
||
// extended private key (xprv) and index.
|
||
func DeriveIdentityFromXPRV(xprv string, n uint32) (*age.X25519Identity, error) {
|
||
ent, err := DeriveEntropyFromXPRV(xprv, n)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
return IdentityFromEntropy(ent)
|
||
}
|