fix: resolve relative folder paths against anime dir in delete_series
The folder column in anime_series stores the relative folder name
(e.g. 'Beyblade Burst (2016)'), not an absolute path. The old
delete_series code called os.path.abspath(folder_path) directly,
which joins a relative path against the process current working
directory. Inside the container the FastAPI app runs with CWD=/app
while the anime directory is /data, so 'Beyblade Burst (2016)'
resolved to '/app/Beyblade Burst (2016)' and the is_safe_path check
correctly (but unhelpfully) flagged it as outside the /data base,
skipping the folder delete while still removing the row.
Fix: resolve relative folder paths against the configured anime
directory before validating against the base. Absolute paths still
work unchanged.
Also harden is_safe_path() the same way so a relative target is
treated as relative to base_path, not to the process CWD. Path
traversal ('../etc/passwd') is still rejected.
Adds two regression tests:
- is_safe_path with chdir to '/' and relative target resolves
against the base
- delete_series with chdir to '/', relative folder in DB,
succeeds and removes the folder
This commit is contained in:
@@ -1749,9 +1749,22 @@ class AnimeService:
|
||||
|
||||
# --- Filesystem deletion ---
|
||||
if delete_folder and folder_path:
|
||||
# Resolve absolute path and validate it is within base directory
|
||||
abs_folder = _os.path.abspath(folder_path)
|
||||
# Resolve absolute path and validate it is within base directory.
|
||||
#
|
||||
# Important: `folder_path` stored in the database is the relative
|
||||
# folder name (e.g. "Beyblade Burst (2016)"), not an absolute path.
|
||||
# If we feed a relative path to os.path.abspath() it gets joined
|
||||
# against the process's current working directory — which may be
|
||||
# /app inside the container while the anime directory is /data,
|
||||
# producing e.g. "/app/Beyblade Burst (2016)" and tripping the
|
||||
# safe-path check below for what is actually a valid deletion.
|
||||
# Resolve relative paths against the configured anime directory
|
||||
# so the safety check operates on the real intended target.
|
||||
base_dir = _os.path.abspath(self._directory)
|
||||
if _os.path.isabs(folder_path):
|
||||
abs_folder = _os.path.abspath(folder_path)
|
||||
else:
|
||||
abs_folder = _os.path.abspath(_os.path.join(base_dir, folder_path))
|
||||
|
||||
if not is_safe_path(base_dir, abs_folder):
|
||||
logger.warning(
|
||||
|
||||
@@ -113,32 +113,54 @@ def sanitize_folder_name(
|
||||
|
||||
def is_safe_path(base_path: str, target_path: str) -> bool:
|
||||
"""Check if target_path is safely within base_path.
|
||||
|
||||
|
||||
Prevents path traversal attacks by ensuring the target path
|
||||
is actually within the base path after resolution.
|
||||
|
||||
|
||||
Note on relative paths: a relative ``target_path`` is interpreted
|
||||
as relative to ``base_path``, *not* to the process's current
|
||||
working directory. This mirrors how callers use this helper:
|
||||
they pass a configured base directory and a folder name stored
|
||||
alongside it (e.g. the series ``folder`` column in the database
|
||||
holds a relative name like ``"Beyblade Burst (2016)"``, and the
|
||||
anime directory is configured separately). Without this, a
|
||||
relative target would be resolved against the process CWD —
|
||||
which can differ from ``base_path`` (the FastAPI app runs with
|
||||
CWD=/app while the anime directory is mounted at /data), and
|
||||
the helper would incorrectly reject the path as outside the
|
||||
base. Absolute ``target_path`` values are validated against
|
||||
``base_path`` directly.
|
||||
|
||||
Args:
|
||||
base_path: The base directory that should contain the target
|
||||
target_path: The path to validate
|
||||
|
||||
target_path: The path to validate (absolute, or relative to base_path)
|
||||
|
||||
Returns:
|
||||
bool: True if target_path is safely within base_path
|
||||
|
||||
|
||||
Example:
|
||||
>>> is_safe_path("/anime", "/anime/Attack on Titan")
|
||||
True
|
||||
>>> is_safe_path("/anime", "Attack on Titan") # relative -> /anime/Attack on Titan
|
||||
True
|
||||
>>> is_safe_path("/anime", "/anime/../etc/passwd")
|
||||
False
|
||||
"""
|
||||
# Resolve to absolute paths
|
||||
# Resolve base to an absolute path
|
||||
base_resolved = os.path.abspath(base_path)
|
||||
target_resolved = os.path.abspath(target_path)
|
||||
|
||||
|
||||
# Resolve target relative to the base (not the process CWD) when it is
|
||||
# supplied as a relative path. Absolute targets are validated as-is.
|
||||
if os.path.isabs(target_path):
|
||||
target_resolved = os.path.abspath(target_path)
|
||||
else:
|
||||
target_resolved = os.path.abspath(os.path.join(base_resolved, target_path))
|
||||
|
||||
# Check that target starts with base (with trailing separator)
|
||||
base_with_sep = base_resolved + os.sep
|
||||
return (
|
||||
target_resolved == base_resolved or
|
||||
target_resolved.startswith(base_with_sep)
|
||||
target_resolved == base_resolved
|
||||
or target_resolved.startswith(base_with_sep)
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user