finishing the entity tag implementation

owasp-amass · Dec 20, 2024 · 6976eb4 · 6976eb4
1 parent a147319
commit 6976eb4
Show file tree

Hide file tree

Showing 7 changed files with 525 additions and 118 deletions.
diff --git a/migrations/neo4j/schema.go b/migrations/neo4j/schema.go
@@ -19,6 +19,11 @@ func InitializeSchema(driver neo4jdb.DriverWithContext, dbname string) error {
 		return err
 	}
 
+	err = executeQuery(driver, dbname, "CREATE INDEX entities_range_index_etype IF NOT EXISTS FOR (n:Entity) ON (n.etype)")
+	if err != nil {
+		return err
+	}
+
 	err = executeQuery(driver, dbname, "CREATE INDEX entities_range_index_updated_at IF NOT EXISTS FOR (n:Entity) ON (n.updated_at)")
 	if err != nil {
 		return err
@@ -29,6 +34,11 @@ func InitializeSchema(driver neo4jdb.DriverWithContext, dbname string) error {
 		return err
 	}
 
+	err = executeQuery(driver, dbname, "CREATE INDEX enttag_range_index_ttype IF NOT EXISTS FOR (n:EntityTag) ON (n.ttype)")
+	if err != nil {
+		return err
+	}
+
 	err = executeQuery(driver, dbname, "CREATE INDEX enttag_range_index_updated_at IF NOT EXISTS FOR (n:EntityTag) ON (n.updated_at)")
 	if err != nil {
 		return err
@@ -44,6 +54,11 @@ func InitializeSchema(driver neo4jdb.DriverWithContext, dbname string) error {
 		return err
 	}
 
+	err = executeQuery(driver, dbname, "CREATE INDEX edgetag_range_index_ttype IF NOT EXISTS FOR (n:EdgeTag) ON (n.ttype)")
+	if err != nil {
+		return err
+	}
+
 	err = executeQuery(driver, dbname, "CREATE INDEX edgetag_range_index_updated_at IF NOT EXISTS FOR (n:EdgeTag) ON (n.updated_at)")
 	if err != nil {
 		return err

diff --git a/repository/neo4j/entity.go b/repository/neo4j/entity.go
@@ -270,9 +270,9 @@ func (neo *neoRepository) DeleteEntity(id string) error {
 	defer cancel()
 
 	_, err := neo4jdb.ExecuteQuery(ctx, neo.db,
-		"MATCH (n:Entity {entity_id: $entity_id}) DETACH DELETE n",
+		"MATCH (n:Entity {entity_id: $eid}) DETACH DELETE n",
 		map[string]interface{}{
-			"entity_id": id,
+			"eid": id,
 		},
 		neo4jdb.EagerResultTransformer,
 		neo4jdb.ExecuteQueryWithDatabase(neo.dbname),