Merge branch 'main' into james/presence-detection-callback

.golangci.yml

@@ -43,6 +43,8 @@ linters-settings:
         msg: use gowrapper.Go() instead of raw goroutines for proper panic handling
       - p: \.Cmd\.(Run|Start|Output|CombinedOutput)
         msg: "Do not call embedded exec.Cmd methods directly on TracedCmd; call TracedCmd.Run(), TracedCmd.Start(), etc. instead"
+      - p: ^table\.NewPlugin.*$
+        msg: use ee/tables/tablewrapper to enforce timeouts on table queries
   sloglint:
     kv-only: true
     context: "all"

ee/katc/config.go

@@ -7,6 +7,7 @@ import (
 	"log/slog"
 
 	"github.com/kolide/launcher/ee/indexeddb"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/osquery/osquery-go"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -144,7 +145,7 @@ func ConstructKATCTables(config map[string]string, slogger *slog.Logger) []osque
 		}
 
 		t, columns := newKatcTable(tableName, cfg, slogger)
-		plugins = append(plugins, table.NewPlugin(tableName, columns, t.generate))
+		plugins = append(plugins, tablewrapper.New(slogger, tableName, columns, t.generate))
 	}
 
 	return plugins

ee/tables/airport/table_darwin.go

@@ -16,6 +16,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -41,7 +42,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("name", tableName),
 	}
 
