A modern platform for visual, flexible, and extensible graph-based investigations. For cybersecurity analysts and investigators.
feat(api): update flowsint_enrichers registry
dextmorgn152a30c92a74
diff --git a/flowsint-api/app/api/routes/enrichers.py b/flowsint-api/app/api/routes/enrichers.pyindex 85e11ada..987bb4a7 100644--- a/flowsint-api/app/api/routes/enrichers.py+++ b/flowsint-api/app/api/routes/enrichers.py@@ -1,7 +1,7 @@from fastapi import APIRouter, HTTPException, Depends, Queryfrom typing import List, Any, Optionalfrom pydantic import BaseModel-from flowsint_core.core.registry import EnricherRegistry+from flowsint_enrichers import ENRICHER_REGISTRY, load_all_enrichersfrom flowsint_core.core.celery import celeryfrom flowsint_core.core.types import Node, Edge, FlowBranchfrom flowsint_core.core.models import CustomType, Profile@@ -12,6 +12,9 @@ from flowsint_core.core.postgre_db import get_dbfrom sqlalchemy.orm import Sessionfrom sqlalchemy import func+# Auto-discover and register all enrichers+load_all_enrichers()+class FlowComputationRequest(BaseModel):nodes: List[Node]@@ -45,7 +48,7 @@ def get_enrichers(current_user: Profile = Depends(get_current_user),):if not category or category.lower() == "undefined":- return EnricherRegistry.list(exclude=["n8n_connector"])+ return ENRICHER_REGISTRY.list(exclude=["n8n_connector"])# Si catégorie customcustom_type = (db.query(CustomType)@@ -58,9 +61,9 @@ def get_enrichers()if custom_type:- return EnricherRegistry.list(exclude=["n8n_connector"], wobbly_type=True)+ return ENRICHER_REGISTRY.list(exclude=["n8n_connector"], wobbly_type=True)- return EnricherRegistry.list_by_input_type(category, exclude=["n8n_connector"])+ return ENRICHER_REGISTRY.list_by_input_type(category, exclude=["n8n_connector"])@router.post("/{enricher_name}/launch")diff --git a/flowsint-api/app/api/routes/flows.py b/flowsint-api/app/api/routes/flows.pyindex 0ca52b24..0c88f3b8 100644--- a/flowsint-api/app/api/routes/flows.py+++ b/flowsint-api/app/api/routes/flows.py@@ -4,7 +4,10 @@ from typing import Dict, List, Any, Optionalfrom pydantic import BaseModelfrom datetime import datetimefrom flowsint_core.utils import extract_input_schema_flow-from flowsint_core.core.registry import EnricherRegistry+from flowsint_enrichers import ENRICHER_REGISTRY, load_all_enrichers++# Auto-discover and register all enrichers+load_all_enrichers()from flowsint_core.core.celery import celeryfrom flowsint_core.core.graph_repository import GraphRepositoryfrom flowsint_types import (@@ -100,7 +103,7 @@ def get_flows(# Returns the "raw_materials" for the flow editor@router.get("/raw_materials")async def get_material_list():- enrichers = EnricherRegistry.list_by_categories()+ enrichers = ENRICHER_REGISTRY.list_by_categories()enricher_categories = {category: [{@@ -152,7 +155,7 @@ async def get_material_list():# Returns the "raw_materials" for the flow editor@router.get("/input_type/{input_type}")async def get_material_list(input_type: str):- enrichers = EnricherRegistry.list_by_input_type(input_type)+ enrichers = ENRICHER_REGISTRY.list_by_input_type(input_type)return {"items": enrichers}diff --git a/flowsint-api/app/api/routes/types.py b/flowsint-api/app/api/routes/types.pyindex 1d322184..91d86fef 100644--- a/flowsint-api/app/api/routes/types.py+++ b/flowsint-api/app/api/routes/types.py@@ -6,49 +6,25 @@ from sqlalchemy.orm import Sessionfrom flowsint_core.core.postgre_db import get_dbfrom flowsint_core.core.models import CustomType, Profilefrom app.api.deps import get_current_user-from flowsint_types import (- Domain,- Ip,- Port,- SocialAccount,- Organization,- Email,- ASN,- CIDR,- CryptoWallet,- CryptoWalletTransaction,- CryptoNFT,- Website,- Individual,- Phone,- Leak,- Username,- Credential,- Session,- DNSRecord,- SSLCertificate,- Device,- Document,- File,- Message,- Malware,- Weapon,- BankAccount,- CreditCard,- WebTracker,- Phrase,- Location,-)+from flowsint_types.registry import get_typerouter = APIRouter()+# Helper function to get a type by name from the registry+def get_type_from_registry(type_name: str) -> Optional[Type[BaseModel]]:+ """Get a type from the TYPE_REGISTRY by name."""+ return get_type(type_name, case_sensitive=True)++# Returns the "types" for the sketches@router.get("/")async def get_types_list(db: Session = Depends(get_db), current_user: Profile = Depends(get_current_user)):- types = [+ # Define categories with type names to look up in TYPE_REGISTRY+ # Format: (type_name, label_key, optional_icon)+ category_definitions = [{"id": uuid4(),"type": "global",@@ -57,8 +33,8 @@ async def get_types_list("label": "Global","fields": [],"children": [- extract_input_schema(Phrase, label_key="text"),- extract_input_schema(Location, label_key="address"),+ ("Phrase", "text", None),+ ("Location", "address", None),],},{@@ -69,12 +45,9 @@ async def get_types_list("label": "Identities & Entities","fields": [],"children": [- extract_input_schema(Individual, label_key="full_name"),- extract_input_schema(Username, label_key="value", icon="username"),- # extract_input_schema(- # SocialAccount, label_key="username", icon="social_account"- # ),- extract_input_schema(Organization, label_key="name"),+ ("Individual", "full_name", None),+ ("Username", "value", "username"),+ ("Organization", "name", None),],},{@@ -85,7 +58,7 @@ async def get_types_list("label": "Organization","fields": [],"children": [- extract_input_schema(Organization, label_key="name"),+ ("Organization", "name", None),],},{@@ -96,13 +69,11 @@ async def get_types_list("label": "Communication & Contact","fields": [],"children": [- extract_input_schema(Phone, label_key="number"),- extract_input_schema(Email, label_key="email"),- extract_input_schema(Username, label_key="value"),- extract_input_schema(- SocialAccount, label_key="username", icon="socialaccount"- ),- extract_input_schema(Message, label_key="content", icon="message"),+ ("Phone", "number", None),+ ("Email", "email", None),+ ("Username", "value", None),+ ("SocialAccount", "username", "socialaccount"),+ ("Message", "content", "message"),],},{@@ -113,15 +84,15 @@ async def get_types_list("label": "Network","fields": [],"children": [- extract_input_schema(ASN, label_key="number"),- extract_input_schema(CIDR, label_key="network"),- extract_input_schema(Domain, label_key="domain"),- extract_input_schema(Website, label_key="url"),- extract_input_schema(Ip, label_key="address"),- extract_input_schema(Port, label_key="number"),- extract_input_schema(DNSRecord, label_key="name", icon="dns"),- extract_input_schema(SSLCertificate, label_key="subject", icon="ssl"),- extract_input_schema(WebTracker, label_key="name", icon="webtracker"),+ ("ASN", "number", None),+ ("CIDR", "network", None),+ ("Domain", "domain", None),+ ("Website", "url", None),+ ("Ip", "address", None),+ ("Port", "number", None),+ ("DNSRecord", "name", "dns"),+ ("SSLCertificate", "subject", "ssl"),+ ("WebTracker", "name", "webtracker"),],},{@@ -132,13 +103,11 @@ async def get_types_list("label": "Security & Access","fields": [],"children": [- extract_input_schema(- Credential, label_key="username", icon="credential"- ),- extract_input_schema(Session, label_key="session_id", icon="session"),- extract_input_schema(Device, label_key="device_id", icon="device"),- extract_input_schema(Malware, label_key="name", icon="malware"),- extract_input_schema(Weapon, label_key="name", icon="weapon"),+ ("Credential", "username", "credential"),+ ("Session", "session_id", "session"),+ ("Device", "device_id", "device"),+ ("Malware", "name", "malware"),+ ("Weapon", "name", "weapon"),],},{@@ -149,8 +118,8 @@ async def get_types_list("label": "Files & Documents","fields": [],"children": [- extract_input_schema(Document, label_key="title", icon="document"),- extract_input_schema(File, label_key="filename", icon="file"),+ ("Document", "title", "document"),+ ("File", "filename", "file"),],},{@@ -161,12 +130,8 @@ async def get_types_list("label": "Financial Data","fields": [],"children": [- extract_input_schema(- BankAccount, label_key="account_number", icon="creditcard"- ),- extract_input_schema(- CreditCard, label_key="card_number", icon="creditcard"- ),+ ("BankAccount", "account_number", "creditcard"),+ ("CreditCard", "card_number", "creditcard"),],},{@@ -177,7 +142,7 @@ async def get_types_list("label": "Leaks","fields": [],"children": [- extract_input_schema(Leak, label_key="name", icon="breach"),+ ("Leak", "name", "breach"),],},{@@ -188,17 +153,34 @@ async def get_types_list("label": "Crypto","fields": [],"children": [- extract_input_schema(- CryptoWallet, label_key="address", icon="cryptowallet"- ),- extract_input_schema(- CryptoWalletTransaction, label_key="hash", icon="cryptowallet"- ),- extract_input_schema(CryptoNFT, label_key="name", icon="cryptowallet"),+ ("CryptoWallet", "address", "cryptowallet"),+ ("CryptoWalletTransaction", "hash", "cryptowallet"),+ ("CryptoNFT", "name", "cryptowallet"),],},]+ # Build the types list by looking up each type in TYPE_REGISTRY+ types = []+ for category in category_definitions:+ category_copy = category.copy()+ children_schemas = []++ for child_def in category["children"]:+ type_name, label_key, icon = child_def+ model = get_type_from_registry(type_name)++ if model:+ children_schemas.append(+ extract_input_schema(model, label_key=label_key, icon=icon)+ )+ else:+ # Log warning but continue - type might not be available+ print(f"Warning: Type {type_name} not found in TYPE_REGISTRY")++ category_copy["children"] = children_schemas+ types.append(category_copy)+# Add custom typescustom_types = (db.query(CustomType)