Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

test(seeds): one-door factories + persona headers + adoption ratchet (plan 77 G1/G2)

Juan Denis9b9aa34f01f7
diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py
index 73d8366d..49999869 100644
--- a/backend/tests/conftest.py
+++ b/backend/tests/conftest.py
@@ -276,19 +276,24 @@ def auth_headers(app):
return {'Authorization': f'Bearer {token}'}
-def _mk_scope_user(db, username, role='developer'):
- from app.models import User
- from werkzeug.security import generate_password_hash
- u = User(email=f'{username}@t.local', username=username,
- password_hash=generate_password_hash('x'), role=role, is_active=True)
- db.session.add(u)
- db.session.commit()
- return u
+# One-door test seeds (plan 77 G1): make_user/headers_for live in
+# tests/factories.py; import them from there in test modules. The persona
+# fixtures below cover the common "just give me a JWT of role X" case.
+from factories import make_user, headers_for # noqa: E402
-def _scope_token(user_id):
- from flask_jwt_extended import create_access_token
- return {'Authorization': f'Bearer {create_access_token(identity=user_id)}'}
+def developer_headers(app):
+ """JWT headers for a plain developer-role user."""
+ from app import db
+ return headers_for(make_user(db, role='developer'))
+
+
+def viewer_headers(app):
+ """JWT headers for a viewer-role user — the negative case for admin gates."""
+ from app import db
+ return headers_for(make_user(db, role='viewer'))
@pytest.fixture
@@ -315,11 +320,11 @@ def scoping_rbac(app):
from app.models import Application, Workspace
from app.services.workspace_service import WorkspaceService
- owner = _mk_scope_user(db, 'scope_owner')
- member = _mk_scope_user(db, 'scope_member')
- viewer = _mk_scope_user(db, 'scope_viewer')
- foreign = _mk_scope_user(db, 'scope_foreign')
- admin = _mk_scope_user(db, 'scope_admin', role='admin')
+ owner = make_user(db, 'scope_owner')
+ member = make_user(db, 'scope_member')
+ viewer = make_user(db, 'scope_viewer')
+ foreign = make_user(db, 'scope_foreign')
+ admin = make_user(db, 'scope_admin', role='admin')
ws = Workspace(name='scope-ws', slug='scope-ws', created_by=owner.id)
db.session.add(ws)
@@ -336,11 +341,11 @@ def scoping_rbac(app):
return SimpleNamespace(
app_id=a.id,
ws_id=ws.id,
- owner=_scope_token(owner.id),
- admin=_scope_token(admin.id),
- member=_scope_token(member.id),
- viewer=_scope_token(viewer.id),
- foreign=_scope_token(foreign.id),
+ owner=headers_for(owner),
+ admin=headers_for(admin),
+ member=headers_for(member),
+ viewer=headers_for(viewer),
+ foreign=headers_for(foreign),
)
diff --git a/backend/tests/factories.py b/backend/tests/factories.py
new file mode 100644
index 00000000..1239cd71
--- /dev/null
+++ b/backend/tests/factories.py
@@ -0,0 +1,93 @@
+"""One door for seeding test data (plan 77 G1/G2).
+
+Every test that needs a user/JWT/application/server/workspace mints it here,
+so a schema change lands once instead of being absorbed by dozens of
+hand-rolled seed blocks. All makers take ``**overrides`` — pass exactly what
+the test cares about and let the defaults absorb everything else.
+
+Usage (tests import these as top-level modules, like subprocess_stub):
+
+ from factories import make_user, headers_for, make_application
+
+ user = make_user(db, 'alice', role='viewer')
+ resp = client.get('/api/v1/apps', headers=headers_for(user))
+"""
+import uuid
+
+
+def _uid():
+ return uuid.uuid4().hex[:8]
+
+
+def make_user(db, username=None, role='developer', password='x', **overrides):
+ """Create + commit a User. Unique username derived when omitted."""
+ from app.models import User
+ from werkzeug.security import generate_password_hash
+ if username is None:
+ username = f'u{_uid()}'
+ fields = dict(
+ email=f'{username}@t.local',
+ username=username,
+ password_hash=generate_password_hash(password),
+ role=role,
+ is_active=True,
+ )
+ fields.update(overrides)
+ user = User(**fields)
+ db.session.add(user)
+ db.session.commit()
+ return user
+
+
+def headers_for(user):
+ """JWT auth headers for a User row (or a raw user id)."""
+ from flask_jwt_extended import create_access_token
+ user_id = getattr(user, 'id', user)
+ return {'Authorization': f'Bearer {create_access_token(identity=user_id)}'}
+
+
+def make_workspace(db, name='ws', created_by=None, **overrides):
+ """Create + commit a Workspace; seeds an owner user when none is given."""
+ from app.models import Workspace
+ if created_by is None:
+ created_by = make_user(db).id
+ fields = dict(name=name, slug=overrides.pop('slug', name), created_by=created_by)
+ fields.update(overrides)
+ ws = Workspace(**fields)
+ db.session.add(ws)
+ db.session.commit()
+ return ws
+
+
+def make_application(db, **overrides):
+ """Create + commit an Application (docker-shaped defaults, the seed block
+ formerly copy-pasted as ``_seed_app`` across suites). Seeds an owning
+ admin user when ``user_id`` is not supplied."""
+ from app.models import Application
+ fields = dict(
+ name='web',
+ app_type='docker',
+ source='manual',
+ root_path='/tmp/web',
+ compose_file='docker-compose.yml',
+ docker_image='nginx:latest',
+ )
+ fields.update(overrides)
+ if 'user_id' not in fields:
+ from app.models import User
+ fields['user_id'] = make_user(db, role=User.ROLE_ADMIN).id
+ row = Application(**fields)
+ db.session.add(row)
+ db.session.commit()
+ return row
+
+
+def make_server(db, name='box1', **overrides):
+ """Create + commit a Server row."""
+ from app.models.server import Server
+ fields = dict(name=name)
+ fields.update(overrides)
+ row = Server(**fields)
+ db.session.add(row)
+ db.session.commit()
+ return row
diff --git a/backend/tests/test_container_scale.py b/backend/tests/test_container_scale.py
index 20cfc644..0f037850 100644
--- a/backend/tests/test_container_scale.py
+++ b/backend/tests/test_container_scale.py
@@ -4,24 +4,13 @@ from datetime import datetime
from app import db
from app.models import Application
+from factories import make_application
from app.models.container_scale_policy import ContainerScalePolicy
from app.services.container_scale_service import ContainerScaleService
def _seed_app(**kw):
- from app.models import User
- uid = uuid.uuid4().hex[:8]
- user = User(email=f'{uid}@t.local', username=f'u{uid}',
- password_hash='x', role=User.ROLE_ADMIN, is_active=True)
- db.session.add(user)
- db.session.commit()
- defaults = dict(name='web', app_type='docker', source='manual', root_path='/tmp/web',
- compose_file='docker-compose.yml', docker_image='nginx:latest', user_id=user.id)
- defaults.update(kw)
- row = Application(**defaults)
- db.session.add(row)
- db.session.commit()
- return row
+ return make_application(db, **kw)
def _set_current(app_id, n):
diff --git a/backend/tests/test_container_sleep.py b/backend/tests/test_container_sleep.py
index 7d0a2307..e87bb4ed 100644
--- a/backend/tests/test_container_sleep.py
+++ b/backend/tests/test_container_sleep.py
@@ -4,25 +4,14 @@ from datetime import datetime, timedelta
from app import db
from app.models import Application
+from factories import make_application
from app.models.container_sleep_policy import ContainerSleepPolicy
from app.services.docker_service import DockerService
from app.services.container_sleep_service import ContainerSleepService
def _seed_app(**kw):
- from app.models import User
- uid = uuid.uuid4().hex[:8]
- user = User(email=f'{uid}@t.local', username=f'u{uid}',
- password_hash='x', role=User.ROLE_ADMIN, is_active=True)
- db.session.add(user)
- db.session.commit()
- defaults = dict(name='web', app_type='docker', source='manual', root_path='/tmp/web',
- compose_file='docker-compose.yml', docker_image='nginx:latest', user_id=user.id)
- defaults.update(kw)
- row = Application(**defaults)
- db.session.add(row)
- db.session.commit()
- return row
+ return make_application(db, **kw)
def _mock_docker(monkeypatch, ok=True):
diff --git a/backend/tests/test_fleet_doctor.py b/backend/tests/test_fleet_doctor.py
index 35354b76..4388b3c1 100644
--- a/backend/tests/test_fleet_doctor.py
+++ b/backend/tests/test_fleet_doctor.py
@@ -16,11 +16,8 @@ registry = agent_registry_mod.agent_registry
@pytest.fixture
def server(app):
from app import db
- from app.models.server import Server
- row = Server(name='box1', hostname='box', ip_address='203.0.113.10')
- db.session.add(row)
- db.session.commit()
- return row
+ from factories import make_server
+ return make_server(db, hostname='box', ip_address='203.0.113.10')
def by_key(rows):
diff --git a/backend/tests/test_fleet_doctor_api.py b/backend/tests/test_fleet_doctor_api.py
index 5ba79154..354edd55 100644
--- a/backend/tests/test_fleet_doctor_api.py
+++ b/backend/tests/test_fleet_doctor_api.py
@@ -23,11 +23,8 @@ registry = agent_registry_mod.agent_registry
@pytest.fixture
def server(app):
from app import db
- from app.models.server import Server
- row = Server(name='box1', hostname='box', ip_address='203.0.113.10')
- db.session.add(row)
- db.session.commit()
- return row
+ from factories import make_server
+ return make_server(db, hostname='box', ip_address='203.0.113.10')
@pytest.fixture
diff --git a/backend/tests/test_fleet_repair.py b/backend/tests/test_fleet_repair.py
index 8821202e..18de575a 100644
--- a/backend/tests/test_fleet_repair.py
+++ b/backend/tests/test_fleet_repair.py
@@ -16,11 +16,8 @@ registry = agent_registry_mod.agent_registry
@pytest.fixture
def server(app):
from app import db
- from app.models.server import Server
- row = Server(name='box1')
- db.session.add(row)
- db.session.commit()
- return row
+ from factories import make_server
+ return make_server(db)
def _connect(monkeypatch, *, connected=True, capable=True, send=None):
diff --git a/backend/tests/test_image_update.py b/backend/tests/test_image_update.py
index d1eefd30..1d2a4887 100644
--- a/backend/tests/test_image_update.py
+++ b/backend/tests/test_image_update.py
@@ -6,20 +6,11 @@ from app import db
from app.models import Application
from app.services.docker_service import DockerService
from app.services.image_update_service import ImageUpdateService
+from factories import make_application
def _seed_app(image='nginx:latest'):
- from app.models import User
- uid = uuid.uuid4().hex[:8]
- user = User(email=f'{uid}@t.local', username=f'u{uid}',
- password_hash='x', role=User.ROLE_ADMIN, is_active=True)
- db.session.add(user)
- db.session.commit()
- row = Application(name='web', app_type='docker', source='manual',
- docker_image=image, user_id=user.id)
- db.session.add(row)
- db.session.commit()
- return row
+ return make_application(db, docker_image=image)
class TestImageUpdateService:
diff --git a/backend/tests/test_seed_one_door_ratchet.py b/backend/tests/test_seed_one_door_ratchet.py
new file mode 100644
index 00000000..04dd9484
--- /dev/null
+++ b/backend/tests/test_seed_one_door_ratchet.py
@@ -0,0 +1,162 @@
+"""Plan 77 G1/G2 ratchet — new test files seed through tests/factories.py.
+
+Two frozen populations (2026-08-19). Files in them predate the one-door seed
+helpers; new test files must use ``headers_for``/``make_user`` instead of
+minting JWTs with create_access_token, and ``make_application`` instead of
+constructing Application(...) by hand. Shrinking a list is progress — delete
+the entry when you migrate a file.
+"""
+import re
+from pathlib import Path
+
+TESTS = Path(__file__).resolve().parent
+
+JWT_BASELINE = {
+ 'test_activity_summary_rollup.py',
+ 'test_agent_update_authz.py',
+ 'test_ai_assistant.py',
+ 'test_api_authz_hardening.py',
+ 'test_audit_log.py',
+ 'test_container_registry.py',
+ 'test_dashboards.py',
+ 'test_database_engine_extensions.py',
+ 'test_database_engines.py',
+ 'test_db_admin_sso.py',
+ 'test_db_processes.py',
+ 'test_dns_aaaa_conflict.py',
+ 'test_dns_cutover_api.py',
+ 'test_dns_cutover_providers.py',
+ 'test_drift_doctor.py',
+ 'test_enhancements_integration.py',
+ 'test_error_logs.py',
+ 'test_event_subscriptions.py',
+ 'test_extension_pending_requirements.py',
+ 'test_extension_permission_observation.py',
+ 'test_files_rbac.py',
+ 'test_fleet_doctor_api.py',
+ 'test_login_links.py',
+ 'test_managed_database.py',
+ 'test_managed_db_users.py',
+ 'test_metadata_guard.py',
+ 'test_pairing_authz.py',
+ 'test_plugin_search_sdk.py',
+ 'test_resource_grants.py',
+ 'test_search.py',
+ 'test_secrets_webhooks_authz.py',
+ 'test_server_capacity.py',
+ 'test_serverkit_gui_agent_gate.py',
+ 'test_setup_nag.py',
+ 'test_setup_security.py',
+ 'test_shared_resources.py',
+ 'test_site_import.py',
+ 'test_ssl_acme_contact.py',
+ 'test_status_extraction.py',
+ 'test_support_bundle.py',
+ 'test_theme_registry.py',
+ 'test_themes.py',
+ 'test_views.py',
+ 'test_workspace_scope.py',
+}
+
+APPLICATION_BASELINE = {
+ 'test_api_authz_hardening.py',
+ 'test_api_key_identity.py',
+ 'test_app_deploy_jobs.py',
+ 'test_app_resource_limits.py',
+ 'test_app_volumes.py',
+ 'test_application_soft_delete.py',
+ 'test_attach_domain.py',
+ 'test_backup_drill_scheduling.py',
+ 'test_bandwidth.py',
+ 'test_compose_env_overlay.py',
+ 'test_config_snapshots.py',
+ 'test_container_registry.py',
+ 'test_container_status_bulk.py',
+ 'test_database_engine_extensions.py',
+ 'test_database_engines.py',
+ 'test_deploy_console.py',
+ 'test_deploy_preflight.py',
+ 'test_deployments_unified.py',
+ 'test_dns_aaaa_conflict.py',
+ 'test_dns_give_subdomain.py',
+ 'test_doctor_dns.py',
+ 'test_domain_attach_service.py',
+ 'test_domain_vhost_ssl.py',
+ 'test_drift_doctor.py',
+ 'test_effective_env.py',
+ 'test_enhancements_integration.py',
+ 'test_file_integrity.py',
+ 'test_fleet_proxy.py',
+ 'test_image_update.py',
+ 'test_ingress_plane.py',
+ 'test_install_retry_after_failure.py',
+ 'test_malware_scan_job.py',
+ 'test_manifest_appliance_hardening.py',
+ 'test_manifest_appliance_volumes_bootstrap.py',
+ 'test_manifest_network_identity.py',
+ 'test_manifest_persistence.py',
+ 'test_manifest_reach.py',
+ 'test_manifest_references.py',
+ 'test_manifest_spec.py',
+ 'test_manifest_sync.py',
+ 'test_member_actions.py',
+ 'test_micro_cache.py',
+ 'test_monitor_service.py',
+ 'test_per_app_read_scoping.py',
+ 'test_plugin_search_sdk.py',
+ 'test_previews.py',
+ 'test_probe_honesty_doctor.py',
+ 'test_probe_honesty_ssl.py',
+ 'test_projects.py',
+ 'test_query_layer.py',
+ 'test_recycle_bin.py',
+ 'test_resource_grants.py',
+ 'test_search.py',
+ 'test_security_scan_jobs.py',
+ 'test_setup_preflight.py',
+ 'test_setup_reconcile.py',
+ 'test_shared_queue_authz.py',
+ 'test_site_base_domains.py',
+ 'test_site_routing.py',
+ 'test_sites_https.py',
+ 'test_soft_delete_leaks.py',
+ 'test_ssl_acme_contact.py',
+ 'test_url_swap.py',
+ 'test_workspace_scope.py',
+ 'test_wp_hook_inversions.py',
+}
+
+
+def _files_matching(pattern):
+ found = set()
+ for f in sorted(TESTS.glob('test_*.py')):
+ if f.name == Path(__file__).name:
+ continue
+ if re.search(pattern, f.read_text(encoding='utf-8', errors='replace')):
+ found.add(f.name)
+ return found
+
+
+def test_no_new_hand_minted_jwt_headers():
+ found = _files_matching(r'create_access_token\(')
+ new = found - JWT_BASELINE
+ assert not new, (
+ f"New test files minting their own JWTs: {sorted(new)}. "
+ "Use headers_for(make_user(db, ...)) from tests/factories.py "
+ "or the viewer_headers/developer_headers/auth_headers fixtures."
+ )
+
+
+def test_no_new_hand_rolled_application_seeds():
+ found = _files_matching(r'\bApplication\(')
+ new = found - APPLICATION_BASELINE
+ assert not new, (
+ f"New test files constructing Application(...) directly: {sorted(new)}. "
+ "Use make_application(db, ...) from tests/factories.py."
+ )
+
+
+def test_baselines_do_not_go_stale():
+ stale = (JWT_BASELINE - _files_matching(r'create_access_token\(')) | (
+ APPLICATION_BASELINE - _files_matching(r'\bApplication\('))
+ assert not stale, f"Migrated files still listed in a baseline: {sorted(stale)} — delete them."
diff --git a/backend/tests/test_waf.py b/backend/tests/test_waf.py
index cea5f5bc..bf52e814 100644
--- a/backend/tests/test_waf.py
+++ b/backend/tests/test_waf.py
@@ -8,21 +8,11 @@ from app import db
from app.models import Application
from app.models.waf_policy import WafPolicy
from app.services.waf_service import WafService
+from factories import make_application
def _seed_app(name='web'):
- """Create a user + Application like other backend tests do."""
- from app.models import User
- uid = uuid.uuid4().hex[:8]
- user = User(email=f'{uid}@t.local', username=f'u{uid}',
- password_hash='x', role=User.ROLE_ADMIN, is_active=True)
- db.session.add(user)
- db.session.commit()
- row = Application(name=name, app_type='docker', source='manual',
- docker_image='nginx:latest', user_id=user.id)
- db.session.add(row)
- db.session.commit()
- return row
+ return make_application(db, name=name)
# ---------------------------------------------------------------------------