The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
peercred: refuse closed client rows in the Windows TCP table
Claudec0d321da9512
diff --git a/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable.go b/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable.goindex 353403cd..2c9ddfba 100644--- a/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable.go+++ b/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable.go@@ -38,6 +38,10 @@ const (mibTCPStateClosed = 1 // MIB_TCP_STATE_CLOSEDmibTCPStateListen = 2 // MIB_TCP_STATE_LISTEN+ mibTCPStateFinWait1 = 6 // MIB_TCP_STATE_FIN_WAIT1+ mibTCPStateFinWait2 = 7 // MIB_TCP_STATE_FIN_WAIT2+ mibTCPStateClosing = 9 // MIB_TCP_STATE_CLOSING+ mibTCPStateLastAck = 10 // MIB_TCP_STATE_LAST_ACKmibTCPStateTimeWait = 11 // MIB_TCP_STATE_TIME_WAITmibTCPStateDeleteTCB = 12 // MIB_TCP_STATE_DELETE_TCB@@ -95,7 +99,14 @@ func tcpTable6Rows(buf []byte) ([]tcpOwnerRow, error) {// ownerPID finds the process that owns the client end of client -> server among rows: the row whose// local end is client and remote end is server. Rows nobody owns any more are passed over (TIME_WAIT// and the like report PID 0), as is one owned by the System process (PID 4), whose token names-// SYSTEM rather than whoever caused the connection. Two rows with different owners are ambiguous;+// SYSTEM rather than whoever caused the connection.+//+// So is a client end that has already been closed: FIN_WAIT1, FIN_WAIT2, CLOSING and LAST_ACK are+// the states a socket reaches only after its own side closed it. Windows can keep the PID of a+// process that has exited on such an orphaned row, and once that PID is handed to another process+// the re-read in lookupUID would still match and name the new process's account. A client that is+// still sending its export has not closed its end, so these are never the answer (the macOS+// equivalent is the SS_NOFDREF skip). Two rows with different owners are ambiguous;// none is not found.func ownerPID(rows []tcpOwnerRow, client, server *net.TCPAddr) (uint32, error) {var found uint32@@ -106,7 +117,8 @@ func ownerPID(rows []tcpOwnerRow, client, server *net.TCPAddr) (uint32, error) {continue}switch row.state {- case mibTCPStateClosed, mibTCPStateListen, mibTCPStateTimeWait, mibTCPStateDeleteTCB:+ case mibTCPStateClosed, mibTCPStateListen, mibTCPStateTimeWait, mibTCPStateDeleteTCB,+ mibTCPStateFinWait1, mibTCPStateFinWait2, mibTCPStateClosing, mibTCPStateLastAck:continue}if row.pid == pidSystemIdle || row.pid == pidSystem {diff --git a/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable_test.go b/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable_test.goindex 08e49313..71e05828 100644--- a/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable_test.go+++ b/collector-builder/exporter/beaconjsonexporter/internal/peercred/tcptable_test.go@@ -125,6 +125,44 @@ func TestOwnerPIDFixtures(t *testing.T) {rows4: []fixtureRow{{local: client, remote: server, state: mibTCPStateTimeWait, pid: 1234}},err: ErrNotFound,},+ {+ name: "FIN_WAIT1: the client closed its end, and the PID may be an exited process's",+ rows4: []fixtureRow{{local: client, remote: server, state: mibTCPStateFinWait1, pid: 1234}},+ err: ErrNotFound,+ },+ {+ name: "FIN_WAIT2 is a closed client end",+ rows4: []fixtureRow{{local: client, remote: server, state: mibTCPStateFinWait2, pid: 1234}},+ err: ErrNotFound,+ },+ {+ name: "CLOSING is a closed client end",+ rows4: []fixtureRow{{local: client, remote: server, state: mibTCPStateClosing, pid: 1234}},+ err: ErrNotFound,+ },+ {+ name: "LAST_ACK is a closed client end",+ rows4: []fixtureRow{{local: client, remote: server, state: mibTCPStateLastAck, pid: 1234}},+ err: ErrNotFound,+ },+ {+ name: "a closed client end in the IPv6 table is not an answer either",+ rows6: []fixtureRow{{local: &net.TCPAddr{IP: mapped(lo.To4()), Port: client.Port}, remote: &net.TCPAddr{IP: mapped(lo.To4()), Port: server.Port}, state: mibTCPStateFinWait2, pid: 2222}},+ err: ErrNotFound,+ },+ {+ name: "a closed row does not make a live one ambiguous",+ rows4: []fixtureRow{+ {local: client, remote: server, state: mibTCPStateLastAck, pid: 9999},+ {local: client, remote: server, state: estab, pid: 1234},+ },+ want: 1234,+ },+ {+ name: "CLOSE_WAIT is still held by the client (the collector closed first)",+ rows4: []fixtureRow{{local: client, remote: server, state: 8, pid: 1234}},+ want: 1234,+ },{name: "PID 0 is nobody",rows4: []fixtureRow{{local: client, remote: server, state: estab, pid: 0}},