apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-04-26 17:26:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: centralize Electric SQL user credentials in configuration

Browse source 
- Added centralized configuration for Electric SQL user credentials in env.py.
- Updated migration script to utilize these credentials for creating and granting permissions to the Electric SQL user.
This commit is contained in:
Anish Sarkar 2026-01-15 03:03:34 +05:30
parent ee3a0a9ab7
commit e28be9d78c
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
surfsense_backend/alembic/env.py
View file

@ -25,6 +25,15 @@ database_url = os.getenv("DATABASE_URL")
if database_url: if database_url:
config.set_main_option("sqlalchemy.url", database_url) config.set_main_option("sqlalchemy.url", database_url)
# Electric SQL user credentials - centralized configuration for migrations
# These are used by migrations that set up Electric SQL replication
config.set_main_option(
"electric_db_user", os.getenv("ELECTRIC_DB_USER", "electric")
)
config.set_main_option(
"electric_db_password", os.getenv("ELECTRIC_DB_PASSWORD", "electric_password")
)
# Interpret the config file for Python logging. # Interpret the config file for Python logging.
# This line sets up loggers basically. # This line sets up loggers basically.
if config.config_file_name is not None: if config.config_file_name is not None:

27
surfsense_backend/alembic/versions/62_add_notifications_table.py
View file

@ -10,7 +10,12 @@ search_source_connectors, and documents tables.
from collections.abc import Sequence from collections.abc import Sequence
from alembic import op from alembic import context, op
# Get Electric SQL user credentials from env.py configuration
_config = context.config
ELECTRIC_DB_USER = _config.get_main_option("electric_db_user", "electric")
ELECTRIC_DB_PASSWORD = _config.get_main_option("electric_db_password", "electric_password")
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision: str = "62" revision: str = "62"
@ -51,11 +56,11 @@ def upgrade() -> None:
# Create Electric SQL replication user if not exists # Create Electric SQL replication user if not exists
op.execute( op.execute(
""" f"""
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS (SELECT FROM pg_user WHERE usename = 'electric') THEN IF NOT EXISTS (SELECT FROM pg_user WHERE usename = '{ELECTRIC_DB_USER}') THEN
CREATE USER electric WITH REPLICATION PASSWORD 'electric_password'; CREATE USER {ELECTRIC_DB_USER} WITH REPLICATION PASSWORD '{ELECTRIC_DB_PASSWORD}';
END IF; END IF;
END END
$$; $$;
@ -64,21 +69,21 @@ def upgrade() -> None:
# Grant necessary permissions to electric user # Grant necessary permissions to electric user
op.execute( op.execute(
""" f"""
DO $$ DO $$
DECLARE DECLARE
db_name TEXT := current_database(); db_name TEXT := current_database();
BEGIN BEGIN
EXECUTE format('GRANT CONNECT ON DATABASE %I TO electric', db_name); EXECUTE format('GRANT CONNECT ON DATABASE %I TO {ELECTRIC_DB_USER}', db_name);
END END
$$; $$;
""" """
) )
op.execute("GRANT USAGE ON SCHEMA public TO electric;") op.execute(f"GRANT USAGE ON SCHEMA public TO {ELECTRIC_DB_USER};")
op.execute("GRANT SELECT ON ALL TABLES IN SCHEMA public TO electric;") op.execute(f"GRANT SELECT ON ALL TABLES IN SCHEMA public TO {ELECTRIC_DB_USER};")
op.execute("GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO electric;") op.execute(f"GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO {ELECTRIC_DB_USER};")
op.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO electric;") op.execute(f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO {ELECTRIC_DB_USER};")
op.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON SEQUENCES TO electric;") op.execute(f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON SEQUENCES TO {ELECTRIC_DB_USER};")
# Create the publication if not exists # Create the publication if not exists
op.execute( op.execute(