2ee9741fa1
Post-review polish on the v0.7 wire / surface contract. Bundles five
follow-ups that landed after the main BREAKING feat commit:
1. Complete context→profile cascade (internal API + YAML schema)
The prior commit renamed only the user-visible surface (commands /
flags / env / project link / envelope field). The internal Go API
and on-disk config schema were still half-renamed — an L-25
self-consistency violation flagged by post-merge review. Closed here:
Internal Go API:
- config.Context → config.Profile
- config.Config.CurrentContext → CurrentProfile
- config.Config.Contexts → Profiles
- LoginOptions.Context → LoginOptions.Profile
- clearContextSecrets() → clearProfileSecrets()
- saveContextRef() → saveProfileRef()
- secrets.Store: param name `context` → `profile` (interface +
FileStore + KeyringStore + MemStore)
- cmdutil.LoadSecret(store, context, key) → LoadSecret(store, profile, key)
- cmdutil.RefreshAndPersist's ctxName → profileName
- Local var `ctx := &config.Profile{...}` → `prof := &config.Profile{...}`
in auth/login.go to eliminate the visual collision with Go stdlib
context.Context that motivated the whole rename in the first place.
On-disk config.yaml schema:
- current_context: → current_profile:
- contexts: → profiles:
- Pre-1.0 break, no compat alias. Users on v0.6 dogfooded configs
must delete ~/.config/weknora/config.yaml or hand-rename the two
keys (CHANGELOG migration note added).
Tests / fixtures / golden files:
- factory_test.go YAML fixture + assertion updated.
- acceptance/e2e/e2e_test.go writeContextYAML → writeProfileYAML,
fixture YAML keys updated.
- acceptance/testdata/wire/doctor.error_network.json golden updated
("active context" → "active profile" in hint string).
User-visible prose sweep:
- cmd/mcp/serve.go --help Long: "active context (or --context)" →
"active profile (or --profile)" — most-visible miss.
- cmd/{kb/list, search/kb, session/list, api/api} Short/Long help.
- cmd/auth/login.go stdout: `(context=%s)` → `(profile=%s)`.
- cmd/auth/logout.go error: `"no current context"` → `"no current profile"`.
- cmd/doctor/doctor.go hint string (also the wire golden above).
- cmd/auth/refresh.go error: `"refresh token missing for context"` →
`"refresh token missing for profile"`.
- README.md: `## Multi-context` H2 → `## Multi-profile`; code-block
comment `# current context` → `# current profile`.
Code-comment / docstring sweep across cli/cmd/auth/ and
cli/internal/cmdutil/. Comments referencing Go stdlib context.Context,
the RAG / LLM "context window" concept, and historical CHANGELOG
entries for v0.4 / v0.5 were left alone.
CHANGELOG v0.7 BREAKING entry gains the on-disk-schema bullet under
the existing "context → profile" item.
2. Profile name validation (shell-injection guard)
`envelope.error.retry_command` is a single shell-string field. An
AI agent that exec()s it via `sh -c <retry_command>` was injectable
through a maliciously-named profile:
weknora auth logout --name 'x; rm -rf ~'
# would produce: retry_command = "weknora auth logout --name x; rm -rf ~ -y"
`cmd/profile/add.go` already enforced an alphanumeric + `-_.`
allowlist via `validateName`. The `auth login` and `auth logout`
paths bypassed it.
- Moved validation from `cmd/profile/add.go` to
`cli/internal/cmdutil/profilename.go` as exported
`ValidateProfileName` (cmdutil is the import-cycle-safe home;
internal/config can't depend on cmdutil).
- `auth login` runs the validator before any persist call.
- `auth logout` runs the validator on `opts.Name` before
constructing `retry_command`.
- Unit tests (`profilename_test.go`) cover the allowlist, empty
rejection, path-traversal, shell metacharacters (`;`, `&`, `|`,
`$()`, backticks, quotes, whitespace, glob, redirects), and the
user-facing hint text. The shell-metachar test exists as a
regression guard.
Wire shape (`retry_command` string → `retry_command_argv []string`)
remains a v0.8 additive change per ROADMAP — this fix removes the
practical exploit path without touching the wire contract.
3. AI-agent terminology disambiguation
"agent" has three referents in this codebase: (a) WeKnora's
server-side Custom Agent resource, (b) the removed `agent invoke`
verb, (c) external LLM/automation consumers. Per project memory
feedback_no_meta_disambiguation_in_docs, the fix is full-term
naming, not "X has N meanings" prose. Surgical changes at section
headers + ambiguous prose:
- AGENTS.md: "Agent decision shortcuts" → "AI agent decision
shortcuts"; "agent-callable surface" → "AI-agent-callable
surface".
- README.md: "Designed to be agent-first" → "AI-agent-first";
"Other agent ergonomics" → "Other AI-agent ergonomics"; "in
agent contexts" → "in AI-agent contexts"; "for CI / agents" →
"for CI / AI agents".
Anaphoric "agents" inside paragraphs that already established
"AI agents" was left alone — full substitution everywhere would
have been prose noise without clarity gain.
4. Wire-contract review follow-ups
Real findings from a second-pass review of the v0.7 envelope /
streaming / surface design. Per project memory
feedback_check_in_domain_anchor_first, candidate findings were
first verified against the in-domain peer CLI explicitly cited as
the envelope anchor; two earlier-flagged issues turned out to be
in-pattern and were withdrawn.
Surviving fixes:
- AGENTS.md success-envelope example rewritten. The prior example
showed `has_more: false` / `_notice: {}` as if they were always
present, but both fields are `omitempty` and never serialize
when zero / nil. Replaced with three realistic shapes (list /
single resource / mutation with no payload) and added a note
that optional fields are omitted when empty.
- cmd/chat/chat.go Args: MinimumNArgs(1) → ExactArgs(1).
v0.6 silently joined `weknora chat hello world` into
`"hello world"`. v0.7 now rejects multi-arg with exit 2,
matching `weknora session ask`. BREAKING; CHANGELOG entry
added under v0.7 BREAKING.
- internal/output/envelope.go extracts NewEnvelope(data, meta,
profile) constructor. The jq-filter path in
cmdutil.FormatOptions.Emit was manually rebuilding the
envelope literal alongside the canonical WriteEnvelope path —
drift risk when fields are added. Single construction point now.
- internal/cmdutil/factory.go adds AddKBFlag(cmd) helper.
Five files (chat, doc/list, doc/upload, doc/create, doc/fetch)
had verbatim-identical `cmd.Flags().String("kb", ...)`
declarations. Centralised so flag name + help text stay
in sync with Factory.ResolveKB. Docstring reordering + gofmt
fixup landed in the same edit to keep ResolveKB's own godoc
attached to its function.
5. OSS-readiness comment / doc sweep
Pre-publication scrub of code, comments, and shipped Markdown to
remove references that only make sense in the development repo:
- AGENTS.md "Deliberate deviations + mainstream alignments"
section: removed peer-project name-drops from the comparison
table; rewrote as five flagged design decisions with rationale
but no specific competitor named. The four rows that previously
contrasted against a named peer CLI now state WeKnora's choice
+ rationale directly. Section header renamed to "Design
decisions worth flagging" since it is no longer a
deviation/alignment matrix.
- CHANGELOG v0.7 BREAKING rationales: three references to a
named peer CLI removed; the context→profile rationale now
cites only mainstream multi-credential CLIs by category (AWS /
Stripe / OpenAI / Anthropic), and the `api -d/--data` removal
rationale cites only `gh api` / `curl`. `chat` BREAKING entry
rationale similarly simplified.
- 35 cross-references to design-spec section numbers (§4.1 /
§4.5 / §5.3 etc.) removed from Go doc comments and test
comments across 13 files. The referenced spec lives outside
the shipped tree; readers of the public repo cannot resolve
them. Each reference replaced with a self-contained semantic
description (e.g. "the batch envelope" / "AGENTS.md section
on the success path").
- Mixed-language strings translated to English:
- Four Go comments: internal/cmdutil/exit.go:213,215,
internal/cmdutil/errors.go:156,
internal/output/batch_test.go:90,
internal/output/envelope_test.go:27.
- One CHANGELOG section title:
`v0.7 — Agent-first wire contract + 命令面集中清理` →
`... + command-surface cleanup`.
- CJK test fixtures (internal/text/truncate_test.go CJK
truncation cases, cmd/session/list_test.go Chinese session
title, acceptance/e2e/e2e_test.go Chinese RAG corpus)
retained — they are intentional test inputs, not stray prose.
- Makefile help comment: `golangci-lint added in PR-9` →
`golangci-lint planned`. Internal PR numbering should not
surface in shipped Makefile prose.
Build green, 28/28 packages, +5 new ValidateProfileName tests.
go vet / gofmt / go mod verify / go mod tidy all clean.
Rationale for the cascade: pre-1.0 is the cheapest moment to close
L-25 self-consistency (L-26). The half-finished internal rename
would have perpetuated the very `context` vs `context.Context`
ambiguity that motivated v0.7's user-visible rename in the first
place.
314 lines
12 KiB
Go
314 lines
12 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/config"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/secrets"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
// authLoginFields enumerates the fields surfaced for `--format json` discovery on
|
|
// `auth login`. The post-login summary has no token values - they stay in the
|
|
// keyring; agents who need to verify the credential should re-run
|
|
// `auth status`.
|
|
var authLoginFields = []string{
|
|
"profile", "host", "mode", "user", "tenant_id",
|
|
}
|
|
|
|
// LoginOptions is the configuration captured from flags + prompts.
|
|
type LoginOptions struct {
|
|
Host string // --host
|
|
Profile string // --name: profile name to write into config.yaml
|
|
WithToken bool // --with-token: read api key from stdin instead of prompting password
|
|
APIKey string // populated by --with-token from stdin
|
|
Email string
|
|
Password string
|
|
StdinReader io.Reader // override for tests
|
|
}
|
|
|
|
// LoginService is the narrow SDK surface auth login depends on.
|
|
// *sdk.Client satisfies it implicitly via the new Login(ctx, LoginRequest)
|
|
// signature added in client/auth.go.
|
|
type LoginService interface {
|
|
Login(ctx context.Context, req sdk.LoginRequest) (*sdk.LoginResponse, error)
|
|
}
|
|
|
|
// apiKeyValidator probes /auth/me with the supplied API key so a bad key
|
|
// fails fast at `auth login --with-token` time rather than on the next
|
|
// authenticated call.
|
|
//
|
|
// Returns the resolved user (used to populate Profile.User / TenantID at
|
|
// rest, so later `auth list` reflects who owns the key).
|
|
type apiKeyValidator func(ctx context.Context, host, apiKey string) (*sdk.AuthUser, error)
|
|
|
|
// defaultAPIKeyValidator builds a one-shot SDK client with the supplied key
|
|
// and calls /auth/me. Side-effect-free; no persistence.
|
|
var defaultAPIKeyValidator apiKeyValidator = func(ctx context.Context, host, apiKey string) (*sdk.AuthUser, error) {
|
|
resp, err := sdk.NewClient(host, sdk.WithAPIKey(apiKey)).GetCurrentUser(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !resp.Success || resp.Data.User == nil {
|
|
return nil, fmt.Errorf("server rejected the API key (no user returned)")
|
|
}
|
|
return resp.Data.User, nil
|
|
}
|
|
|
|
// NewCmdLogin builds the `weknora auth login` command. runF is the testable
|
|
// entrypoint (left nil for production; see cli/cmd/auth/login_test.go).
|
|
func NewCmdLogin(f *cmdutil.Factory, runF func(context.Context, *LoginOptions, *cmdutil.FormatOptions, *cmdutil.Factory, LoginService) error) *cobra.Command {
|
|
opts := &LoginOptions{}
|
|
cmd := &cobra.Command{
|
|
Use: "login",
|
|
Short: "Authenticate against a WeKnora server and persist credentials",
|
|
Long: `Log in by email + password (interactive prompt) or pipe an API key with --with-token.
|
|
|
|
Credentials are persisted to the OS keyring when available; otherwise to a
|
|
0600 file under $XDG_CONFIG_HOME/weknora/secrets. The named profile becomes
|
|
the current_profile in ~/.config/weknora/config.yaml.`,
|
|
Args: cobra.NoArgs,
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
fopts, err := cmdutil.CheckFormatFlag(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fopts.ResolveDefault(iostreams.IO.IsStdoutTTY())
|
|
run := runF
|
|
if run == nil {
|
|
run = runLogin
|
|
}
|
|
svc := loginServiceFor(opts.Host)
|
|
if opts.StdinReader == nil {
|
|
opts.StdinReader = iostreams.IO.In
|
|
}
|
|
return run(c.Context(), opts, fopts, f, svc)
|
|
},
|
|
}
|
|
cmd.Flags().StringVar(&opts.Host, "host", "", "WeKnora server URL, e.g. https://kb.example.com")
|
|
cmd.Flags().StringVar(&opts.Profile, "name", "default", "Profile name to register in config.yaml")
|
|
cmd.Flags().BoolVar(&opts.WithToken, "with-token", false, "Read an API key from stdin instead of prompting for password")
|
|
cmdutil.AddFormatFlag(cmd, authLoginFields...)
|
|
_ = cmd.MarkFlagRequired("host")
|
|
return cmd
|
|
}
|
|
|
|
// loginServiceFor returns a fresh SDK client targeting host. login.go cannot
|
|
// reuse Factory.Client because that closure requires an existing profile.
|
|
func loginServiceFor(host string) LoginService {
|
|
if host == "" {
|
|
return nil
|
|
}
|
|
return sdk.NewClient(host)
|
|
}
|
|
|
|
func runLogin(ctx context.Context, opts *LoginOptions, fopts *cmdutil.FormatOptions, f *cmdutil.Factory, svc LoginService) error {
|
|
if err := validateHost(opts.Host); err != nil {
|
|
return err
|
|
}
|
|
// Reject shell-metacharacter / path-like names up-front so opts.Profile
|
|
// stays safe to interpolate into the keyring namespace, config.yaml
|
|
// keys, and (later) envelope.error.retry_command. Matches `profile add`.
|
|
if err := cmdutil.ValidateProfileName(opts.Profile); err != nil {
|
|
return err
|
|
}
|
|
|
|
if opts.WithToken {
|
|
key, err := readStdinTrimmed(opts.StdinReader)
|
|
if err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "read stdin")
|
|
}
|
|
if key == "" {
|
|
return cmdutil.NewError(cmdutil.CodeInputMissingFlag, "--with-token requires an API key piped to stdin")
|
|
}
|
|
opts.APIKey = key
|
|
// Validate against the server before persisting so a typo'd /
|
|
// expired / wrong-host key fails fast at login time. The probe
|
|
// is /auth/me - read-only, side-effect-free.
|
|
user, err := defaultAPIKeyValidator(ctx, opts.Host, key)
|
|
if err != nil {
|
|
// Transport errors (connection refused, DNS failure) must not be
|
|
// surfaced as auth.bad_credential — the key may be fine but the
|
|
// host is unreachable. Classify via WrapHTTP so network errors
|
|
// get CodeNetworkError and the hint points at `weknora doctor`.
|
|
if cmdutil.ClassifyHTTPError(err) == cmdutil.CodeNetworkError {
|
|
return cmdutil.Wrapf(cmdutil.CodeNetworkError, err, "validate API key: check host reachability")
|
|
}
|
|
return cmdutil.Wrapf(cmdutil.CodeAuthBadCredential, err, "validate API key")
|
|
}
|
|
return persistAPIKey(opts, fopts, f, user)
|
|
}
|
|
|
|
// Interactive: prompt for email + password.
|
|
if svc == nil {
|
|
return cmdutil.NewError(cmdutil.CodeServerError, "login: no SDK client (host missing?)")
|
|
}
|
|
if opts.Email == "" || opts.Password == "" {
|
|
p := f.Prompter()
|
|
if opts.Email == "" {
|
|
email, err := p.Input("Email", "")
|
|
if err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeInputMissingFlag, err, "email prompt")
|
|
}
|
|
opts.Email = email
|
|
}
|
|
if opts.Password == "" {
|
|
pw, err := p.Password("Password")
|
|
if err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeInputMissingFlag, err, "password prompt")
|
|
}
|
|
opts.Password = pw
|
|
}
|
|
}
|
|
|
|
resp, err := svc.Login(ctx, sdk.LoginRequest{Email: opts.Email, Password: opts.Password})
|
|
if err != nil {
|
|
// Transport errors (connection refused, DNS failure) must not be
|
|
// surfaced as auth.bad_credential — credentials may be fine but the
|
|
// host is unreachable. Classify so network errors get CodeNetworkError.
|
|
if cmdutil.ClassifyHTTPError(err) == cmdutil.CodeNetworkError {
|
|
return cmdutil.Wrapf(cmdutil.CodeNetworkError, err, "login: check host reachability")
|
|
}
|
|
return cmdutil.Wrapf(cmdutil.CodeAuthBadCredential, err, "login")
|
|
}
|
|
if !resp.Success || resp.Token == "" {
|
|
return cmdutil.NewError(cmdutil.CodeAuthBadCredential, fmt.Sprintf("login refused: %s", resp.Message))
|
|
}
|
|
|
|
return persistJWT(opts, fopts, f, resp)
|
|
}
|
|
|
|
// persistAPIKey saves the --with-token API key and writes the profile.
|
|
// user is the principal returned by /auth/me during pre-persist validation,
|
|
// used to populate Profile.User / TenantID so `auth list` reflects who
|
|
// owns the key.
|
|
func persistAPIKey(opts *LoginOptions, fopts *cmdutil.FormatOptions, f *cmdutil.Factory, user *sdk.AuthUser) error {
|
|
store, err := f.Secrets()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
warnOnFileFallback(store)
|
|
if err := store.Set(opts.Profile, "api_key", opts.APIKey); err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalKeychainDenied, err, "save api key")
|
|
}
|
|
prof := &config.Profile{
|
|
Host: opts.Host,
|
|
APIKeyRef: store.Ref(opts.Profile, "api_key"),
|
|
}
|
|
if user != nil {
|
|
prof.User = user.Email
|
|
prof.TenantID = user.TenantID
|
|
}
|
|
return saveProfileRef(opts, fopts, f, prof, user)
|
|
}
|
|
|
|
// persistJWT saves access + refresh tokens and writes the profile.
|
|
func persistJWT(opts *LoginOptions, fopts *cmdutil.FormatOptions, f *cmdutil.Factory, resp *sdk.LoginResponse) error {
|
|
store, err := f.Secrets()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
warnOnFileFallback(store)
|
|
if err := store.Set(opts.Profile, "access", resp.Token); err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalKeychainDenied, err, "save access token")
|
|
}
|
|
if resp.RefreshToken != "" {
|
|
if err := store.Set(opts.Profile, "refresh", resp.RefreshToken); err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalKeychainDenied, err, "save refresh token")
|
|
}
|
|
}
|
|
prof := &config.Profile{
|
|
Host: opts.Host,
|
|
TokenRef: store.Ref(opts.Profile, "access"),
|
|
RefreshRef: store.Ref(opts.Profile, "refresh"),
|
|
}
|
|
if resp.User != nil {
|
|
prof.User = resp.User.Email
|
|
prof.TenantID = resp.User.TenantID
|
|
}
|
|
return saveProfileRef(opts, fopts, f, prof, resp.User)
|
|
}
|
|
|
|
// loginResult is the typed payload emitted by `--format json`. mode is derived from
|
|
// whether the server returned a user (password flow) vs API-key flow.
|
|
type loginResult struct {
|
|
Profile string `json:"profile"`
|
|
Host string `json:"host"`
|
|
Mode string `json:"mode"` // ModeBearer or ModeAPIKey
|
|
User string `json:"user,omitempty"`
|
|
TenantID uint64 `json:"tenant_id,omitempty"`
|
|
}
|
|
|
|
// saveProfileRef writes the profile to config.yaml and prints success.
|
|
func saveProfileRef(opts *LoginOptions, fopts *cmdutil.FormatOptions, f *cmdutil.Factory, prof *config.Profile, user *sdk.AuthUser) error {
|
|
cfg, err := f.Config()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if cfg.Profiles == nil {
|
|
cfg.Profiles = map[string]config.Profile{}
|
|
}
|
|
cfg.Profiles[opts.Profile] = *prof
|
|
cfg.CurrentProfile = opts.Profile
|
|
if err := config.Save(cfg); err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "save config")
|
|
}
|
|
if fopts.WantsJSON() {
|
|
result := loginResult{Profile: opts.Profile, Host: opts.Host, Mode: ModeAPIKey}
|
|
if user != nil {
|
|
result.Mode = ModeBearer
|
|
result.User = user.Email
|
|
result.TenantID = user.TenantID
|
|
}
|
|
return fopts.Emit(iostreams.IO.Out, result, nil)
|
|
}
|
|
who := opts.Profile
|
|
if user != nil {
|
|
who = user.Email
|
|
}
|
|
fmt.Fprintf(iostreams.IO.Out, "✓ Logged in to %s as %s (profile=%s)\n", opts.Host, who, opts.Profile)
|
|
return nil
|
|
}
|
|
|
|
// validateHost rejects empty / non-http URLs early so we surface a clean
|
|
// flag error instead of failing inside the SDK transport.
|
|
func validateHost(host string) error {
|
|
_, err := cmdutil.NormalizeHost(host)
|
|
return err
|
|
}
|
|
|
|
// warnOnFileFallback prints a one-shot stderr advisory when the secrets
|
|
// store fell back to the plaintext 0600 file backend (keychain unavailable
|
|
// - typical on headless CI, WSL without DBus, agent containers). Helps
|
|
// users notice that credentials are NOT in the OS keychain before they're
|
|
// surprised by it later. doctor's credential_storage check carries the
|
|
// same info but agents that bypass doctor would otherwise miss it.
|
|
func warnOnFileFallback(store secrets.Store) {
|
|
if _, isFile := store.(*secrets.FileStore); !isFile {
|
|
return
|
|
}
|
|
fmt.Fprintln(iostreams.IO.Err, "warning: OS keychain unavailable - credentials will be saved to a 0600 file under $XDG_CONFIG_HOME/weknora/secrets/.")
|
|
fmt.Fprintln(iostreams.IO.Err, " install / unlock the keyring (or use `weknora doctor` to inspect) for OS-backed storage.")
|
|
}
|
|
|
|
// readStdinTrimmed reads all of r and returns the result with surrounding
|
|
// whitespace stripped. Empty result is returned as-is for the caller to
|
|
// validate.
|
|
func readStdinTrimmed(r io.Reader) (string, error) {
|
|
if r == nil {
|
|
return "", nil
|
|
}
|
|
b, err := io.ReadAll(r)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(b)), nil
|
|
}
|