🧹 rename nmap.target to nmap.network

mondoohq · Dec 14, 2024 · 8eabbf2 · 8eabbf2
1 parent 8857c8a
commit 8eabbf2
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 117 deletions.
diff --git a/providers/nmap/README.md b/providers/nmap/README.md
@@ -19,8 +19,8 @@ cnquery shell nmap
 *Scan active IP address in network*
 
 ```shell
-nmap.target("192.168.178.0/24").hosts { name ports { * }  }
-nmap.target.hosts: [
+nmap.network("192.168.178.0/24").hosts { name ports { * }  }
+nmap.network.hosts: [
   0: {
     ports: [
       0: {
@@ -73,8 +73,8 @@ nmap.target.hosts: [
 *Host scan with specific ip*
 
 ```shell
-nmap.target(target: "192.168.178.25").hosts { ports }
-nmap.target.hosts: [
+nmap.network(target: "192.168.178.25").hosts { ports }
+nmap.network.hosts: [
   0: {
     ports: [
       0: nmap.port port=5000 service="rtsp"

diff --git a/providers/nmap/connection/connection.go b/providers/nmap/connection/connection.go
@@ -5,7 +5,7 @@ package connection
 
 import (
 	"strings"
-	
+
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
 )

diff --git a/providers/nmap/resources/discovery.go b/providers/nmap/resources/discovery.go
@@ -36,13 +36,13 @@ func Discover(runtime *plugin.Runtime, opts map[string]string) (*inventory.Inven
 	for i := range networks {
 		network := networks[i]
 
-		targetResource, err := runtime.CreateResource(runtime, "nmap.target ", map[string]*llx.RawData{
+		targetResource, err := runtime.CreateResource(runtime, "nmap.network ", map[string]*llx.RawData{
 			"target": llx.StringData(network),
 		})
 		if err != nil {
 			return nil, err
 		}
-		hosts := targetResource.(*mqlNmapTarget).GetHosts().Data
+		hosts := targetResource.(*mqlNmapNetwork).GetHosts().Data
 		for i := range hosts {
 			entry := hosts[i]
 			host := entry.(*mqlNmapHost)

diff --git a/providers/nmap/resources/network.go b/providers/nmap/resources/network.go
@@ -0,0 +1,72 @@
+package resources
+
+import (
+	"context"
+	"time"
+
+	"github.com/Ullaakut/nmap/v3"
+	"github.com/cockroachdb/errors"
+	"go.mondoo.com/cnquery/v11/llx"
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
+	"go.mondoo.com/cnquery/v11/providers-sdk/v1/util/convert"
+)
+
+func (r *mqlNmapNetwork) id() (string, error) {
+	return "nmap.target/" + r.Target.Data, nil
+}
+
+func initNmapNetwork(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) {
+	return args, nil, nil
+}
+
+func (r *mqlNmapNetwork) scan() error {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	// set default values
+	r.Hosts = plugin.TValue[[]interface{}]{Data: nil, Error: nil, State: plugin.StateIsSet | plugin.StateIsNull}
+	r.Warnings = plugin.TValue[[]interface{}]{Data: nil, Error: nil, State: plugin.StateIsSet | plugin.StateIsNull}
+
+	if r.Target.Data == "" {
+		return errors.New("target is required")
+	}
+
+	scanner, err := nmap.NewScanner(
+		ctx,
+		nmap.WithConnectScan(),
+		nmap.WithTimingTemplate(nmap.TimingAggressive),
+		nmap.WithServiceInfo(),
+		nmap.WithDisabledDNSResolution(), // -n
+		nmap.WithTargets(r.Target.Data),
+	)
+	if err != nil {
+		return errors.Wrap(err, "unable to create nmap scanner")
+	}
+
+	result, warnings, err := scanner.Run()
+
+	if warnings != nil && len(*warnings) > 0 {
+		r.Warnings = plugin.TValue[[]interface{}]{Data: convert.SliceAnyToInterface(*warnings), Error: nil, State: plugin.StateIsSet}
+	}
+
+	var hosts []interface{}
+	for _, host := range result.Hosts {
+		r, err := newMqlNmapHost(r.MqlRuntime, host)
+		if err != nil {
+			return err
+		}
+		hosts = append(hosts, r)
+	}
+
+	r.Hosts = plugin.TValue[[]interface{}]{Data: hosts, Error: nil, State: plugin.StateIsSet}
+
+	return nil
+}
+
+func (r *mqlNmapNetwork) hosts() ([]interface{}, error) {
+	return nil, r.scan()
+}
+
+func (r *mqlNmapNetwork) warnings() ([]interface{}, error) {
+	return nil, r.scan()
+}
diff --git a/providers/nmap/resources/nmap.go b/providers/nmap/resources/nmap.go
@@ -3,17 +3,6 @@
 
 package resources
 
-import (
-	"context"
-	"time"
-
-	"github.com/Ullaakut/nmap/v3"
-	"github.com/cockroachdb/errors"
-	"go.mondoo.com/cnquery/v11/llx"
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/plugin"
-	"go.mondoo.com/cnquery/v11/providers-sdk/v1/util/convert"
-)
-
 // standard nmap scan
 // nmap -sT -T4 192.168.178.0/24
 //
@@ -25,63 +14,3 @@ import (
 func (r *mqlNmap) id() (string, error) {
 	return "nmap", nil
 }
-
-func (r *mqlNmapTarget) id() (string, error) {
-	return "nmap.target/" + r.Target.Data, nil
-}
-
-func initNmapTarget(runtime *plugin.Runtime, args map[string]*llx.RawData) (map[string]*llx.RawData, plugin.Resource, error) {
-	return args, nil, nil
-}
-
-func (r *mqlNmapTarget) scan() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
-	defer cancel()
-
-	// set default values
-	r.Hosts = plugin.TValue[[]interface{}]{Data: nil, Error: nil, State: plugin.StateIsSet | plugin.StateIsNull}
-	r.Warnings = plugin.TValue[[]interface{}]{Data: nil, Error: nil, State: plugin.StateIsSet | plugin.StateIsNull}
-
-	if r.Target.Data == "" {
-		return errors.New("target is required")
-	}
-
-	scanner, err := nmap.NewScanner(
-		ctx,
-		nmap.WithConnectScan(),
-		nmap.WithTimingTemplate(nmap.TimingAggressive),
-		nmap.WithServiceInfo(),
-		nmap.WithDisabledDNSResolution(), // -n
-		nmap.WithTargets(r.Target.Data),
-	)
-	if err != nil {
-		return errors.Wrap(err, "unable to create nmap scanner")
-	}
-
-	result, warnings, err := scanner.Run()
-
-	if warnings != nil && len(*warnings) > 0 {
-		r.Warnings = plugin.TValue[[]interface{}]{Data: convert.SliceAnyToInterface(*warnings), Error: nil, State: plugin.StateIsSet}
-	}
-
-	var hosts []interface{}
-	for _, host := range result.Hosts {
-		r, err := newMqlNmapHost(r.MqlRuntime, host)
-		if err != nil {
-			return err
-		}
-		hosts = append(hosts, r)
-	}
-
-	r.Hosts = plugin.TValue[[]interface{}]{Data: hosts, Error: nil, State: plugin.StateIsSet}
-
-	return nil
-}
-
-func (r *mqlNmapTarget) hosts() ([]interface{}, error) {
-	return nil, r.scan()
-}
-
-func (r *mqlNmapTarget) warnings() ([]interface{}, error) {
-	return nil, r.scan()
-}
diff --git a/providers/nmap/resources/nmap.lr b/providers/nmap/resources/nmap.lr
@@ -10,8 +10,8 @@ nmap {
   version() nmap.versionInformation
 }
 
-// nmap target
-nmap.target {
+// nmap network
+nmap.network {
   init(target string)
   // Target IP address or hostname
   target string

diff --git a/providers/nmap/resources/nmap.lr.go b/providers/nmap/resources/nmap.lr.go
diff --git a/providers/nmap/resources/nmap.lr.manifest.yaml b/providers/nmap/resources/nmap.lr.manifest.yaml
@@ -22,6 +22,12 @@ resources:
       trace: {}
     is_private: true
     min_mondoo_version: latest
+  nmap.network:
+    fields:
+      hosts: {}
+      target: {}
+      warnings: {}
+    min_mondoo_version: 9.0.0
   nmap.port:
     fields:
       method: {}
@@ -33,12 +39,6 @@ resources:
       version: {}
     is_private: true
     min_mondoo_version: latest
-  nmap.target:
-    fields:
-      hosts: {}
-      target: {}
-      warnings: {}
-    min_mondoo_version: latest
   nmap.version:
     fields:
       compiledWith: {}