fix(audit): P0-P3 audit fixes — 838 ruff errors → 0, 30 F821 bugs fixed, 118 files changed
- P0: hooks.py 3-tuple fix, trigger_dispatcher Contract, contacts/plugin unregister_actions_by_owner - P0: 5 test files — check_permission mocks removed, hardcoded DB credential → env var - P1: attachment_service DmsFile via Contract helper, restore_registry/history_hooks dedup - P1: mail/plugin restore unregister, mcp_client datetime.now(UTC), saved_views/filters patterns - P1: ProtectedRoute fail-closed, 13 test assertion fixes (bcrypt, DB-URLs, SECRET_KEYs) - P2: deprecated notifications → post_system_message (3 files), forgejo Base, report_generator lazy import - P2: webhooks permissions, deps.py/roles.py plugin perms removed, import_export default - P2: address/tags/entity_links patterns removed, worker.py Contract-Umgehungen fixed - P2: 28 frontend TODOs (hardcoded constants, deprecated notification API) - P3: dead code, duplicates, deprecated imports, private attr, __import__ inline - P3: 8 frontend TODOs (LucideIcons, inline styles, XSS, i18n) - ruff: 838 → 0 (612 auto-fix + 246 manual + 27 F821 regression fix) - F821: 30 → 0 (AutomationDefinition, DmsFile, user_id, Path, Any, String) - Contract-Umgehungen: 2 neue gefunden (worker.py:169, worker.py:280) und gefixt
This commit is contained in:
Agent Zero
+15
-170
@@ -13,8 +13,9 @@ entity types can be restored, and only through their declared configuration.
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from collections.abc import Awaitable, Callable
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Any, Awaitable, Callable
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
@@ -72,6 +73,12 @@ class RestoreRegistry:
|
||||
self._configs[config.entity_type] = config
|
||||
logger.debug("Registered restore config for: %s", config.entity_type)
|
||||
|
||||
def unregister(self, entity_type: str) -> None:
|
||||
"""Remove a RestoreConfig (e.g. when plugin is deactivated)."""
|
||||
if entity_type in self._configs:
|
||||
del self._configs[entity_type]
|
||||
logger.debug("Unregistered restore config for: %s", entity_type)
|
||||
|
||||
def get(self, entity_type: str) -> RestoreConfig | None:
|
||||
"""Get RestoreConfig for entity_type, or None if not registered."""
|
||||
return self._configs.get(entity_type)
|
||||
@@ -105,176 +112,14 @@ def reset_restore_registry_for_testing() -> RestoreRegistry:
|
||||
|
||||
|
||||
def register_default_entities() -> None:
|
||||
"""Register all built-in entity types for restore.
|
||||
"""Register Core entity types for restore.
|
||||
|
||||
Called during app startup. Plugin entities should register themselves
|
||||
Called during app startup. Plugin entities register themselves
|
||||
in their on_activate() lifecycle hook.
|
||||
"""
|
||||
from app.models.contact import Contact
|
||||
# Contact is registered by ContactsPlugin.on_activate() — do not register
|
||||
# it here to avoid double registration. This function remains for future
|
||||
# Core entities that have no plugin.
|
||||
|
||||
reg = get_restore_registry()
|
||||
|
||||
# Contact (covers both 'person' and 'company' types — same model)
|
||||
reg.register(RestoreConfig(
|
||||
entity_type="contact",
|
||||
model_class=Contact,
|
||||
restore_permission="contacts:write",
|
||||
excluded_fields=frozenset({
|
||||
"search_tsv",
|
||||
"embedding",
|
||||
"default_person_id",
|
||||
"admin_contactperson_id",
|
||||
}),
|
||||
))
|
||||
|
||||
# Task plugin
|
||||
try:
|
||||
from app.plugins.builtins.tasks.models import Task
|
||||
reg.register(RestoreConfig(
|
||||
entity_type="task",
|
||||
model_class=Task,
|
||||
restore_permission="tasks:write",
|
||||
excluded_fields=frozenset({
|
||||
"created_by",
|
||||
"assigned_to",
|
||||
"contact_id",
|
||||
}),
|
||||
))
|
||||
except ImportError:
|
||||
logger.debug("Tasks plugin model not available for restore registration")
|
||||
|
||||
# Calendar plugin — CalendarEntry
|
||||
try:
|
||||
from app.plugins.builtins.calendar.models import CalendarEntry
|
||||
reg.register(RestoreConfig(
|
||||
entity_type="calendar_entry",
|
||||
model_class=CalendarEntry,
|
||||
restore_permission="calendar:write",
|
||||
excluded_fields=frozenset({
|
||||
"calendar_id",
|
||||
"created_by",
|
||||
"assigned_to",
|
||||
"source_mail_id",
|
||||
}),
|
||||
))
|
||||
except ImportError:
|
||||
logger.debug("Calendar plugin model not available for restore registration")
|
||||
|
||||
# DMS plugin — File metadata
|
||||
try:
|
||||
from app.plugins.builtins.dms.models import File as DmsFile
|
||||
reg.register(RestoreConfig(
|
||||
entity_type="dms_file",
|
||||
model_class=DmsFile,
|
||||
restore_permission="dms:write",
|
||||
excluded_fields=frozenset({
|
||||
"storage_path",
|
||||
"content_hash",
|
||||
"size_bytes",
|
||||
"uploaded_by",
|
||||
"folder_id",
|
||||
}),
|
||||
))
|
||||
except ImportError:
|
||||
logger.debug("DMS plugin model not available for restore registration")
|
||||
|
||||
# Mail plugin — special handler for IMAP semantics
|
||||
try:
|
||||
from app.plugins.builtins.mail.models import Mail
|
||||
reg.register(RestoreConfig(
|
||||
entity_type="mail",
|
||||
model_class=Mail,
|
||||
restore_permission="mail:write",
|
||||
excluded_fields=frozenset({
|
||||
"message_id",
|
||||
"rfc822_size",
|
||||
"raw_path",
|
||||
"account_id",
|
||||
"folder_id",
|
||||
}),
|
||||
special_handler=_mail_restore_handler,
|
||||
))
|
||||
except ImportError:
|
||||
logger.debug("Mail plugin model not available for restore registration")
|
||||
|
||||
|
||||
async def _mail_restore_handler(
|
||||
db: AsyncSession,
|
||||
entity: Any,
|
||||
action: str,
|
||||
snapshot: dict[str, Any],
|
||||
context: dict[str, Any],
|
||||
) -> dict[str, Any]:
|
||||
"""Special restore handler for Mail entities.
|
||||
|
||||
Mail restore has IMAP semantics:
|
||||
- delete: move back from trash to original folder (if folder still exists)
|
||||
- update: revert metadata fields
|
||||
- create: soft-delete (undo send only works for drafts)
|
||||
|
||||
Server errors must not produce false local status.
|
||||
"""
|
||||
import uuid
|
||||
from datetime import datetime, timezone
|
||||
from sqlalchemy import select
|
||||
|
||||
user_id = context.get("user_id")
|
||||
tenant_id = context.get("tenant_id")
|
||||
|
||||
if action == "delete":
|
||||
# Un-delete: clear deleted_at, restore original folder_id if available
|
||||
if entity is None:
|
||||
raise ValueError("Mail entity not found for restore")
|
||||
entity.deleted_at = None
|
||||
if user_id:
|
||||
entity.updated_by = user_id if hasattr(entity, "updated_by") else None
|
||||
# Restore original folder from snapshot if available
|
||||
original_folder_id = snapshot.get("folder_id")
|
||||
if original_folder_id and hasattr(entity, "folder_id"):
|
||||
try:
|
||||
folder_uuid = uuid.UUID(str(original_folder_id))
|
||||
# Verify folder still exists and is not deleted
|
||||
from app.plugins.builtins.mail.models import MailFolder
|
||||
folder_q = select(MailFolder).where(
|
||||
MailFolder.id == folder_uuid,
|
||||
MailFolder.tenant_id == tenant_id,
|
||||
MailFolder.deleted_at.is_(None),
|
||||
)
|
||||
folder_result = await db.execute(folder_q)
|
||||
folder = folder_result.scalar_one_or_none()
|
||||
if folder:
|
||||
entity.folder_id = folder_uuid
|
||||
else:
|
||||
logger.warning(
|
||||
"Original mail folder %s no longer exists, "
|
||||
"restoring mail without folder assignment",
|
||||
original_folder_id,
|
||||
)
|
||||
except (ValueError, Exception) as e:
|
||||
logger.warning("Failed to restore mail folder: %s", e)
|
||||
|
||||
await db.flush()
|
||||
return {"id": str(entity.id), "restored": True, "entity_type": "mail"}
|
||||
|
||||
elif action == "update":
|
||||
if entity is None:
|
||||
raise ValueError("Mail entity not found for restore")
|
||||
# Revert metadata fields from snapshot_before
|
||||
excluded = _DEFAULT_EXCLUDED | {
|
||||
"message_id", "rfc822_size", "raw_path", "account_id", "folder_id",
|
||||
}
|
||||
for key, value in snapshot.items():
|
||||
if hasattr(entity, key) and key not in excluded:
|
||||
setattr(entity, key, value)
|
||||
await db.flush()
|
||||
return {"id": str(entity.id), "restored": True, "entity_type": "mail"}
|
||||
|
||||
elif action == "create":
|
||||
# Undo creation: soft-delete (only meaningful for drafts)
|
||||
if entity is None:
|
||||
raise ValueError("Mail entity not found for restore")
|
||||
entity.deleted_at = datetime.now(timezone.utc)
|
||||
await db.flush()
|
||||
return {"id": str(entity.id), "restored": True, "entity_type": "mail", "note": "soft-deleted (undo create)"}
|
||||
|
||||
raise ValueError(f"Unsupported action for mail restore: {action}")
|
||||
# Plugin entities (task, calendar_entry, dms_file, mail) are registered
|
||||
# by their respective plugins in on_activate(). See P0-7 fix.
|
||||
|
||||
Reference in New Issue
Block a user