Merge branch 'main' of github.com:mondoohq/cnquery into afiune/parall…

…el_asset_discovery

Signed-off-by: Salim Afiune Maya <[email protected]>

.github/env

@@ -1 +1 @@
-golang-version=1.23.0
+golang-version=1.23.4

.github/workflows/pr-test-lint.yml

@@ -184,6 +184,8 @@ jobs:
       contents: write
       pull-requests: write
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
       # figure out the PR for this commit
       - uses: cloudposse-github-actions/[email protected]
         id: pr

Dockerfile

@@ -1,7 +1,7 @@
 # Copyright (c) Mondoo, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-FROM alpine:3.20 AS root
+FROM alpine:3.21 AS root
 RUN apk update &&\
     apk add ca-certificates wget tar &&\
     rm -rf /var/cache/apk/*

providers/ansible/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "ansible",
 	ID:              "go.mondoo.com/cnquery/v11/providers/ansible",
-	Version:         "11.0.31",
+	Version:         "11.0.32",
 	ConnectionTypes: []string{provider.DefaultConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/arista/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "arista",
 	ID:              "go.mondoo.com/cnquery/v9/providers/arista",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/atlassian/config/config.go

@@ -14,7 +14,7 @@ import (
 var Config = plugin.Provider{
 	Name:    "atlassian",
 	ID:      "go.mondoo.com/cnquery/v9/providers/atlassian",
-	Version: "11.0.47",
+	Version: "11.0.48",
 	ConnectionTypes: []string{
 		provider.DefaultConnectionType,
 		"jira",

providers/aws/config/config.go

@@ -14,7 +14,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "aws",
 	ID:              "go.mondoo.com/cnquery/v9/providers/aws",
-	Version:         "11.5.10",
+	Version:         "11.5.11",
 	ConnectionTypes: []string{provider.DefaultConnectionType, string(awsec2ebsconn.EBSConnectionType)},
 	Connectors: []plugin.Connector{
 		{

providers/azure/config/config.go

@@ -14,7 +14,7 @@ import (
 var Config = plugin.Provider{
 	Name:    "azure",
 	ID:      "go.mondoo.com/cnquery/v9/providers/azure",
-	Version: "11.3.18",
+	Version: "11.3.19",
 	ConnectionTypes: []string{
 		provider.ConnectionType,
 		string(azureinstancesnapshot.SnapshotConnectionType),

providers/cloudflare/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "cloudflare",
 	ID:              "go.mondoo.com/cnquery/v11/providers/cloudflare",
-	Version:         "11.0.1",
+	Version:         "11.0.2",
 	ConnectionTypes: []string{provider.DefaultConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/cloudformation/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "cloudformation",
 	ID:              "go.mondoo.com/cnquery/v11/providers/cloudformation",
-	Version:         "11.0.36",
+	Version:         "11.0.37",
 	ConnectionTypes: []string{provider.DefaultConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/core/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:       "core",
 	ID:         "go.mondoo.com/cnquery/v9/providers/core",
-	Version:    "11.0.23",
+	Version:    "11.0.24",
 	Connectors: []plugin.Connector{},
 	AssetUrlTrees: []*inventory.AssetUrlBranch{
 		{

providers/equinix/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "equinix",
 	ID:              "go.mondoo.com/cnquery/v9/providers/equinix",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/gcp/config/config.go

@@ -14,7 +14,7 @@ import (
 var Config = plugin.Provider{
 	Name:    "gcp",
 	ID:      "go.mondoo.com/cnquery/v9/providers/gcp",
-	Version: "11.0.50",
+	Version: "11.0.51",
 	ConnectionTypes: []string{
 		provider.ConnectionType,
 		string(gcpinstancesnapshot.SnapshotConnectionType),

providers/github/config/config.go

@@ -13,7 +13,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "github",
 	ID:              "go.mondoo.com/cnquery/v9/providers/github",
-	Version:         "11.4.28",
+	Version:         "11.4.29",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/gitlab/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:    "gitlab",
 	ID:      "go.mondoo.com/cnquery/v9/providers/gitlab",
-	Version: "11.1.38",
+	Version: "11.1.39",
 	ConnectionTypes: []string{
 		provider.ConnectionType,
 		provider.GitlabGroupConnection,

providers/google-workspace/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "google-workspace",
 	ID:              "go.mondoo.com/cnquery/v9/providers/google-workspace",
-	Version:         "11.1.22",
+	Version:         "11.1.23",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/ipmi/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "ipmi",
 	ID:              "go.mondoo.com/cnquery/v9/providers/ipmi",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/k8s/config/config.go

@@ -13,7 +13,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "k8s",
 	ID:              "go.mondoo.com/cnquery/v9/providers/k8s",
-	Version:         "11.1.38",
+	Version:         "11.1.39",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/mondoo/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "mondoo",
 	ID:              "go.mondoo.com/cnquery/v11/providers/mondoo",
-	Version:         "11.1.22",
+	Version:         "11.1.23",
 	ConnectionTypes: []string{provider.DefaultConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/ms365/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "ms365",
 	ID:              "go.mondoo.com/cnquery/v9/providers/ms365",
-	Version:         "11.1.0",
+	Version:         "11.1.1",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/network/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "network",
 	ID:              "go.mondoo.com/cnquery/v9/providers/network",
-	Version:         "11.0.39",
+	Version:         "11.0.40",
 	ConnectionTypes: []string{provider.HostConnectionType},
 	CrossProviderTypes: []string{
 		"go.mondoo.com/cnquery/providers/os",

providers/oci/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "oci",
 	ID:              "go.mondoo.com/cnquery/v9/providers/oci",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/okta/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "okta",
 	ID:              "go.mondoo.com/cnquery/v9/providers/okta",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/opcua/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "opcua",
 	ID:              "go.mondoo.com/cnquery/v9/providers/opcua",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/os/config/config.go

@@ -13,7 +13,7 @@ import (
 var Config = plugin.Provider{
 	Name:    "os",
 	ID:      "go.mondoo.com/cnquery/v9/providers/os",
-	Version: "11.3.12",
+	Version: "11.3.13",
 	ConnectionTypes: []string{
 		shared.Type_Local.String(),
 		shared.Type_SSH.String(),

providers/os/connection/container/image_connection_test.go

@@ -231,11 +231,11 @@ func TestImageConnections(t *testing.T) {
 				fSearch := fs.(*tar.FS)
 
 				if test.testfile == "/etc/alpine-release" {
-					infos, err := fSearch.Find("/", regexp.MustCompile(`alpine-release`), "file")
+					infos, err := fSearch.Find("/", regexp.MustCompile(`alpine-release`), "file", nil, nil)
 					require.NoError(t, err)
 					assert.Equal(t, 1, len(infos))
 				} else if test.testfile == "/etc/centos-release" {
-					infos, err := fSearch.Find("/", regexp.MustCompile(`centos-release`), "file")
+					infos, err := fSearch.Find("/", regexp.MustCompile(`centos-release`), "file", nil, nil)
 					require.NoError(t, err)
 					assert.Equal(t, 6, len(infos))
 				}

providers/os/connection/tar/connection_test.go

@@ -236,7 +236,7 @@ func TestTarFileFind(t *testing.T) {
 
 	fSearch := fs.(*tar.FS)
 
-	infos, err := fSearch.Find("/", regexp.MustCompile(`alpine-release`), "file")
+	infos, err := fSearch.Find("/", regexp.MustCompile(`alpine-release`), "file", nil, nil)
 	require.NoError(t, err)
 
 	assert.Equal(t, 1, len(infos))

providers/os/connection/tar/fs.go

@@ -16,9 +16,12 @@ import (
 
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/afero"
+	"go.mondoo.com/cnquery/v11/providers/os/connection/shared"
 	"go.mondoo.com/cnquery/v11/providers/os/fsutil"
 )
 
+var _ shared.FileSearch = (*FS)(nil)
+
 func NewFs(source string) *FS {
 	return &FS{
 		Source:  source,
@@ -192,18 +195,21 @@ func (fs *FS) tar(path string, header *tar.Header) (io.ReadCloser, error) {
 
 // searches for files and returns the file info
 // regex can be nil
-func (fs *FS) Find(from string, r *regexp.Regexp, typ string) ([]string, error) {
+func (fs *FS) Find(from string, r *regexp.Regexp, typ string, perm *uint32, depth *int) ([]string, error) {
 	list := []string{}
 	for k := range fs.FileMap {
 		p := strings.HasPrefix(k, from)
 		m := true
 		if r != nil {
 			m = r.MatchString(k)
 		}
+		if !depthMatch(from, k, depth) {
+			continue
+		}
 		log.Trace().Str("path", k).Str("from", from).Str("prefix", from).Bool("prefix", p).Bool("m", m).Msg("check if matches")
 		if p && m {
 			entry := fs.FileMap[k]
-			if (typ == "directory" && entry.Typeflag == tar.TypeDir) || (typ == "file" && entry.Typeflag == tar.TypeReg) {
+			if (typ == "directory" && entry.Typeflag == tar.TypeDir) || (typ == "file" && entry.Typeflag == tar.TypeReg) || typ == "" {
 				list = append(list, k)
 				log.Debug().Msg("matches")
 				continue
@@ -212,3 +218,15 @@ func (fs *FS) Find(from string, r *regexp.Regexp, typ string) ([]string, error)
 	}
 	return list, nil
 }
+
+func depthMatch(from, filepath string, depth *int) bool {
+	if depth == nil {
+		return true
+	}
+
+	trimmed := strings.TrimPrefix(filepath, from)
+	// WalkDir always uses slash for separating, ignoring the OS separator. This is why we need to replace it.
+	normalized := strings.ReplaceAll(trimmed, string(os.PathSeparator), "/")
+	fileDepth := strings.Count(normalized, "/")
+	return fileDepth <= *depth
+}

providers/os/fs/fs.go

@@ -11,8 +11,11 @@ import (
 	"time"
 
 	"github.com/spf13/afero"
+	"go.mondoo.com/cnquery/v11/providers/os/connection/shared"
 )
 
+var _ shared.FileSearch = (*MountedFs)(nil)
+
 var notSupported = errors.New("not supported")
 
 type MountedFs struct {

providers/os/resources/files.go

@@ -70,6 +70,11 @@ func (l *mqlFilesFind) list() ([]interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
+	} else if len(l.Name.Data) > 0 {
+		compiledRegexp, err = regexp.Compile(l.Name.Data)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var foundFiles []string

providers/shodan/config/config.go

@@ -13,7 +13,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "shodan",
 	ID:              "go.mondoo.com/cnquery/v11/providers/shodan",
-	Version:         "11.0.33",
+	Version:         "11.0.34",
 	ConnectionTypes: []string{provider.DefaultConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/slack/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "slack",
 	ID:              "go.mondoo.com/cnquery/v9/providers/slack",
-	Version:         "11.0.46",
+	Version:         "11.0.47",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/snowflake/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "snowflake",
 	ID:              "go.mondoo.com/cnquery/v11/providers/snowflake",
-	Version:         "11.0.30",
+	Version:         "11.0.31",
 	ConnectionTypes: []string{provider.DefaultConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/terraform/config/config.go

@@ -12,7 +12,7 @@ import (
 var Config = plugin.Provider{
 	Name:    "terraform",
 	ID:      "go.mondoo.com/cnquery/v9/providers/terraform",
-	Version: "11.0.44",
+	Version: "11.0.45",
 	ConnectionTypes: []string{
 		provider.StateConnectionType,
 		provider.PlanConnectionType,

providers/vcd/config/config.go

@@ -11,7 +11,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "vcd",
 	ID:              "go.mondoo.com/cnquery/v9/providers/vcd",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{

providers/vsphere/config/config.go

@@ -13,7 +13,7 @@ import (
 var Config = plugin.Provider{
 	Name:            "vsphere",
 	ID:              "go.mondoo.com/cnquery/v9/providers/vsphere",
-	Version:         "11.0.44",
+	Version:         "11.0.45",
 	ConnectionTypes: []string{provider.ConnectionType},
 	Connectors: []plugin.Connector{
 		{