Merge pull request #731 from lfnovo/fix/surrealdb-injection

fix: prevent SurrealDB injection via unsanitized query parameters

CHANGELOG.md

@@ -7,13 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.8.3] - 2026-04-07
+
+### Security
+- Fix SurrealDB injection via unsanitized `order_by` query parameter in `GET /api/notebooks` (CVSS 8.7 High)
+- Add allowlist validation for sorting parameters in notebooks endpoint
+- Replace f-string query interpolation with parameterized `$variable` binding in source chat and migration queries
+- Add defensive validation in `get_all()` base method to prevent injection via `order_by` parameter
+
 ## [1.8.2] - 2026-04-06
 
 ### Added
-- DashScope (Qwen) provider support — Alibaba Cloud's Qwen models (qwen-turbo, qwen-plus, qwen-max)
-- MiniMax provider support — MiniMax models with 204K context (MiniMax-M2.5, MiniMax-M2.5-highspeed)
-- Model discovery, connection testing, and credential management for both new providers
-- Documentation for DashScope and MiniMax in AI providers guide, environment reference, and provider comparison
+- DashScope (Qwen) and MiniMax provider support via Esperanto v2.20.0 (#725)
+- Source list auto-refresh after adding a new source via URL, file upload, or text (#721)
+
+### Fixed
+- Source asset persistence — failed sources now persist their asset (URL/file path), making them identifiable and retryable (#722)
+- Source title preservation — user-set custom titles are no longer overwritten after background processing (#722)
+- Credential cascade delete — deleting a credential now removes linked models instead of returning a 409 error (#722)
+- Podcast directory names — uses UUID for episode directories, fixing filesystem errors with special characters (#666)
+- Tiktoken offline handling — API no longer crashes in air-gapped environments (#622)
+- SurrealDB healthcheck — removed incompatible healthcheck from Docker Compose (#656)
+- Esperanto embedding fixes — base_url/api_key config issues across multiple embedding providers (#664, #665)
+
+### Docs
+- Deprecated single-container Docker image in favor of Docker Compose (#723)
 
 ### Dependencies
 - Bump esperanto to >=2.20.0

api/routers/notebooks.py

@@ -24,13 +24,38 @@ async def get_notebooks(
 ):
     """Get all notebooks with optional filtering and ordering."""
     try:
+        # Validate order_by against allowlist to prevent SurrealQL injection
+        allowed_fields = {"name", "created", "updated"}
+        allowed_directions = {"asc", "desc"}
+
+        parts = order_by.strip().lower().split()
+        if len(parts) == 1:
+            if parts[0] not in allowed_fields:
+                raise HTTPException(
+                    status_code=400,
+                    detail=f"Invalid order_by field: '{order_by}'. Allowed fields: {', '.join(sorted(allowed_fields))}",
+                )
+            validated_order_by = parts[0]
+        elif len(parts) == 2:
+            if parts[0] not in allowed_fields or parts[1] not in allowed_directions:
+                raise HTTPException(
+                    status_code=400,
+                    detail=f"Invalid order_by: '{order_by}'. Allowed fields: {', '.join(sorted(allowed_fields))}. Allowed directions: asc, desc",
+                )
+            validated_order_by = f"{parts[0]} {parts[1]}"
+        else:
+            raise HTTPException(
+                status_code=400,
+                detail=f"Invalid order_by format: '{order_by}'. Expected 'field' or 'field direction'",
+            )
+
         # Build the query with counts
         query = f"""
             SELECT *,
             count(<-reference.in) as source_count,
             count(<-artifact.in) as note_count
             FROM notebook
-            ORDER BY {order_by}
+            ORDER BY {validated_order_by}
         """
 
         result = await repo_query(query)
@@ -52,6 +77,8 @@ async def get_notebooks(
             )
             for nb in result
         ]
+    except HTTPException:
+        raise
     except Exception as e:
         logger.error(f"Error fetching notebooks: {str(e)}")
         raise HTTPException(

api/routers/source_chat.py

@@ -155,7 +155,9 @@ async def get_source_chat_sessions(source_id: str = Path(..., description="Sourc
             if session_id_raw:
                 session_id = str(session_id_raw)
 
-                session_result = await repo_query(f"SELECT * FROM {session_id_raw}")
+                session_result = await repo_query(
+                    "SELECT * FROM $id", {"id": ensure_record_id(session_id)}
+                )
                 if session_result and len(session_result) > 0:
                     session_data = session_result[0]
 

open_notebook/database/async_migrate.py

@@ -223,7 +223,8 @@ async def bump_version() -> None:
     new_version = current_version + 1
 
     await repo_query(
-        f"CREATE _sbl_migrations:{new_version} SET version = {new_version}, applied_at = time::now();",
+        "CREATE type::thing('_sbl_migrations', $version) SET version = $version, applied_at = time::now();",
+        {"version": new_version},
     )
 
 
@@ -231,4 +232,7 @@ async def lower_version() -> None:
     """Lower the version by removing the latest entry from migrations table."""
     current_version = await get_latest_version()
     if current_version > 0:
-        await repo_query(f"DELETE _sbl_migrations:{current_version};")
+        await repo_query(
+            "DELETE type::thing('_sbl_migrations', $version);",
+            {"version": current_version},
+        )

open_notebook/domain/base.py

@@ -48,7 +48,40 @@ class ObjectModel(BaseModel):
                     "get_all() must be called from a specific model class"
                 )
             if order_by:
-                query = f"SELECT * FROM {table_name} ORDER BY {order_by}"
+                # Validate order_by to prevent SurrealQL injection
+                # Supports: "field", "field direction", "field1 direction, field2 direction"
+                import re
+
+                allowed_field_pattern = re.compile(r"^[a-z_][a-z0-9_]*$")
+                allowed_directions = {"asc", "desc"}
+
+                clauses = [c.strip() for c in order_by.split(",")]
+                validated_clauses = []
+                for clause in clauses:
+                    parts = clause.strip().split()
+                    if len(parts) == 1:
+                        if not allowed_field_pattern.match(parts[0].lower()):
+                            raise InvalidInputError(
+                                f"Invalid order_by field: '{parts[0]}'"
+                            )
+                        validated_clauses.append(parts[0].lower())
+                    elif len(parts) == 2:
+                        if not allowed_field_pattern.match(
+                            parts[0].lower()
+                        ) or parts[1].lower() not in allowed_directions:
+                            raise InvalidInputError(
+                                f"Invalid order_by clause: '{clause.strip()}'"
+                            )
+                        validated_clauses.append(
+                            f"{parts[0].lower()} {parts[1].lower()}"
+                        )
+                    else:
+                        raise InvalidInputError(
+                            f"Invalid order_by clause: '{clause.strip()}'"
+                        )
+
+                validated_order_by = ", ".join(validated_clauses)
+                query = f"SELECT * FROM {table_name} ORDER BY {validated_order_by}"
             else:
                 query = f"SELECT * FROM {table_name}"
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-notebook"
-version = "1.8.2"
+version = "1.8.3"
 description = "An open source implementation of a research assistant, inspired by Google Notebook LM"
 authors = [
     {name = "Luis Novo", email = "lfnovo@gmail.com"}

uv.lock

@@ -2072,7 +2072,7 @@ wheels = [
 
 [[package]]
 name = "open-notebook"
-version = "1.8.1"
+version = "1.8.3"
 source = { editable = "." }
 dependencies = [
     { name = "ai-prompter" },