From dcc2cdac4b72787f18590ead88a7d8eec778d61e Mon Sep 17 00:00:00 2001 From: Tim Lee Date: Thu, 6 Jun 2024 12:24:43 -0600 Subject: [PATCH] Add fleetd SOFA user agent (#19359) --- go.mod | 2 +- go.sum | 4 ++-- orbit/changes/19276-sofa-user-agent | 1 + orbit/pkg/table/extension_darwin.go | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 orbit/changes/19276-sofa-user-agent diff --git a/go.mod b/go.mod index dbdc434c03..2ea45662d5 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/kevinburke/go-bindata v3.24.0+incompatible github.com/kolide/launcher v1.0.12 github.com/lib/pq v1.10.9 - github.com/macadmins/osquery-extension v1.0.1 + github.com/macadmins/osquery-extension v1.1.3-0.20240530154548-05bb97403086 github.com/mattermost/xml-roundtrip-validator v0.0.0-20201213122252-bcd7e1b9601e github.com/mattn/go-sqlite3 v1.14.22 github.com/micromdm/micromdm v1.9.0 diff --git a/go.sum b/go.sum index eb067ba4b2..8a3d947789 100644 --- a/go.sum +++ b/go.sum @@ -836,8 +836,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/macadmins/osquery-extension v1.0.1 h1:SW6Vkr4t3scMsjl4vUHgNbL7Fo8CbxE+c5FR+m5fCzo= -github.com/macadmins/osquery-extension v1.0.1/go.mod h1:q0BnBuYocHBRB+m3AQwdQNETH5a2KzVT3S8TKMHo9Lk= +github.com/macadmins/osquery-extension v1.1.3-0.20240530154548-05bb97403086 h1:pom8HjoknG5GF+cqeTP+2sXIn8Tl8Y7cinlPNv0O+LY= +github.com/macadmins/osquery-extension v1.1.3-0.20240530154548-05bb97403086/go.mod h1:q0BnBuYocHBRB+m3AQwdQNETH5a2KzVT3S8TKMHo9Lk= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= diff --git a/orbit/changes/19276-sofa-user-agent b/orbit/changes/19276-sofa-user-agent new file mode 100644 index 0000000000..9c63fce2d7 --- /dev/null +++ b/orbit/changes/19276-sofa-user-agent @@ -0,0 +1 @@ +HTTP calls from the SOFA macOS tables now identified by a 'fleetd' user agent \ No newline at end of file diff --git a/orbit/pkg/table/extension_darwin.go b/orbit/pkg/table/extension_darwin.go index fe76092bb8..7cdbd9250f 100644 --- a/orbit/pkg/table/extension_darwin.go +++ b/orbit/pkg/table/extension_darwin.go @@ -4,6 +4,7 @@ package table import ( "context" + "github.com/fleetdm/fleet/v4/orbit/pkg/table/authdb" "github.com/fleetdm/fleet/v4/orbit/pkg/table/csrutil_info" "github.com/fleetdm/fleet/v4/orbit/pkg/table/dataflattentable" @@ -70,13 +71,13 @@ func PlatformTables(opts PluginOpts) []osquery.OsqueryPlugin { table.NewPlugin( "sofa_security_release_info", sofa.SofaSecurityReleaseInfoColumns(), func(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) { - return sofa.SofaSecurityReleaseInfoGenerate(ctx, queryContext, opts.Socket) + return sofa.SofaSecurityReleaseInfoGenerate(ctx, queryContext, opts.Socket, sofa.WithUserAgent("fleetd")) }, ), table.NewPlugin( "sofa_unpatched_cves", sofa.SofaUnpatchedCVEsColumns(), func(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) { - return sofa.SofaUnpatchedCVEsGenerate(ctx, queryContext, opts.Socket) + return sofa.SofaUnpatchedCVEsGenerate(ctx, queryContext, opts.Socket, sofa.WithUserAgent("fleetd")) }, ),