Skip to content

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

beacon_ingest: bound the Windows account-name lookup

Claudeb4680b60af2b
diff --git a/collector-builder/exporter/beaconjsonexporter/beaconingestextension/extension_windows_test.go b/collector-builder/exporter/beaconjsonexporter/beaconingestextension/extension_windows_test.go
index 6095cd83..3e5ea99e 100644
--- a/collector-builder/exporter/beaconjsonexporter/beaconingestextension/extension_windows_test.go
+++ b/collector-builder/exporter/beaconjsonexporter/beaconingestextension/extension_windows_test.go
@@ -154,3 +154,22 @@ func TestValidWindowsName(t *testing.T) {
}
}
}
+
+// A directory service that does not answer costs one connection the lookup timeout, not the
+// client's whole budget: the event is named by SID only.
+func TestResolveNameGivesUpOnASlowLookup(t *testing.T) {
+ prev := lookupAccount
+ release := make(chan struct{})
+ lookupAccount = func(string) (*user.User, error) {
+ <-release
+ return &user.User{Username: `CONTOSO\late`}, nil
+ }
+ t.Cleanup(func() { close(release); lookupAccount = prev })
+ start := time.Now()
+ if got := resolveName("S-1-5-21-1-2-3-1001"); got != "" {
+ t.Fatalf("resolveName = %q, want nothing past the timeout", got)
+ }
+ if elapsed := time.Since(start); elapsed > nameLookupTimeout+time.Second {
+ t.Fatalf("resolveName took %v", elapsed)
+ }
+}
diff --git a/collector-builder/exporter/beaconjsonexporter/beaconingestextension/names_windows.go b/collector-builder/exporter/beaconjsonexporter/beaconingestextension/names_windows.go
index deb5c698..477ff9d2 100644
--- a/collector-builder/exporter/beaconjsonexporter/beaconingestextension/names_windows.go
+++ b/collector-builder/exporter/beaconjsonexporter/beaconingestextension/names_windows.go
@@ -5,19 +5,35 @@ package beaconingestextension
import (
"os/user"
"strings"
+ "time"
)
// resolveName names a SID: DOMAIN\user, the form Windows hooks write to user.name. os/user asks
-// LookupAccountSid, which consults the domain on a domain-joined machine; Windows has no id(1) to
-// fall back to.
+// LookupAccountSid, which consults a domain controller on a domain-joined machine and can wait on
+// one that does not answer, so the lookup is bounded by nameLookupTimeout like id(1) on Unix: past
+// it the event is named by SID only, and the cache retries later. Windows has no id(1) to fall
+// back to.
func resolveName(sid string) string {
- u, err := user.LookupId(sid)
- if err != nil || !validWindowsName(u.Username) {
+ done := make(chan string, 1)
+ go func() {
+ u, err := lookupAccount(sid)
+ if err != nil || !validWindowsName(u.Username) {
+ done <- ""
+ return
+ }
+ done <- u.Username
+ }()
+ select {
+ case name := <-done:
+ return name
+ case <-time.After(nameLookupTimeout):
return ""
}
- return u.Username
}
+// lookupAccount is os/user.LookupId; tests replace it.
+var lookupAccount = user.LookupId
+
// validWindowsName is validName with spaces allowed inside the name, as Windows account names
// allow them ("CONTOSO\Jane Doe"); still no control characters, nothing at either end, bounded.
func validWindowsName(name string) bool {