mirror of
https://github.com/BaaRai/ARTEX.git
synced 2026-11-13 11:40:53 +08:00
BaaRai
e6f4de5ddc
The scrub ran in main after server.New returned, but New resumes every non-terminal task before returning, and those loops start workers that run shells. Move the scrub into New, right after both environment readers, and start MCP discovery after it as well: both paths spawn child processes. New takes an option rather than scrubbing unconditionally. The test suite builds several servers in one process and still needs ARTEX_PG_DSN on later calls, so only the binary opts in.
31 lines
1.3 KiB
Go
31 lines
1.3 KiB
Go
package server
|
|
|
|
import "os"
|
|
|
|
// secretEnv lists the credentials read from the environment only at startup:
|
|
// ARTEX_PG_DSN by NewManager, the API keys by agent.FromEnv inside New.
|
|
var secretEnv = []string{"ARTEX_PG_DSN", "ANTHROPIC_API_KEY", "OPENAI_API_KEY"}
|
|
|
|
// ScrubSecretEnv removes secretEnv from the process environment once startup has
|
|
// read it. Child processes (agent shells, custom tools, MCP stdio servers) copy
|
|
// os.Environ() when they are spawned, so they no longer inherit these values.
|
|
//
|
|
// It runs inside New, after both readers and before the MCP discovery goroutine
|
|
// and the task resume loop: both can spawn children, and resuming a task starts
|
|
// workers that run shells. Scrubbing in main after New returned left that window
|
|
// open.
|
|
func ScrubSecretEnv() {
|
|
for _, k := range secretEnv {
|
|
_ = os.Unsetenv(k)
|
|
}
|
|
}
|
|
|
|
// Option configures New. Options keep the test call sites unchanged: only the
|
|
// binary opts into scrubbing, because tests create several servers in one
|
|
// process and still need ARTEX_PG_DSN on later calls.
|
|
type Option func(*Server)
|
|
|
|
// WithSecretScrub makes New drop the startup secrets after reading them, before
|
|
// the MCP discovery goroutine and the task resume loop can spawn children.
|
|
func WithSecretScrub() Option { return func(s *Server) { s.scrubSecrets = true } }
|