SOTA Open Source TTS
fix: add reference ID validation to prevent path traversal (#1207)
huang yutong0def6f38e375
diff --git a/fish_speech/inference_engine/reference_loader.py b/fish_speech/inference_engine/reference_loader.pyindex 96a8e8b..0f1b513 100644--- a/fish_speech/inference_engine/reference_loader.py+++ b/fish_speech/inference_engine/reference_loader.py@@ -1,4 +1,5 @@import io+import refrom hashlib import sha256from pathlib import Pathfrom typing import Callable, Literal, Tuple@@ -16,6 +17,8 @@ from fish_speech.utils.file import ()from fish_speech.utils.schema import ServeReferenceAudio+_ID_PATTERN = re.compile(r"^[a-zA-Z0-9\-_ ]+$")+class ReferenceLoader:def __init__(self) -> None:@@ -48,11 +51,21 @@ class ReferenceLoader:except (ImportError, ModuleNotFoundError):self.backend = "soundfile"+ @staticmethod+ def _validate_id(id: str) -> None:+ if not _ID_PATTERN.match(id) or len(id) > 255:+ raise ValueError(+ "Reference ID contains invalid characters or is too long. "+ "Only alphanumeric, hyphens, underscores, and spaces are allowed."+ )+def load_by_id(self,id: str,use_cache: Literal["on", "off"],) -> Tuple:+ self._validate_id(id)+# Load the references audio and text by idref_folder = Path("references") / idref_folder.mkdir(parents=True, exist_ok=True)@@ -189,18 +202,7 @@ class ReferenceLoader:FileNotFoundError: If the audio file doesn't existOSError: If file operations fail"""- # Validate ID format- import re-- if not re.match(r"^[a-zA-Z0-9\-_ ]+$", id):- raise ValueError(- "Reference ID contains invalid characters. Only alphanumeric, hyphens, underscores, and spaces are allowed."- )-- if len(id) > 255:- raise ValueError(- "Reference ID is too long. Maximum length is 255 characters."- )+ self._validate_id(id)# Check if reference already existsref_dir = Path("references") / id@@ -260,7 +262,8 @@ class ReferenceLoader:FileNotFoundError: If the reference ID doesn't existOSError: If file operations fail"""- # Check if reference exists+ self._validate_id(id)+ref_dir = Path("references") / idif not ref_dir.exists():raise FileNotFoundError(f"Reference ID '{id}' does not exist")diff --git a/tools/server/views.py b/tools/server/views.pyindex 2dc2824..7451646 100644--- a/tools/server/views.py+++ b/tools/server/views.py@@ -325,6 +325,10 @@ async def delete_reference(reference_id: str = Body(...)):if not reference_id or not reference_id.strip():raise ValueError("Reference ID cannot be empty")+ id_pattern = r"^[a-zA-Z0-9\-_ ]+$"+ if not re.match(id_pattern, reference_id) or len(reference_id) > 255:+ raise ValueError("Reference ID contains invalid characters or is too long")+# Get the model manager to access the reference loaderapp_state = request.app.statemodel_manager: ModelManager = app_state.model_manager@@ -395,6 +399,10 @@ async def update_reference(# Validate ID format per ReferenceLoader rulesid_pattern = r"^[a-zA-Z0-9\-_ ]+$"+ if not re.match(id_pattern, old_reference_id) or len(old_reference_id) > 255:+ raise ValueError(+ "Old reference ID contains invalid characters or is too long"+ )if not re.match(id_pattern, new_reference_id) or len(new_reference_id) > 255:raise ValueError("New reference ID contains invalid characters or is too long"