mirror of
https://github.com/yogeshojha/rengine.git
synced 2026-10-20 23:31:31 +02:00
The in-app feed was a second copy of the activity log with a red badge on it. A scan published up to six notifications (started, completed, new subdomains, new services, new vulnerabilities, coverage), every one of them already an activity_logs row and every one of them toasted for five seconds. A nightly twenty-target schedule left forty to a hundred and twenty unread rows. If it does not want a human to do something, it is not a notification. Deleted scan_started, scan_completed and scan_cancelled (both the API-side echo of the user's own Cancel click and the finalize one). whois/ripestat enrichment_complete became enrichment_incomplete and return None unless something actually failed. One digest replaces the five scan templates. scan_digest(...) -> dict | None takes a ScanDeltas and derives its severity, title, type and deep-link tab from the worst thing inside it, and returns None when nothing changed, so a quiet scheduled run is silent. Severity now encodes risk rather than process: scan_failed is warning, not error, because the bell takes its colour from the highest unread severity and one flaky run should not read like a KEV. Toasts are interrupts only: warning and error toast, success and info land silently in the bell. A toast with a url finally gets a View action; it used to require an action_label no template ever set. notifications.project_id scopes the bell to the active project (nullable and indexed, no FK so a transient row can never block a project delete). The list, stats, read-all and clear-all endpoints take ?project_id=, and the store drops SSE events from other projects. app.tasks.notifications.cleanup runs on beat every six hours. expires_at had been decorative since nothing ever called cleanup_expired, and the inbox modal fetched stats.total rows in a single request. Three bugs this uncovered: _count_new_subdomains had no baseline gate while services and vulnerabilities did, so a target's first scan announced its whole inventory as new: the first gov.np run would have reported 24022 new subdomains. Baselines are now per dimension, and a run with none reports the census instead. The delta counts ignored census_only, so a focused rescan both counted as a baseline and had its own rows announced. Every comparison now joins scans bs ... scope = 'full' AND bs.started_at < :started. Measuring the deltas took 16.8s on a 13,528-host scan: the scan-level baseline was a correlated EXISTS re-evaluated once per row and could not use ix_subdomains_target_name_discovered, having no name predicate. Hoisting it to one scan-level check and rewriting the per-row test as a hash anti-join over a WITH seen AS (SELECT DISTINCT ...) CTE gives the identical answer in 52ms, verified against a plain EXCEPT query. Not done, deliberately: is_read is still one global flag, so on a shared instance one analyst's Mark all as read still applies to everyone; that needs a notification_reads table. And notifier.wants() still governs external channels only, the bell having no preference layer, because volume reduction was the fix. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BCPTXCr5qPESCt3LxR3329
170 lines
5.0 KiB
Python
170 lines
5.0 KiB
Python
import uuid
|
|
|
|
from sqlalchemy import delete, update
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from shared.enums.notification import NotificationSeverity, NotificationType
|
|
from shared.enums.sse import SSEChannel, SSEEventType
|
|
from shared.logging import get_logger
|
|
from shared.models.notification import Notification, NotificationMetadata
|
|
from shared.sse import sse_manager
|
|
from shared.utils.datetime import utc_now
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
class NotificationManager:
|
|
@staticmethod
|
|
async def publish(
|
|
session: AsyncSession,
|
|
type: NotificationType,
|
|
severity: NotificationSeverity,
|
|
title: str,
|
|
message: str,
|
|
metadata: NotificationMetadata | dict | None = None,
|
|
project_id: uuid.UUID | str | None = None,
|
|
commit: bool = True,
|
|
) -> Notification:
|
|
if isinstance(metadata, NotificationMetadata):
|
|
metadata_dict = metadata.model_dump(exclude_none=True)
|
|
elif isinstance(metadata, dict):
|
|
validated = NotificationMetadata(**metadata)
|
|
metadata_dict = validated.model_dump(exclude_none=True)
|
|
else:
|
|
metadata_dict = {}
|
|
|
|
notification = Notification(
|
|
type=type,
|
|
severity=severity,
|
|
title=title[:200],
|
|
message=message,
|
|
notification_metadata=metadata_dict,
|
|
project_id=uuid.UUID(str(project_id)) if project_id else None,
|
|
)
|
|
|
|
session.add(notification)
|
|
|
|
if commit:
|
|
await session.commit()
|
|
await session.refresh(notification)
|
|
else:
|
|
await session.flush()
|
|
|
|
await sse_manager.publish(
|
|
channel=SSEChannel.BROADCAST,
|
|
event_type=SSEEventType.NOTIFICATION,
|
|
data={
|
|
"id": notification.id,
|
|
"project_id": str(notification.project_id)
|
|
if notification.project_id
|
|
else None,
|
|
"type": notification.type.value,
|
|
"severity": notification.severity.value,
|
|
"title": notification.title,
|
|
"message": notification.message,
|
|
"notification_metadata": notification.notification_metadata,
|
|
"is_read": notification.is_read,
|
|
"created_at": notification.created_at.isoformat(),
|
|
},
|
|
)
|
|
|
|
logger.info(f"Published notification: {type.value}/{severity.value} - {title}")
|
|
|
|
try:
|
|
from shared.services.notifier import dispatch_async # noqa: PLC0415
|
|
|
|
await dispatch_async(session, type, severity, title, message)
|
|
except Exception as exc:
|
|
logger.warning(f"External notification dispatch failed: {exc}")
|
|
|
|
return notification
|
|
|
|
@staticmethod
|
|
async def mark_as_read(
|
|
session: AsyncSession,
|
|
notification_id: int,
|
|
commit: bool = True,
|
|
) -> bool:
|
|
result = await session.execute(
|
|
update(Notification)
|
|
.where(Notification.id == notification_id)
|
|
.values(is_read=True)
|
|
)
|
|
|
|
if commit:
|
|
await session.commit()
|
|
|
|
return result.rowcount > 0
|
|
|
|
@staticmethod
|
|
async def mark_all_as_read(
|
|
session: AsyncSession,
|
|
project_id: uuid.UUID | None = None,
|
|
commit: bool = True,
|
|
) -> int:
|
|
stmt = update(Notification).where(Notification.is_read.is_(False))
|
|
if project_id is not None:
|
|
stmt = stmt.where(
|
|
(Notification.project_id == project_id)
|
|
| Notification.project_id.is_(None)
|
|
)
|
|
result = await session.execute(stmt.values(is_read=True))
|
|
|
|
if commit:
|
|
await session.commit()
|
|
|
|
return result.rowcount
|
|
|
|
@staticmethod
|
|
async def delete_notification(
|
|
session: AsyncSession,
|
|
notification_id: int,
|
|
commit: bool = True,
|
|
) -> bool:
|
|
result = await session.execute(
|
|
delete(Notification).where(Notification.id == notification_id)
|
|
)
|
|
|
|
if commit:
|
|
await session.commit()
|
|
|
|
return result.rowcount > 0
|
|
|
|
@staticmethod
|
|
async def clear_all(
|
|
session: AsyncSession,
|
|
project_id: uuid.UUID | None = None,
|
|
commit: bool = True,
|
|
) -> int:
|
|
stmt = delete(Notification)
|
|
if project_id is not None:
|
|
stmt = stmt.where(
|
|
(Notification.project_id == project_id)
|
|
| Notification.project_id.is_(None)
|
|
)
|
|
result = await session.execute(stmt)
|
|
|
|
if commit:
|
|
await session.commit()
|
|
|
|
return result.rowcount
|
|
|
|
@staticmethod
|
|
async def cleanup_expired(
|
|
session: AsyncSession,
|
|
commit: bool = True,
|
|
) -> int:
|
|
now = utc_now()
|
|
result = await session.execute(
|
|
delete(Notification).where(Notification.expires_at < now)
|
|
)
|
|
|
|
if commit:
|
|
await session.commit()
|
|
|
|
deleted_count = result.rowcount
|
|
if deleted_count > 0:
|
|
logger.info(f"Cleaned up {deleted_count} expired notifications")
|
|
|
|
return deleted_count
|