e623e8208f
Removes the entire envelope machinery now that every success path
emits bare JSON:
- cli/internal/format/envelope.go (Envelope, Success, Failure,
SuccessWithRisk, WriteEnvelope, Meta, Notice, UpdateNotice,
VersionSkewNotice, Risk, RiskLevel, ErrorBody) + tests.
- cli/internal/format/filter.go envelope-specific helpers
(WriteEnvelopeFiltered, marshalEnvelope, applyFieldFilter,
filterDataPayload, filterObjectData); the reusable
filterArrayItems / filterObjectKeys / writeJQ stay for bare.go.
- cli/internal/cmdutil/exporter.go + tests (envelope-only).
- cli/internal/cmdutil/PrintErrorEnvelope + ToErrorBody +
operationRiskOf + Error.OperationRisk field + OperationRisk struct.
Error path: all errors now go to stderr via cmdutil.PrintError in
`code: message\nhint: ...` form, regardless of --json. Stdout stays
empty (or holds the partial-success the command already wrote) so
downstream `--json | jq` pipelines never have to filter error shapes
out of the success stream. Typed exit codes (3 auth.* / 4
resource.not_found / 5 input.* / 6 server.rate_limited / 7 server.*
+ network.* / 10 input.confirmation_required) carry the failure
class for agents that branch on it.
Acceptance contract:
- envelope_test.go → wire_test.go (TestEnvelopeGolden → TestWireGolden).
- testdata/envelopes/ → testdata/wire/.
- Error-path cases assert the typed code substring on stderr.
- Orphan whoami.*.json goldens deleted.
AGENTS.md + README.md rewritten for the bare-data contract:
- Drop envelope schema section + dry-run rule.
- Document bare JSON on stdout + `code: msg\nhint: …` on stderr.
- ADR-3 reframed around bare data and why error separation matters
for `--json | jq` pipelines.
WriteJSONFiltered short-circuits to WriteJSON when both filters are
empty (skip the marshal-buffer round-trip for the common case).
Final review pass:
- Fix wire-contract bug: `--json id,name` (space form) is broken by
pflag's NoOptDefVal; AGENTS.md / README.md / SetAgentHelp + the
field-discovery help text all switched to `--json=id,name`.
- Fix `weknora api --jq` silently ignored: api.go now routes through
WriteJSONFiltered with jopts.JQ.
- AGENTS.md: drop the false claim that `auth logout` honors `-y`
(logout is local-only with no ConfirmDestructive guard); list the
actual destructive commands instead.
- Rewrite cli/acceptance/e2e/e2e_test.go for the bare-data wire shape
(was still parsing `out["data"]` / `env["ok"]`).
- Add `JSONOptions.Emit(w, v)` helper; collapse ~33 repeated
`format.WriteJSONFiltered(iostreams.IO.Out, X, jopts.Fields,
jopts.JQ)` sites to `jopts.Emit(iostreams.IO.Out, X)` — drops the
format import from 22 cmd/* files.
- Delete single-caller `cmdutil.MustRequireFlag`; inline as
`_ = cmd.MarkFlagRequired(...)` everywhere.
- Add `_ = cmd.MarkFlagRequired("name")` to `kb create`; it was the
only write command relying on runtime --name validation while
`context add` already used the cobra-level mark.
- `context use`: register `--json` / `--jq` (was always emitting JSON
unconditionally with no human path and no flag — diverged from
every other write command); human mode now prints
`✓ Switched context to X (was Y)`.
- Replace per-package `confirmPrompter` / `scriptedConfirm` /
`errPrompter` test doubles with `testutil.ConfirmPrompter`.
- Rename `chatService` → `ChatService` (export to match siblings
`ListService` / `ViewService`); rename `printUploadSuccess` →
`renderUploadSuccess` (siblings use `render*`).
- `defaultHint(CodeResourceNotFound)`: drop the hardcoded
"list available with `weknora kb list`" — misleading on agent /
doc / session 404. Replaced with "verify the resource ID and try
again".
- Strip stale `v0.2/v0.3` / "envelope" / "v0.0/v0.1 supports only"
historical tags from production comments and a few test
descriptions.
131 lines
4.2 KiB
Go
131 lines
4.2 KiB
Go
// Package secrets stores and retrieves credentials.
|
|
//
|
|
// v0.0 ships a file-only Store implementation (0600 perms under
|
|
// $XDG_CONFIG_HOME/weknora/secrets/). The OS keyring backend lands in v0.1
|
|
// once auth login is needed in TTY contexts (current PR is foundation only).
|
|
//
|
|
// Namespace convention: "weknora:<context>:<key>" where key is "access" or "refresh".
|
|
package secrets
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/xdg"
|
|
)
|
|
|
|
// ErrNotFound is returned when the requested secret does not exist.
|
|
var ErrNotFound = errors.New("secret: not found")
|
|
|
|
// Store is the abstraction CLI commands depend on; tests inject in-memory impls.
|
|
//
|
|
// Ref returns a stable URI (e.g. file://<context>/<key> or
|
|
// keychain://weknora/<context>/<key>) describing where a saved secret lives.
|
|
// Backends own their scheme so commands never need to type-assert the
|
|
// concrete implementation.
|
|
type Store interface {
|
|
Get(context, key string) (string, error)
|
|
Set(context, key, value string) error
|
|
Delete(context, key string) error
|
|
Ref(context, key string) string
|
|
}
|
|
|
|
// FileStore writes 0600 plain-text files under $XDG_CONFIG_HOME/weknora/secrets/<context>.
|
|
// It is the headless / CI default and the keychain fallback (see ADR-17 for
|
|
// namespace strategy).
|
|
type FileStore struct {
|
|
root string
|
|
}
|
|
|
|
// NewFileStore returns a FileStore rooted at $XDG_CONFIG_HOME/weknora/secrets
|
|
// (or ~/.config/weknora/secrets if XDG_CONFIG_HOME is unset). Same convention
|
|
// as config.Path — see that file for the rationale (CLI convention).
|
|
func NewFileStore() (*FileStore, error) {
|
|
root, err := defaultRoot()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &FileStore{root: root}, nil
|
|
}
|
|
|
|
func defaultRoot() (string, error) {
|
|
return xdg.Path("XDG_CONFIG_HOME", ".config", "secrets")
|
|
}
|
|
|
|
func (f *FileStore) path(context, key string) string {
|
|
return filepath.Join(f.root, context, key)
|
|
}
|
|
|
|
func (f *FileStore) Get(context, key string) (string, error) {
|
|
data, err := os.ReadFile(f.path(context, key))
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return "", ErrNotFound
|
|
}
|
|
if err != nil {
|
|
return "", fmt.Errorf("read secret: %w", err)
|
|
}
|
|
return string(data), nil
|
|
}
|
|
|
|
func (f *FileStore) Set(context, key, value string) error {
|
|
dir := filepath.Join(f.root, context)
|
|
if err := os.MkdirAll(dir, 0o700); err != nil {
|
|
return fmt.Errorf("mkdir secrets dir: %w", err)
|
|
}
|
|
if err := os.WriteFile(f.path(context, key), []byte(value), 0o600); err != nil {
|
|
return fmt.Errorf("write secret: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (f *FileStore) Delete(context, key string) error {
|
|
err := os.Remove(f.path(context, key))
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Ref returns the file:// URI under which a secret would be stored. Path
|
|
// component is forward-slash-normalized per RFC 8089 (file:///path on Unix,
|
|
// file:///C:/... on Windows) — the wire format must not depend on platform
|
|
// path separator since this string is persisted to config.yaml and may be
|
|
// consumed by tooling on a different OS.
|
|
func (f *FileStore) Ref(context, key string) string {
|
|
p := filepath.ToSlash(f.path(context, key))
|
|
if !strings.HasPrefix(p, "/") {
|
|
// Windows absolute path "C:/..." needs a leading slash to form a
|
|
// proper file:/// URI ("file:///C:/...").
|
|
p = "/" + p
|
|
}
|
|
return "file://" + p
|
|
}
|
|
|
|
// MemStore is an in-memory implementation of Store used by tests across
|
|
// packages. It is intentionally exported (not _test.go-only) so that
|
|
// downstream packages can compose it without copying the same 20 lines.
|
|
type MemStore struct{ m map[string]string }
|
|
|
|
// NewMemStore returns an empty in-memory secrets store.
|
|
func NewMemStore() *MemStore { return &MemStore{m: map[string]string{}} }
|
|
|
|
func (m *MemStore) k(c, key string) string { return c + ":" + key }
|
|
|
|
func (m *MemStore) Get(c, key string) (string, error) {
|
|
v, ok := m.m[m.k(c, key)]
|
|
if !ok {
|
|
return "", ErrNotFound
|
|
}
|
|
return v, nil
|
|
}
|
|
|
|
func (m *MemStore) Set(c, key, value string) error { m.m[m.k(c, key)] = value; return nil }
|
|
|
|
func (m *MemStore) Delete(c, key string) error { delete(m.m, m.k(c, key)); return nil }
|
|
|
|
// Ref returns a mem:// URI; meaningful only inside tests.
|
|
func (m *MemStore) Ref(c, key string) string { return "mem://" + c + "/" + key }
|