Listens to packets to find mac addresses

Unfortunately this implementation would require the user to run with root privileges.
robgonnella · Aug 7, 2023 · 4c0d94c · 4c0d94c
1 parent 8e0d090
commit 4c0d94c
Show file tree

Hide file tree

Showing 19 changed files with 227 additions and 343 deletions.
diff --git a/cli/commands/root.go b/cli/commands/root.go
@@ -28,7 +28,7 @@ func Root(props *CommandProps) *cobra.Command {
 			level := zerolog.InfoLevel
 
 			if verbose || debug {
-				level = zerolog.DebugLevel
+				level = zerolog.ErrorLevel
 			}
 
 			if silent {

diff --git a/go.mod b/go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/gdamore/tcell/v2 v2.6.0
 	github.com/golang/mock v1.6.0
 	github.com/google/gopacket v1.1.19
-	github.com/imdario/mergo v0.3.16
 	github.com/jackpal/gateway v1.0.10
 	github.com/projectdiscovery/mapcidr v1.1.2
 	github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf

diff --git a/go.sum b/go.sum
@@ -205,8 +205,6 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
-github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

diff --git a/internal/core/core_test.go b/internal/core/core_test.go
@@ -26,6 +26,7 @@ func TestCore(t *testing.T) {
 
 	mockScanner := mock_discovery.NewMockScanner(ctrl)
 	mockDetailsScanner := mock_discovery.NewMockDetailScanner(ctrl)
+	mockPacketScanner := mock_discovery.NewMockPacketScanner(ctrl)
 	mockConfig := mock_config.NewMockService(ctrl)
 	mockServerService := mock_server.NewMockService(ctrl)
 
@@ -40,6 +41,7 @@ func TestCore(t *testing.T) {
 	discoveryService := discovery.NewScannerService(
 		mockScanner,
 		mockDetailsScanner,
+		mockPacketScanner,
 		mockServerService,
 	)
 

diff --git a/internal/core/create.go b/internal/core/create.go
@@ -83,17 +83,24 @@ func CreateNewAppCore(networkInfo *util.NetworkInfo) (*Core, error) {
 	serverRepo := server.NewSqliteRepo(db)
 	serverService := server.NewService(*conf, serverRepo)
 
-	netScanner, err := discovery.NewPacketScanner(networkInfo, conf.Targets)
+	netScanner, err := discovery.NewNetScanner(networkInfo, conf.Targets)
 
 	if err != nil {
 		return nil, err
 	}
 
 	detailScanner := discovery.NewAnsibleIpScanner(*conf)
 
+	packetScanner, err := discovery.NewPCapScanner(conf.Targets, networkInfo)
+
+	if err != nil {
+		return nil, err
+	}
+
 	scannerService := discovery.NewScannerService(
 		netScanner,
 		detailScanner,
+		packetScanner,
 		serverService,
 	)
 

diff --git a/internal/core/monitor.go b/internal/core/monitor.go
@@ -43,6 +43,7 @@ func (c *Core) handleServerEvent(evt *event.Event) {
 	fields := map[string]interface{}{
 		"type":     evt.Type,
 		"id":       payload.ID,
+		"mac":      payload.MAC,
 		"hostname": payload.Hostname,
 		"os":       payload.OS,
 		"ip":       payload.IP,

diff --git a/internal/discovery/interface.go b/internal/discovery/interface.go
@@ -1,14 +1,23 @@
 package discovery
 
-import "context"
+import (
+	"context"
 
-//go:generate mockgen -destination=../mock/discovery/mock_discovery.go -package=mock_discovery . DetailScanner,Scanner
+	"github.com/robgonnella/ops/internal/server"
+)
+
+//go:generate mockgen -destination=../mock/discovery/mock_discovery.go -package=mock_discovery . DetailScanner,PacketScanner,Scanner
 
 // DetailScanner interface for gathering more details about a device
 type DetailScanner interface {
 	GetServerDetails(ctx context.Context, ip string) (*Details, error)
 }
 
+// PacketScanner
+type PacketScanner interface {
+	ListenForPackets(resultChan chan *server.Server)
+}
+
 // Scanner interface for scanning a network for devices
 type Scanner interface {
 	Scan(resultChan chan *DiscoveryResult) error

diff --git a/internal/discovery/net.go b/internal/discovery/net.go
@@ -13,6 +13,7 @@ import (
 	"github.com/projectdiscovery/mapcidr"
 	"github.com/robgonnella/ops/internal/logger"
 	"github.com/robgonnella/ops/internal/server"
+	"github.com/robgonnella/ops/internal/util"
 )
 
 var cidrSuffix = regexp.MustCompile(`\/\d{2}$`)
@@ -24,7 +25,7 @@ type NetScanner struct {
 	log       logger.Logger
 }
 
-func NewNetScanner(targets []string) (*NetScanner, error) {
+func NewNetScanner(networkInfo *util.NetworkInfo, targets []string) (*NetScanner, error) {
 	ipList := []string{}
 
 	for _, t := range targets {