apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-06-08 20:25:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: updated SearxNG connector migration and fixed validation for SearxNG host URL

Browse source
This commit is contained in:
DESKTOP-RTLN3BA\$punk 2025-10-13 13:57:58 -07:00
parent 08661e686c
commit 576dc19260
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
surfsense_backend/alembic/versions/26_add_searxng_connector_enum.py → surfsense_backend/alembic/versions/27_add_searxng_connector_enum.py
View file

@ -1,7 +1,7 @@
"""Add SearxNG connector enum value
Revision ID: 26
Revises: 25
Revision ID: 27
Revises: 26
Create Date: 2025-01-18 00:00:00.000000
"""
@ -11,8 +11,8 @@ from collections.abc import Sequence
from alembic import op
# revision identifiers, used by Alembic.
revision: str = "26"
down_revision: str | None = "25"
revision: str = "27"
down_revision: str | None = "26"
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
@ -39,4 +39,3 @@ def upgrade() -> None:
def downgrade() -> None:
"""Downgrade not supported for enum edits."""
pass

4
surfsense_backend/app/services/connector_service.py
View file

@ -432,7 +432,7 @@ class ConnectorService:
safesearch_clean = safesearch.strip()
if safesearch_clean.isdigit():
safesearch_value = int(safesearch_clean)
elif isinstance(safesearch, (int, float)):
elif isinstance(safesearch, int | float):
safesearch_value = int(safesearch)
if safesearch_value is not None and not (0 <= safesearch_value <= 2):
@ -444,7 +444,7 @@ class ConnectorService:
if isinstance(value, str):
value = value.strip()
return value or None
if isinstance(value, (list, tuple, set)):
if isinstance(value, list | tuple | set):
cleaned = [str(item).strip() for item in value if str(item).strip()]
return ",".join(cleaned) if cleaned else None
return str(value)

2
surfsense_backend/app/utils/validators.py
View file

@ -412,7 +412,7 @@ def validate_connector_config(
raise ValueError(f"Invalid email format for {connector_name} connector")
def validate_url_field(key: str, connector_name: str) -> None:
if not validators.url(config.get(key, "")):
if not validators.url(config.get(key, "").strip(), simple_host=True):
raise ValueError(f"Invalid base URL format for {connector_name} connector")
def validate_list_field(key: str, field_name: str) -> None: