Pouzor
38c5bcb606
## New features - Configurable bottom connection points per node (1–4 handles) - Fit view on load - LiveView improvements - Node modal: inline Type/Icon picker, default icon in trigger - Remove redundant Save button from ScanConfigModal ## Scanner fixes - Phase 1: replace nmap ARP sweep with concurrent asyncio ping sweep (50 parallel pings, 1s timeout). Zero false positives, works in any Docker network mode. Supplements with /proc/net/arp for ICMP-blocked devices. - Phase 2: explicit -sS (root) / -sT (non-root) scan type; bump host-timeout to 60s; gather(return_exceptions=True) so one failing host doesn't abort the batch - Fix 404 on missing device in hide/ignore - Validate CIDR ranges to prevent nmap injection - Thread-safe cancel set, pre-fetch canvas/hidden IPs (no N+1 queries) - Logging: attach StreamHandler to root logger so app.* logs are visible ## Tests - 21 backend scanner tests (ping sweep, ARP cache, Phase 2 tolerance) - Full NodeModal coverage (53 tests) - LiveView, store, edge label tests
69 lines
1.7 KiB
Python
69 lines
1.7 KiB
Python
from typing import Any
|
|
|
|
from pydantic import BaseModel, field_validator
|
|
|
|
from app.schemas.edges import EdgeResponse
|
|
from app.schemas.nodes import NodeResponse
|
|
from app.schemas.utils import normalize_animated
|
|
|
|
|
|
class NodeSave(BaseModel):
|
|
id: str
|
|
type: str
|
|
label: str
|
|
hostname: str | None = None
|
|
ip: str | None = None
|
|
mac: str | None = None
|
|
os: str | None = None
|
|
status: str = "unknown"
|
|
check_method: str | None = None
|
|
check_target: str | None = None
|
|
services: list[Any] = []
|
|
notes: str | None = None
|
|
parent_id: str | None = None
|
|
container_mode: bool = False
|
|
custom_colors: dict[str, Any] | None = None
|
|
custom_icon: str | None = None
|
|
cpu_count: int | None = None
|
|
cpu_model: str | None = None
|
|
ram_gb: float | None = None
|
|
disk_gb: float | None = None
|
|
show_hardware: bool = False
|
|
width: float | None = None
|
|
height: float | None = None
|
|
bottom_handles: int = 1
|
|
pos_x: float = 0
|
|
pos_y: float = 0
|
|
|
|
|
|
class EdgeSave(BaseModel):
|
|
id: str
|
|
source: str
|
|
target: str
|
|
type: str = "ethernet"
|
|
label: str | None = None
|
|
vlan_id: int | None = None
|
|
speed: str | None = None
|
|
custom_color: str | None = None
|
|
path_style: str | None = None
|
|
animated: str = 'none'
|
|
source_handle: str | None = None
|
|
target_handle: str | None = None
|
|
|
|
@field_validator('animated', mode='before')
|
|
@classmethod
|
|
def validate_animated(cls, v: object) -> str:
|
|
return normalize_animated(v)
|
|
|
|
|
|
class CanvasSaveRequest(BaseModel):
|
|
nodes: list[NodeSave] = []
|
|
edges: list[EdgeSave] = []
|
|
viewport: dict[str, Any] = {}
|
|
|
|
|
|
class CanvasStateResponse(BaseModel):
|
|
nodes: list[NodeResponse]
|
|
edges: list[EdgeResponse]
|
|
viewport: dict[str, Any]
|