Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Populate network interfaces on Windows (#1700)

Browse source 
Add support for Windows hosts in addition to macOS and Linux.
This commit is contained in:
dso 2018-02-04 23:16:24 -06:00 committed by Zachary Wasserman
parent ae5d8e4acb
commit c017779313
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/kolide/hosts.go
View file

@ -5,6 +5,8 @@ import (
"crypto/rand"
"encoding/base64"
"time"
"net"
"strings"
)
const (
@ -132,6 +134,18 @@ func (h *Host) ResetPrimaryNetwork() bool {
// nics are in descending order of IO
// so we default to the most active nic
if len(h.NetworkInterfaces) > 0 {
// Check IPv4 address
for _, nic := range h.NetworkInterfaces {
if strings.Index(nic.IPAddress, "127.") == 0 {
continue
}
var isIpAddress = net.ParseIP(nic.IPAddress)
if isIpAddress.To4() != nil {
h.PrimaryNetworkInterfaceID = &nic.ID
return true
}
}
// return IPv6 or other nic in place of IPv4
h.PrimaryNetworkInterfaceID = &h.NetworkInterfaces[0].ID
return true
}

21
server/service/service_osquery.go
View file

@ -277,9 +277,12 @@ var detailQueries = map[string]struct {
IngestFunc func(logger log.Logger, host *kolide.Host, rows []map[string]string) error
}{
"network_interface": {
Query: `select * from interface_details id join interface_addresses ia
on ia.interface = id.interface where broadcast != ""
order by (ibytes + obytes) desc`,
Query: `select ia.interface, address, mask, broadcast, point_to_point,
id.interface, mac, id.type, mtu, metric, ipackets, opackets,
ibytes, obytes, ierrors, oerrors, idrops, odrops, last_change
from interface_details id join interface_addresses ia
on ia.interface = id.interface where length(mac) > 0
order by (ibytes + obytes) desc`,
IngestFunc: func(logger log.Logger, host *kolide.Host, rows []map[string]string) (err error) {
if len(rows) == 0 {
logger.Log("component", "service", "method", "IngestFunc", "err",
@ -295,14 +298,14 @@ var detailQueries = map[string]struct {
nic.IPAddress = row["address"]
nic.Broadcast = row["broadcast"]
if nic.IBytes, err = strconv.ParseInt(emptyToZero(row["ibytes"]), 10, 64); err != nil {
return err
nic.IBytes = -1
}
if nic.IErrors, err = strconv.ParseInt(emptyToZero(row["ierrors"]), 10, 64); err != nil {
return err
nic.IErrors = -1
}
nic.Interface = row["interface"]
if nic.IPackets, err = strconv.ParseInt(emptyToZero(row["ipackets"]), 10, 64); err != nil {
return err
nic.IPackets = -1
}
// Optional last_change
if lastChange, ok := row["last_change"]; ok {
@ -318,13 +321,13 @@ var detailQueries = map[string]struct {
return err
}
if nic.OBytes, err = strconv.ParseInt(emptyToZero(row["obytes"]), 10, 64); err != nil {
return err
nic.OBytes = -1
}
if nic.OErrors, err = strconv.ParseInt(emptyToZero(row["oerrors"]), 10, 64); err != nil {
return err
nic.OErrors = -1
}
if nic.OPackets, err = strconv.ParseInt(emptyToZero(row["opackets"]), 10, 64); err != nil {
return err
nic.OPackets = -1
}
nic.PointToPoint = row["point_to_point"]
if nic.Type, err = strconv.Atoi(emptyToZero(row["type"])); err != nil {