github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-14 00:53:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
Simone Margaritelli 2021-04-11 01:26:29 +02:00
parent c47e3f6195
commit c9ae0f360e
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/graph/create.go
View file

@ -55,13 +55,13 @@ func (mod *Module) createDot11ApGraph(ap *network.AccessPoint) (*Node, bool, err
return node, isNew, nil return node, isNew, nil
} }
func (mod *Module) createDot11SSIDGraph(hw string, ssid string) (*Node, bool, error) { func (mod *Module) createDot11SSIDGraph(hex string, ssid string) (*Node, bool, error) {
node, err := mod.db.FindNode(SSID, hw) node, err := mod.db.FindNode(SSID, hex)
isNew := node == nil isNew := node == nil
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} else if isNew { } else if isNew {
if node, err = mod.db.CreateNode(SSID, hw, ssid, ""); err != nil { if node, err = mod.db.CreateNode(SSID, hex, ssid, ""); err != nil {
return nil, false, err return nil, false, err
} }
} else if err = mod.db.UpdateNode(node); err != nil { } else if err = mod.db.UpdateNode(node); err != nil {
@ -117,7 +117,7 @@ func (mod *Module) createDot11Graph(ap *network.AccessPoint, station *network.St
} }
func (mod *Module) createDot11ProbeGraph(ssid string, station *network.Station) (*Node, bool, *Node, bool, error) { func (mod *Module) createDot11ProbeGraph(ssid string, station *network.Station) (*Node, bool, *Node, bool, error) {
apNode, apIsNew, err := mod.createDot11SSIDGraph(station.HwAddress+fmt.Sprintf(":PROBE:%x", ssid), ssid) ssidNode, ssidIsNew, err := mod.createDot11SSIDGraph(fmt.Sprintf("%x", ssid), ssid)
if err != nil { if err != nil {
return nil, false, nil, false, err return nil, false, nil, false, err
} }
@ -128,15 +128,23 @@ func (mod *Module) createDot11ProbeGraph(ssid string, station *network.Station)
} }
// create relations if needed // create relations if needed
if probes_for, err := mod.db.FindLastRecentEdgeOfType(staNode, apNode, ProbesFor, edgeStaleTime); err != nil { if probes_for, err := mod.db.FindLastRecentEdgeOfType(staNode, ssidNode, ProbesFor, edgeStaleTime); err != nil {
return nil, false, nil, false, err return nil, false, nil, false, err
} else if probes_for == nil { } else if probes_for == nil {
if probes_for, err = mod.db.CreateEdge(staNode, apNode, ProbesFor); err != nil { if probes_for, err = mod.db.CreateEdge(staNode, ssidNode, ProbesFor); err != nil {
return nil, false, nil, false, err return nil, false, nil, false, err
} }
} }
return apNode, apIsNew, staNode, staIsNew, nil if probed_by, err := mod.db.FindLastRecentEdgeOfType(ssidNode, staNode, ProbedBy, edgeStaleTime); err != nil {
return nil, false, nil, false, err
} else if probed_by == nil {
if probed_by, err = mod.db.CreateEdge(ssidNode, staNode, ProbedBy); err != nil {
return nil, false, nil, false, err
}
}
return ssidNode, ssidIsNew, staNode, staIsNew, nil
} }
func (mod *Module) createBLEServerGraph(dev *network.BLEDevice) (*Node, bool, error) { func (mod *Module) createBLEServerGraph(dev *network.BLEDevice) (*Node, bool, error) {

1
modules/graph/edge.go
View file

@ -11,6 +11,7 @@ type EdgeType string
const ( const (
Is EdgeType = "is" Is EdgeType = "is"
ProbesFor EdgeType = "probes_for" ProbesFor EdgeType = "probes_for"
ProbedBy EdgeType = "probed_by"
ConnectsTo EdgeType = "connects_to" ConnectsTo EdgeType = "connects_to"
Manages EdgeType = "manages" Manages EdgeType = "manages"
) )

4
modules/graph/graph.go
View file

@ -170,7 +170,7 @@ func (g *Graph) Dot(filter, layout, name string, disconnected bool) (string, int
if err := g.Traverse(filter, func(node *Node) { if err := g.Traverse(filter, func(node *Node) {
include := false include := false
if disconnected || node.Type == SSID { // we don't create backwards edges for SSID if disconnected {
include = true include = true
} else { } else {
include = g.edges.IsConnected(node.String()) include = g.edges.IsConnected(node.String())
@ -265,7 +265,7 @@ func (g *Graph) JSON(filter string, disconnected bool) (string, int, int, error)
if err := g.Traverse(filter, func(node *Node) { if err := g.Traverse(filter, func(node *Node) {
include := false include := false
if disconnected || node.Type == SSID { // we don't create backwards edges for SSID if disconnected {
include = true include = true
} else { } else {
include = g.edges.IsConnected(node.String()) include = g.edges.IsConnected(node.String())