fix(security): add ssrfWhitelist config to unblock Tailscale/CGNAT (#2669)
This commit is contained in:
@@ -37,17 +37,27 @@ def load_config(config_path: Path | None = None) -> Config:
|
||||
"""
|
||||
path = config_path or get_config_path()
|
||||
|
||||
config = Config()
|
||||
if path.exists():
|
||||
try:
|
||||
with open(path, encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
data = _migrate_config(data)
|
||||
return Config.model_validate(data)
|
||||
config = Config.model_validate(data)
|
||||
except (json.JSONDecodeError, ValueError, pydantic.ValidationError) as e:
|
||||
logger.warning(f"Failed to load config from {path}: {e}")
|
||||
logger.warning("Using default configuration.")
|
||||
|
||||
return Config()
|
||||
_apply_ssrf_whitelist(config)
|
||||
return config
|
||||
|
||||
|
||||
def _apply_ssrf_whitelist(config: Config) -> None:
|
||||
"""Apply SSRF whitelist from config to the network security module."""
|
||||
if config.tools.ssrf_whitelist:
|
||||
from nanobot.security.network import configure_ssrf_whitelist
|
||||
|
||||
configure_ssrf_whitelist(config.tools.ssrf_whitelist)
|
||||
|
||||
|
||||
def save_config(config: Config, config_path: Path | None = None) -> None:
|
||||
|
||||
@@ -192,6 +192,7 @@ class ToolsConfig(Base):
|
||||
exec: ExecToolConfig = Field(default_factory=ExecToolConfig)
|
||||
restrict_to_workspace: bool = False # If true, restrict all tool access to workspace directory
|
||||
mcp_servers: dict[str, MCPServerConfig] = Field(default_factory=dict)
|
||||
ssrf_whitelist: list[str] = Field(default_factory=list) # CIDR ranges to exempt from SSRF blocking (e.g. ["100.64.0.0/10"] for Tailscale)
|
||||
|
||||
|
||||
class Config(BaseSettings):
|
||||
|
||||
Reference in New Issue
Block a user