-	return table.NewPlugin(t.name, columns, t.generate)
+	return tablewrapper.New(slogger, t.name, columns, t.generate)
 }
 
 type airportExecutor struct {

ee/tables/app-icons/app_icons_darwin.go

@@ -27,13 +27,15 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
+	"log/slog"
 
 	"fmt"
 	"hash/crc64"
 	"image"
 	"image/png"
 	"unsafe"
 
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/nfnt/resize"
 	"github.com/osquery/osquery-go/plugin/table"
@@ -43,13 +45,13 @@ import (
 
 var crcTable = crc64.MakeTable(crc64.ECMA)
 
-func AppIcons() *table.Plugin {
+func AppIcons(slogger *slog.Logger) *table.Plugin {
 	columns := []table.ColumnDefinition{
 		table.TextColumn("path"),
 		table.TextColumn("icon"),
 		table.TextColumn("hash"),
 	}
-	return table.NewPlugin("kolide_app_icons", columns, generateAppIcons)
+	return tablewrapper.New(slogger, "kolide_app_icons", columns, generateAppIcons)
 }
 
 func generateAppIcons(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/apple_silicon_security_policy/table.go

@@ -13,6 +13,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -32,7 +33,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", tableName),
 	}
 
-	return table.NewPlugin(tableName, columns, t.generate)
+	return tablewrapper.New(slogger, tableName, columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/crowdstrike/falcon_kernel_check/table.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -32,7 +33,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", tableName),
 	}
 
-	return table.NewPlugin(tableName, columns, t.generate)
+	return tablewrapper.New(slogger, tableName, columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/crowdstrike/falconctl/table.go

@@ -14,6 +14,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -58,11 +59,11 @@ func NewFalconctlOptionTable(slogger *slog.Logger) *table.Plugin {
 		execFunc:  tablehelpers.RunSimple,
 	}
 
-	return table.NewPlugin(t.tableName, columns, t.generate)
+	return tablewrapper.New(slogger, t.tableName, columns, t.generate)
 }
 
 func (t *falconctlOptionsTable) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {
-	ctx, span := traces.StartSpan(ctx, "table_name", "kolide_falconctl_options")
+	ctx, span := traces.StartSpan(ctx, "table_name", t.tableName)
 	defer span.End()
 
 	var results []map[string]string

ee/tables/cryptoinfotable/table.go

@@ -14,6 +14,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -32,7 +33,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", "kolide_cryptinfo"),
 	}
 
-	return table.NewPlugin("kolide_cryptoinfo", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_cryptinfo", columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/cryptsetup/table.go

@@ -13,6 +13,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -34,7 +35,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		name:    "kolide_cryptsetup_status",
 	}
 
-	return table.NewPlugin(t.name, columns, t.generate)
+	return tablewrapper.New(slogger, t.name, columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/dataflattentable/exec.go

@@ -10,6 +10,7 @@ import (
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 	"github.com/pkg/errors"
@@ -42,7 +43,7 @@ func TablePluginExec(slogger *slog.Logger, tableName string, dataSourceType Data
 
 	t.flattenBytesFunc = dataSourceType.FlattenBytesFunc(t.keyValueSeparator)
 
-	return table.NewPlugin(t.tableName, columns, t.generateExec)
+	return tablewrapper.New(slogger, t.tableName, columns, t.generateExec)
 }
 
 func (t *Table) generateExec(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/dataflattentable/exec_and_parse.go

@@ -11,6 +11,7 @@ import (
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 	"github.com/pkg/errors"
@@ -66,7 +67,7 @@ func NewExecAndParseTable(slogger *slog.Logger, tableName string, p parser, cmd
 		opt(t)
 	}
 
-	return table.NewPlugin(t.tableName, Columns(), t.generate)
+	return tablewrapper.New(slogger, t.tableName, Columns(), t.generate)
 }
 
 func (t *execTableV2) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/dataflattentable/tables.go

@@ -12,6 +12,7 @@ import (
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go"
 	"github.com/osquery/osquery-go/plugin/table"
@@ -125,7 +126,7 @@ func TablePlugin(slogger *slog.Logger, dataSourceType DataSourceType) osquery.Os
 
 	t.slogger = slogger.With("table", t.tableName)
 
-	return table.NewPlugin(t.tableName, columns, t.generate)
+	return tablewrapper.New(slogger, t.tableName, columns, t.generate)
 
 }
 

ee/tables/desktopprocs/desktopprocs.go

@@ -3,20 +3,22 @@ package desktopprocs
 import (
 	"context"
 	"fmt"
+	"log/slog"
 
 	"github.com/kolide/launcher/ee/desktop/runner"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
 
-func TablePlugin() *table.Plugin {
+func TablePlugin(slogger *slog.Logger) *table.Plugin {
 	columns := []table.ColumnDefinition{
 		table.TextColumn("uid"),
 		table.TextColumn("pid"),
 		table.TextColumn("start_time"),
 		table.TextColumn("last_health_check"),
 	}
-	return table.NewPlugin("kolide_desktop_procs", columns, generate())
+	return tablewrapper.New(slogger, "kolide_desktop_procs", columns, generate())
 }
 
 func generate() table.GenerateFunc {

ee/tables/dev_table_tooling/table.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -37,7 +38,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", tableName),
 	}
 
-	return table.NewPlugin(tableName, columns, t.generate)
+	return tablewrapper.New(slogger, tableName, columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/dsim_default_associations/dsim_default_associations.go

@@ -17,6 +17,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -33,7 +34,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", "kolide_dsim_default_associations"),
 	}
 
-	return table.NewPlugin("kolide_dsim_default_associations", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_dsim_default_associations", columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/filevault/filevault.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 	"github.com/pkg/errors"
@@ -30,7 +31,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", "kolide_filevault"),
 	}
 
-	return table.NewPlugin("kolide_filevault", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_filevault", columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/firefox_preferences/table.go

@@ -11,6 +11,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -44,7 +45,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", tableName),
 	}
 
-	return table.NewPlugin(t.name, columns, t.generate)
+	return tablewrapper.New(slogger, t.name, columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/firmwarepasswd/firmwarepasswd.go

@@ -18,6 +18,7 @@ import (
 	"github.com/kolide/launcher/ee/agent"
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -36,7 +37,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 
 	t := New(slogger.With("table", "kolide_firmwarepasswd"))
 
-	return table.NewPlugin("kolide_firmwarepasswd", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_firmwarepasswd", columns, t.generate)
 
 }
 

ee/tables/fscrypt_info/table.go

@@ -3,6 +3,7 @@ package fscrypt_info
 import (
 	"log/slog"
 
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/osquery/osquery-go/plugin/table"
 )
 
@@ -29,5 +30,5 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 	t := &Table{
 		slogger: slogger.With("table", tableName),
 	}
-	return table.NewPlugin(tableName, columns, t.generate)
+	return tablewrapper.New(slogger, tableName, columns, t.generate)
 }

ee/tables/gsettings/gsettings.go

@@ -18,6 +18,7 @@ import (
 	"github.com/kolide/launcher/ee/agent"
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -46,7 +47,7 @@ func Settings(slogger *slog.Logger) *table.Plugin {
 		getBytes: execGsettings,
 	}
 
-	return table.NewPlugin("kolide_gsettings", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_gsettings", columns, t.generate)
 }
 
 func (t *GsettingsValues) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/gsettings/metadata.go

@@ -17,6 +17,7 @@ import (
 	"github.com/kolide/launcher/ee/agent"
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/log/multislogger"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
@@ -43,7 +44,7 @@ func Metadata(slogger *slog.Logger) *table.Plugin {
 		cmdRunner: execGsettingsCommand,
 	}
 
-	return table.NewPlugin("kolide_gsettings_metadata", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_gsettings_metadata", columns, t.generate)
 }
 
 func (t *GsettingsMetadata) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

ee/tables/homebrew/upgradeable.go

@@ -18,6 +18,7 @@ import (
 	"github.com/kolide/launcher/ee/dataflatten"
 	"github.com/kolide/launcher/ee/tables/dataflattentable"
 	"github.com/kolide/launcher/ee/tables/tablehelpers"
+	"github.com/kolide/launcher/ee/tables/tablewrapper"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -35,7 +36,7 @@ func TablePlugin(slogger *slog.Logger) *table.Plugin {
 		slogger: slogger.With("table", "kolide_brew_upgradeable"),
 	}
 
-	return table.NewPlugin("kolide_brew_upgradeable", columns, t.generate)
+	return tablewrapper.New(slogger, "kolide_brew_upgradeable", columns, t.generate)
 }
 
 func (t *Table) generate(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {