Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

ci: use env-var references for SIEM tokens in collector config

Cursor Agent06fa37e43d98
diff --git a/cli/beacon/internal/ci/forward.go b/cli/beacon/internal/ci/forward.go
index 8fe8296c..55a1c54e 100644
--- a/cli/beacon/internal/ci/forward.go
+++ b/cli/beacon/internal/ci/forward.go
@@ -123,6 +123,20 @@ func stripEnv(env []string, keys ...string) []string {
return out
}
+// replaceTokensWithEnvRefs replaces raw SIEM tokens in the config with
+// OTel Collector ${env:VAR} references so the secret is never written to disk.
+func replaceTokensWithEnvRefs(cfg *endpointconfig.Config) {
+ if cfg.Destinations == nil {
+ return
+ }
+ if splunk := cfg.Destinations.SplunkHEC; splunk != nil && splunk.Token != "" {
+ splunk.Token = "${env:" + EnvSplunkToken + "}"
+ }
+ if falcon := cfg.Destinations.FalconHEC; falcon != nil && falcon.Token != "" {
+ falcon.Token = "${env:" + EnvFalconToken + "}"
+ }
+}
+
func firstNonEmpty(values ...string) string {
for _, value := range values {
if trimmed := strings.TrimSpace(value); trimmed != "" {
diff --git a/cli/beacon/internal/ci/session.go b/cli/beacon/internal/ci/session.go
index 6481f431..8470cf22 100644
--- a/cli/beacon/internal/ci/session.go
+++ b/cli/beacon/internal/ci/session.go
@@ -129,6 +129,10 @@ func Provision(opts Options) (*Session, error) {
}
cfg.Destinations = destinations
forwardEndpoint = forwardEndpointOf(destinations)
+ // Replace raw tokens with OTel Collector env-var references so the
+ // secret is never written to disk. The collector inherits the parent
+ // environment and can resolve them; the child has these vars stripped.
+ replaceTokensWithEnvRefs(&cfg)
}
if err := os.MkdirAll(filepath.Dir(logPath), 0755); err != nil {
return nil, err
diff --git a/cli/beacon/internal/ci/session_test.go b/cli/beacon/internal/ci/session_test.go
index 06f28cd3..35cc05c1 100644
--- a/cli/beacon/internal/ci/session_test.go
+++ b/cli/beacon/internal/ci/session_test.go
@@ -280,8 +280,11 @@ func TestProvisionForwardWritesSecureExporterConfig(t *testing.T) {
if !strings.Contains(yaml, "splunk_hec:") {
t.Fatalf("collector config missing splunk_hec exporter:\n%s", yaml)
}
- if !strings.Contains(yaml, "top-secret-token") {
- t.Fatal("collector config missing forwarder token")
+ if strings.Contains(yaml, "top-secret-token") {
+ t.Fatal("raw token must not appear in collector config on disk")
+ }
+ if !strings.Contains(yaml, "${env:"+EnvSplunkToken+"}") {
+ t.Fatalf("collector config should use env-var reference for token:\n%s", yaml)
}
info, err := os.Stat(session.ConfigPath)