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:
+45
-15
@@ -30,7 +30,8 @@ from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from collections import defaultdict
|
||||
from typing import Any, Callable
|
||||
from collections.abc import Callable
|
||||
from typing import Any
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -55,27 +56,32 @@ class HookRegistry:
|
||||
|
||||
# ─── Registration ───
|
||||
|
||||
def register_action(self, hook_name: str, callback: Callable, priority: int = 10) -> None:
|
||||
"""Register an action callback for *hook_name*."""
|
||||
self._actions[hook_name].append((priority, callback))
|
||||
self._actions[hook_name].sort(key=lambda x: x[0])
|
||||
logger.debug("Action registered: %s (priority=%d)", hook_name, priority)
|
||||
def register_action(self, hook_name: str, callback: Callable, priority: int = 10, owner_tag: str | None = None) -> None:
|
||||
"""Register an action callback for *hook_name*.
|
||||
|
||||
def register_filter(self, hook_name: str, callback: Callable, priority: int = 10) -> None:
|
||||
Args:
|
||||
owner_tag: Optional tag identifying the owning plugin. Used by
|
||||
unregister_actions_by_owner() to remove only this plugin's hooks.
|
||||
"""
|
||||
self._actions[hook_name].append((priority, callback, owner_tag))
|
||||
self._actions[hook_name].sort(key=lambda x: x[0])
|
||||
logger.debug("Action registered: %s (priority=%d, owner=%s)", hook_name, priority, owner_tag)
|
||||
|
||||
def register_filter(self, hook_name: str, callback: Callable, priority: int = 10, owner_tag: str | None = None) -> None:
|
||||
"""Register a filter callback for *hook_name*."""
|
||||
self._filters[hook_name].append((priority, callback))
|
||||
self._filters[hook_name].append((priority, callback, owner_tag))
|
||||
self._filters[hook_name].sort(key=lambda x: x[0])
|
||||
logger.debug("Filter registered: %s (priority=%d)", hook_name, priority)
|
||||
logger.debug("Filter registered: %s (priority=%d, owner=%s)", hook_name, priority, owner_tag)
|
||||
|
||||
# ─── Unregistration ───
|
||||
|
||||
def unregister(self, hook_name: str, callback: Callable) -> None:
|
||||
"""Remove a specific callback from both actions and filters."""
|
||||
self._actions[hook_name] = [
|
||||
(p, c) for p, c in self._actions.get(hook_name, []) if c != callback
|
||||
(p, c, o) for p, c, o in self._actions.get(hook_name, []) if c != callback
|
||||
]
|
||||
self._filters[hook_name] = [
|
||||
(p, c) for p, c in self._filters.get(hook_name, []) if c != callback
|
||||
(p, c, o) for p, c, o in self._filters.get(hook_name, []) if c != callback
|
||||
]
|
||||
if not self._actions[hook_name]:
|
||||
self._actions.pop(hook_name, None)
|
||||
@@ -92,23 +98,47 @@ class HookRegistry:
|
||||
for hook_dict in (self._actions, self._filters):
|
||||
for hook_name in list(hook_dict.keys()):
|
||||
kept: list[tuple[int, Callable]] = []
|
||||
for priority, callback in hook_dict[hook_name]:
|
||||
for priority, callback, _owner in hook_dict[hook_name]:
|
||||
owner = getattr(callback, "__self__", None)
|
||||
plugin_manifest_name = getattr(getattr(owner, "manifest", None), "name", None)
|
||||
if plugin_manifest_name == plugin_name:
|
||||
logger.debug("Unregistered hook %s for plugin %s", hook_name, plugin_name)
|
||||
continue
|
||||
kept.append((priority, callback))
|
||||
kept.append((priority, callback, _owner))
|
||||
if kept:
|
||||
hook_dict[hook_name] = kept
|
||||
else:
|
||||
hook_dict.pop(hook_name, None)
|
||||
|
||||
def clear_actions(self, hook_name: str) -> None:
|
||||
"""Remove all action callbacks for a given hook name.
|
||||
|
||||
Used by plugins to unregister hooks that were registered via
|
||||
register_history_hooks() (which creates free functions, not bound methods).
|
||||
"""
|
||||
self._actions.pop(hook_name, None)
|
||||
logger.debug("Cleared all actions for hook: %s", hook_name)
|
||||
|
||||
def unregister_actions_by_owner(self, hook_name: str, owner_tag: str) -> None:
|
||||
"""Remove only the action callbacks for *hook_name* that were registered
|
||||
with the given *owner_tag*.
|
||||
|
||||
This prevents a plugin from accidentally removing another plugin's
|
||||
handlers for the same event.
|
||||
"""
|
||||
callbacks = self._actions.get(hook_name, [])
|
||||
kept = [(p, c, o) for p, c, o in callbacks if o != owner_tag]
|
||||
if kept:
|
||||
self._actions[hook_name] = kept
|
||||
else:
|
||||
self._actions.pop(hook_name, None)
|
||||
logger.debug("Unregistered %d actions for hook %s owner=%s", len(callbacks) - len(kept), hook_name, owner_tag)
|
||||
|
||||
# ─── Execution ───
|
||||
|
||||
async def do_action(self, hook_name: str, *args: Any, **kwargs: Any) -> None:
|
||||
"""Execute all action callbacks for *hook_name* in priority order."""
|
||||
for _, callback in self._actions.get(hook_name, []):
|
||||
for _, callback, _owner in self._actions.get(hook_name, []):
|
||||
try:
|
||||
result = callback(*args, **kwargs)
|
||||
if hasattr(result, "__await__"):
|
||||
@@ -118,7 +148,7 @@ class HookRegistry:
|
||||
|
||||
async def apply_filters(self, hook_name: str, value: Any, *args: Any, **kwargs: Any) -> Any:
|
||||
"""Pass *value* through all filter callbacks for *hook_name* in priority order."""
|
||||
for _, callback in self._filters.get(hook_name, []):
|
||||
for _, callback, _owner in self._filters.get(hook_name, []):
|
||||
try:
|
||||
result = callback(value, *args, **kwargs)
|
||||
if hasattr(result, "__await__"):
|
||||
|
||||
Reference in New Issue
Block a user