initial implementation of the new cache

engine/cache/edge.go

@@ -5,6 +5,7 @@
 package cache
 
 import (
+	"reflect"
 	"time"
 
 	"github.com/owasp-amass/asset-db/types"
@@ -29,12 +30,18 @@ func (c *Cache) Link(edge *types.Edge) (*types.Edge, error) {
 
 // IncomingEdges implements the Repository interface.
 func (c *Cache) IncomingEdges(entity *types.Entity, since time.Time, labels ...string) ([]*types.Edge, error) {
+	c.Lock()
+	defer c.Unlock()
 
+	return c.cache.IncomingEdges(entity, since, labels...)
 }
 
 // OutgoingEdges implements the Repository interface.
 func (c *Cache) OutgoingEdges(entity *types.Entity, since time.Time, labels ...string) ([]*types.Edge, error) {
+	c.Lock()
+	defer c.Unlock()
 
+	return c.cache.OutgoingEdges(entity, since, labels...)
 }
 
 // DeleteEdge implements the Repository interface.
@@ -47,14 +54,46 @@ func (c *Cache) DeleteEdge(id string) error {
 		return err
 	}
 
-	entity, err := c.cache.FindEntityById(id)
+	edge, err := c.cache.FindEdgeById(id)
+	if err != nil {
+		return nil
+	}
+
+	sub, err := c.cache.FindEntityById(edge.FromEntity.ID)
+	if err != nil {
+		return nil
+	}
+
+	obj, err := c.cache.FindEntityById(edge.ToEntity.ID)
 	if err != nil {
 		return nil
 	}
 
 	c.appendToDBQueue(func() {
-		if e, err := c.db.FindEntityByContent(entity.Asset, time.Time{}); err == nil && len(e) == 1 {
-			_ = c.db.UpdateEntityLastSeen(e[0].ID)
+		s, err := c.db.FindEntityByContent(sub.Asset, time.Time{})
+		if err != nil || len(s) != 1 {
+			return
+		}
+
+		o, err := c.db.FindEntityByContent(obj.Asset, time.Time{})
+		if err != nil || len(o) != 1 {
+			return
+		}
+
+		edges, err := c.db.OutgoingEdges(s, time.Time{}, edge.Relation.Label())
+		if err != nil || len(edges) == 0 {
+			return
+		}
+
+		var target *types.Edge
+		for _, e := range edges {
+			if e.ID == o.ID && reflect.DeepEqual(e.Relation, o.Relation) {
+				target = e
+				break
+			}
+		}
+		if target != nil {
+			_ = c.db.DeleteEdge(target.ID)
 		}
 	})
 

engine/cache/entity.go

@@ -62,12 +62,18 @@ func (c *Cache) FindEntityById(id string) (*types.Entity, error) {
 
 // FindEntityByContent implements the Repository interface.
 func (c *Cache) FindEntityByContent(asset oam.Asset, since time.Time) ([]*types.Entity, error) {
+	c.Lock()
+	defer c.Unlock()
 
+	return c.cache.FindEntityByContent(asset, since)
 }
 
 // FindEntitiesByType implements the Repository interface.
 func (c *Cache) FindEntitiesByType(atype oam.AssetType, since time.Time) ([]*types.Entity, error) {
+	c.Lock()
+	defer c.Unlock()
 
+	return c.cache.FindEntitiesByType(atype, since)
 }
 
 // DeleteEntity implements the Repository interface.

engine/cache/tag.go

@@ -39,7 +39,10 @@ func (c *Cache) FindEntityTagById(id string) (*types.EntityTag, error) {
 
 // GetEntityTags implements the Repository interface.
 func (c *Cache) GetEntityTags(entity *types.Entity, since time.Time, names ...string) ([]*types.EntityTag, error) {
+	c.Lock()
+	defer c.Unlock()
 
+	return c.cache.GetEntityTags(entity, since, names...)
 }
 
 // DeleteEntityTag implements the Repository interface.
@@ -105,7 +108,10 @@ func (c *Cache) FindEdgeTagById(id string) (*types.EdgeTag, error) {
 
 // GetEdgeTags implements the Repository interface.
 func (c *Cache) GetEdgeTags(edge *types.Edge, since time.Time, names ...string) ([]*types.EdgeTag, error) {
+	c.Lock()
+	defer c.Unlock()
 
+	return c.cache.GetEdgeTags(edge, since, names...)
 }
 
 // DeleteEdgeTag implements the Repository interface.

go.mod

@@ -25,7 +25,7 @@ require (
 	github.com/miekg/dns v1.1.62
 	github.com/nyaruka/phonenumbers v1.4.1
 	github.com/openrdap/rdap v0.9.1
-	github.com/owasp-amass/asset-db v0.12.0
+	github.com/owasp-amass/asset-db v0.13.0
 	github.com/owasp-amass/open-asset-model v0.12.0
 	github.com/owasp-amass/resolve v0.8.1
 	github.com/rubenv/sql-migrate v1.7.0