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.

feat(extensions): Phase 5 — extract Cloudflare zone-ops into serverkit-cloudflare-ops

Juan Denis8dba586b0e6f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 045f47d3..ba73dad3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,17 @@ awaiting a stable release:
### Added
+- **Extensions platform (Phase 5 — Cloudflare zone-ops is now a bundled extension)** —
+ the Cloudflare per-zone control panel (zone settings, cache purge, WAF, Workers,
+ Tunnels, and R2/KV/D1 storage, reached from the "Open in Cloudflare" button on a
+ Cloudflare-managed domain) moved out of core into the **`serverkit-cloudflare-ops`**
+ extension. It ships installed by default (a flagship — zero nav footprint, and the
+ core Domains button depends on the route) and is uninstallable. Crucially, **DNS
+ records and the Cloudflare connection stay core** (they back `/domains`): the
+ extension borrows the single core Cloudflare API client rather than vendoring its
+ own, so there's exactly one client and no credential duplication. API paths are
+ unchanged (`/api/v1/cloudflare`, D9), and the `CloudflareWorker`/`CloudflareTunnel`
+ models stay core (they key off the shared DNS-provider connection).
- **Extensions platform (Phase 5 — WordPress is now a bundled extension)** — the
entire WordPress backend (site provisioning, plugin library, environments/
pipelines, updates, security, vulnerability scanning, analytics & reports, and
diff --git a/backend/app/__init__.py b/backend/app/__init__.py
index 6de54c4f..071667af 100644
--- a/backend/app/__init__.py
+++ b/backend/app/__init__.py
@@ -359,8 +359,12 @@ def create_app(config_name=None):
# Register blueprints - Cloudflare operations (zone settings/cache/WAF on top
# of the existing Cloudflare DNS connection)
- from app.api.cloudflare import cloudflare_bp
- app.register_blueprint(cloudflare_bp, url_prefix='/api/v1/cloudflare')
+ # Cloudflare zone-ops moved into the bundled, default-installed
+ # `serverkit-cloudflare-ops` extension (#36). Its blueprint (kept at
+ # /api/v1/cloudflare, D9) is registered from the extension by the plugin
+ # loader — seeded as a flagship in create_app. DNS records + the Cloudflare
+ # connection stay core (they back /domains); the extension borrows the single
+ # core CloudflareClient, never a duplicate.
# Register blueprints - Dynamic DNS
from app.api.ddns import ddns_bp
diff --git a/backend/app/services/cloudflare_ops_bridge.py b/backend/app/services/cloudflare_ops_bridge.py
new file mode 100644
index 00000000..48951250
--- /dev/null
+++ b/backend/app/services/cloudflare_ops_bridge.py
@@ -0,0 +1,50 @@
+"""Importlib bridge to the ``serverkit-cloudflare-ops`` extension backend.
+
+Cloudflare zone-ops (the ``/api/v1/cloudflare`` blueprint + ``CloudflareService``)
+moved into the bundled ``serverkit-cloudflare-ops`` extension, loaded as the dashed
+package ``app.plugins.serverkit-cloudflare-ops`` (see #36). Unlike WordPress, **no
+core code imports the zone-ops service** — its only caller is its own blueprint,
+which moved with it — so this bridge exists purely so tests (and any future core
+caller) can reach the extension's service by a dash-safe importlib path.
+
+The DNS layer stays core and is untouched: the moved ``CloudflareService`` still
+borrows the single core ``CloudflareClient`` via ``DNSZoneService._resolve_credential``
+(absolute ``app.services.*`` imports), so there is exactly one Cloudflare API client.
+"""
+import importlib
+
+SLUG = 'serverkit-cloudflare-ops'
+PKG = f'app.plugins.{SLUG}'
+
+
+def ensure_loadable():
+ """Make ``app.plugins.serverkit-cloudflare-ops`` importable, in-place if needed.
+
+ Delegates to the shared in-place loader in ``plugin_service`` (also used by the
+ flagship boot path). Returns ``True`` if the package is (now) importable.
+ """
+ from app.services.plugin_service import _ensure_builtin_backend_importable
+ return _ensure_builtin_backend_importable(SLUG)
+
+
+def load(module_name):
+ """Import a module from the extension backend (e.g. ``'cloudflare_service'``)."""
+ if ensure_loadable():
+ try:
+ return importlib.import_module(f'{PKG}.{module_name}')
+ except ImportError:
+ pass
+ # Two-speed fallback: the file may still live in core (pre-move).
+ return importlib.import_module(f'app.services.{module_name}')
+
+
+def get(module_name, attr):
+ return getattr(load(module_name), attr)
+
+
+def cloudflare_service():
+ return get('cloudflare_service', 'CloudflareService')
+
+
+def cloudflare_error():
+ return get('cloudflare_service', 'CloudflareError')
diff --git a/backend/app/services/plugin_service.py b/backend/app/services/plugin_service.py
index e06da30f..c343d348 100644
--- a/backend/app/services/plugin_service.py
+++ b/backend/app/services/plugin_service.py
@@ -62,7 +62,7 @@ BUILTIN_EXTENSIONS_DIR = os.environ.get(
# (handled one-shot in extension_migration), a flagship is seeded in-place — no
# file copy — its backend loads straight from builtin-extensions/ and its frontend
# is pre-bundled (D5). A user uninstall records a marker so it stays gone.
-FLAGSHIP_SLUGS = ['serverkit-wordpress']
+FLAGSHIP_SLUGS = ['serverkit-wordpress', 'serverkit-cloudflare-ops']
_FLAGSHIP_UNINSTALLED_KEY = 'extensions.flagship_uninstalled'
diff --git a/backend/tests/test_cloudflare_extraction.py b/backend/tests/test_cloudflare_extraction.py
new file mode 100644
index 00000000..584d4222
--- /dev/null
+++ b/backend/tests/test_cloudflare_extraction.py
@@ -0,0 +1,59 @@
+"""Prove the Cloudflare zone-ops extraction (Phase 5, #36).
+
+Zone-ops (the /api/v1/cloudflare blueprint + CloudflareService) physically moved
+into the bundled, default-installed serverkit-cloudflare-ops extension (a flagship,
+like WordPress). The DNS layer stays core: the moved service borrows the single
+core CloudflareClient via DNSZoneService — there is no duplicate Cloudflare client.
+"""
+import importlib
+
+import pytest
+
+from app.models.plugin import InstalledPlugin
+from app.services import cloudflare_ops_bridge
+
+SLUG = 'serverkit-cloudflare-ops'
+
+
+def test_cloudflare_service_left_core():
+ """The zone-ops service is gone from core after extraction."""
+ with pytest.raises(ModuleNotFoundError):
+ importlib.import_module('app.services.cloudflare_service')
+
+
+def test_dns_client_stays_core_single_source():
+ """The one Cloudflare API client remains core (no duplicate in the extension)."""
+ from app.services.dns import CloudflareClient
+ assert CloudflareClient.__module__ == 'app.services.dns.cloudflare'
+
+
+def test_bridge_resolves_service_from_extension():
+ CloudflareService = cloudflare_ops_bridge.cloudflare_service()
+ assert CloudflareService.__name__ == 'CloudflareService'
+ assert CloudflareService.__module__.startswith(f'app.plugins.{SLUG}')
+ # And it does not vendor its own client — it imports the core one lazily.
+ import inspect
+ src = inspect.getsource(CloudflareService)
+ assert 'from app.services.dns import CloudflareClient' in src
+ assert 'DNSZoneService._resolve_credential' in src
+
+
+def test_cloudflare_seeded_as_flagship(app):
+ plugin = InstalledPlugin.query.filter_by(slug=SLUG).first()
+ assert plugin is not None, 'Cloudflare zone-ops flagship should be seeded on boot'
+ assert plugin.status == InstalledPlugin.STATUS_ACTIVE
+ assert plugin.url_prefix == '/api/v1/cloudflare'
+
+
+def test_cloudflare_blueprint_registered_from_extension(app):
+ rules = [r.rule for r in app.url_map.iter_rules()]
+ assert any(r.startswith('/api/v1/cloudflare/zones') for r in rules), \
+ 'Cloudflare zone-ops API should be registered from the extension'
+
+
+def test_cloudflare_api_reachable_not_404(app, client, auth_headers):
+ """The extension blueprint is live (not 404) and the status guard passes for
+ the active flagship (not 503). It may 400/502 without a real CF zone — we only
+ assert the route is wired."""
+ resp = client.get('/api/v1/cloudflare/zones/1/settings', headers=auth_headers)
+ assert resp.status_code not in (404, 503), resp.status_code
diff --git a/backend/tests/test_cloudflare_zone_settings.py b/backend/tests/test_cloudflare_zone_settings.py
index 676891a2..b6dbad7e 100644
--- a/backend/tests/test_cloudflare_zone_settings.py
+++ b/backend/tests/test_cloudflare_zone_settings.py
@@ -96,20 +96,20 @@ def _make_cf_zone(domain='example.com', provider='cloudflare', zid='zoneABC', to
def test_service_rejects_non_cloudflare_zone(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone(provider='manual', token=None)
with pytest.raises(CloudflareError):
CloudflareService.get_settings(zone.id)
def test_service_rejects_missing_zone(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
with pytest.raises(CloudflareError):
CloudflareService.get_settings(99999)
def test_service_rejects_zone_without_provider_zone_id(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone(zid=None)
with pytest.raises(CloudflareError):
CloudflareService.get_settings(zone.id)
@@ -119,7 +119,7 @@ def test_service_rejects_zone_without_provider_zone_id(app):
def test_service_get_settings_indexes_by_id(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
monkeypatch.setattr(cf.requests, 'request',
lambda *a, **k: _Resp({'success': True, 'result': [
@@ -134,7 +134,7 @@ def test_service_get_settings_indexes_by_id(app, monkeypatch):
def test_service_update_setting_surfaces_provider_error(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
monkeypatch.setattr(cf.requests, 'request',
lambda *a, **k: _Resp({'success': False,
@@ -145,7 +145,7 @@ def test_service_update_setting_surfaces_provider_error(app, monkeypatch):
def test_service_apply_preset_reports_each(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
def capture(method, url, headers=None, json=None, params=None, timeout=None):
@@ -179,7 +179,7 @@ def test_client_purge_cache_posts_payload(monkeypatch):
def test_service_purge_everything(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
sent = {}
monkeypatch.setattr(cf.requests, 'request',
@@ -192,7 +192,7 @@ def test_service_purge_everything(app, monkeypatch):
def test_service_purge_files_caps_at_30(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
sent = {}
monkeypatch.setattr(cf.requests, 'request',
@@ -205,7 +205,7 @@ def test_service_purge_files_caps_at_30(app, monkeypatch):
def test_service_purge_nothing_raises(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.purge_cache(zone.id)
@@ -213,7 +213,7 @@ def test_service_purge_nothing_raises(app):
def test_service_purge_surfaces_provider_error(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
monkeypatch.setattr(cf.requests, 'request',
lambda *a, **k: _Resp({'success': False,
@@ -226,7 +226,7 @@ def test_service_purge_surfaces_provider_error(app, monkeypatch):
def test_waf_list_no_ruleset_is_empty(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
monkeypatch.setattr(cf.requests, 'request',
lambda method, url, **k:
@@ -240,7 +240,7 @@ def test_waf_list_no_ruleset_is_empty(app, monkeypatch):
def test_waf_list_surfaces_listing_error(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
monkeypatch.setattr(cf.requests, 'request',
lambda *a, **k: _Resp({'success': False,
@@ -251,7 +251,7 @@ def test_waf_list_surfaces_listing_error(app, monkeypatch):
def test_waf_list_with_ruleset(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
def stub(method, url, headers=None, json=None, params=None, timeout=None):
@@ -271,7 +271,7 @@ def test_waf_list_with_ruleset(app, monkeypatch):
def test_waf_add_creates_phase_ruleset_when_absent(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
seen = {}
@@ -291,7 +291,7 @@ def test_waf_add_creates_phase_ruleset_when_absent(app, monkeypatch):
def test_waf_add_posts_to_existing_ruleset(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
seen = {}
@@ -310,14 +310,14 @@ def test_waf_add_posts_to_existing_ruleset(app, monkeypatch):
def test_waf_add_rejects_bad_action(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.add_waf_rule(zone.id, description='d', expression='x', action='nuke')
def test_waf_preset_lock_requires_valid_ip(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.apply_waf_preset(zone.id, 'lock_wp_admin', {'ip': 'not-an-ip'})
@@ -325,7 +325,7 @@ def test_waf_preset_lock_requires_valid_ip(app):
def test_waf_preset_lock_builds_safe_expression(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
seen = {}
@@ -345,7 +345,7 @@ def test_waf_preset_lock_builds_safe_expression(app, monkeypatch):
def test_waf_update_validates_action(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.update_waf_rule(zone.id, 'rs1', 'r1', {'action': 'nuke'})
@@ -353,7 +353,7 @@ def test_waf_update_validates_action(app):
def test_waf_delete_calls_delete(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
deleted = {}
@@ -390,7 +390,7 @@ def test_upload_worker_module_is_multipart(monkeypatch):
def test_deploy_worker_validates_name(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.deploy_worker(zone.id, name='Bad Name!', code='x')
@@ -398,7 +398,7 @@ def test_deploy_worker_validates_name(app):
def test_deploy_worker_records_source(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
from app.models.cloudflare_worker import CloudflareWorker
zone = _make_cf_zone()
@@ -422,7 +422,7 @@ def test_deploy_worker_records_source(app, monkeypatch):
def test_list_workers_flags_managed(app, monkeypatch):
from app import db
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
from app.models.cloudflare_worker import CloudflareWorker
zone = _make_cf_zone()
db.session.add(CloudflareWorker(account_id='acct1', name='managed-one', source='x'))
@@ -452,7 +452,7 @@ def test_list_workers_flags_managed(app, monkeypatch):
def test_delete_worker_removes_local_row(app, monkeypatch):
from app import db
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
from app.models.cloudflare_worker import CloudflareWorker
zone = _make_cf_zone()
db.session.add(CloudflareWorker(account_id='acct1', name='gone', source='x'))
@@ -499,7 +499,7 @@ def test_client_create_tunnel_uses_cloudflare_config_src(monkeypatch):
def test_create_tunnel_requires_name(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.create_tunnel(zone.id, ' ')
@@ -507,7 +507,7 @@ def test_create_tunnel_requires_name(app):
def test_create_tunnel_stores_token_and_returns_install(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
from app.models.cloudflare_tunnel import CloudflareTunnel
from app.utils.crypto import decrypt_secret_safe
zone = _make_cf_zone()
@@ -533,7 +533,7 @@ def test_create_tunnel_stores_token_and_returns_install(app, monkeypatch):
def test_list_tunnels_flags_managed(app, monkeypatch):
from app import db
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
from app.models.cloudflare_tunnel import CloudflareTunnel
zone = _make_cf_zone()
db.session.add(CloudflareTunnel(tunnel_id='tun1', name='mine', account_id='acct1'))
@@ -558,7 +558,7 @@ def test_list_tunnels_flags_managed(app, monkeypatch):
def test_delete_tunnel_removes_local_row(app, monkeypatch):
from app import db
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
from app.models.cloudflare_tunnel import CloudflareTunnel
zone = _make_cf_zone()
db.session.add(CloudflareTunnel(tunnel_id='tun1', name='mine', account_id='acct1'))
@@ -579,7 +579,7 @@ def test_delete_tunnel_removes_local_row(app, monkeypatch):
def test_add_tunnel_hostname_sets_ingress_with_catchall(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
put_body = {}
@@ -610,7 +610,7 @@ def test_add_tunnel_hostname_sets_ingress_with_catchall(app, monkeypatch):
def test_list_storage_aggregates_and_reports_errors(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
def req(method, url, headers=None, json=None, params=None, timeout=None):
@@ -635,7 +635,7 @@ def test_list_storage_aggregates_and_reports_errors(app, monkeypatch):
def test_create_r2_bucket_validates_name(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.create_r2_bucket(zone.id, 'Bad_Bucket!')
@@ -643,7 +643,7 @@ def test_create_r2_bucket_validates_name(app):
def test_create_r2_bucket_creates(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
seen = {}
@@ -662,14 +662,14 @@ def test_create_r2_bucket_creates(app, monkeypatch):
def test_create_kv_namespace_requires_title(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.create_kv_namespace(zone.id, ' ')
def test_create_d1_database_requires_name(app):
- from app.services.cloudflare_service import CloudflareService, CloudflareError
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService, CloudflareError = _cfb.cloudflare_service(), _cfb.cloudflare_error()
zone = _make_cf_zone()
with pytest.raises(CloudflareError):
CloudflareService.create_d1_database(zone.id, '')
@@ -677,7 +677,7 @@ def test_create_d1_database_requires_name(app):
def test_delete_r2_bucket_calls_delete(app, monkeypatch):
from app.services.dns import cloudflare as cf
- from app.services.cloudflare_service import CloudflareService
+ from app.services import cloudflare_ops_bridge as _cfb; CloudflareService = _cfb.cloudflare_service()
zone = _make_cf_zone()
deleted = {}
diff --git a/builtin-extensions/serverkit-cloudflare-ops/backend/__init__.py b/builtin-extensions/serverkit-cloudflare-ops/backend/__init__.py
new file mode 100644
index 00000000..fe9ccee3
--- /dev/null
+++ b/builtin-extensions/serverkit-cloudflare-ops/backend/__init__.py
@@ -0,0 +1 @@
+"""ServerKit Cloudflare zone-ops extension backend package."""
diff --git a/backend/app/api/cloudflare.py b/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare.py
similarity index 99%
rename from backend/app/api/cloudflare.py
rename to builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare.py
index eb4d498e..225c172b 100644
--- a/backend/app/api/cloudflare.py
+++ b/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare.py
@@ -9,7 +9,7 @@ captured by the global audit fallback (method, route args, sanitized body).
from flask import Blueprint, request, jsonify
from flask_jwt_extended import jwt_required, get_jwt_identity
-from app.services.cloudflare_service import CloudflareService, CloudflareError
+from .cloudflare_service import CloudflareService, CloudflareError
cloudflare_bp = Blueprint('cloudflare', __name__)
diff --git a/backend/app/services/cloudflare_service.py b/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare_service.py
similarity index 100%
rename from backend/app/services/cloudflare_service.py
rename to builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare_service.py
diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/index.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/index.jsx
new file mode 100644
index 00000000..646da86b
--- /dev/null
+++ b/builtin-extensions/serverkit-cloudflare-ops/frontend/index.jsx
@@ -0,0 +1,22 @@
+// Cloudflare Zone Ops UI, contributed through the extension system. The zone-ops
+// backend (the /api/v1/cloudflare blueprint + CloudflareService) lives in this
+// extension's backend/; the page + panels + api client + SCSS stay in the host
+// tree and are re-used here (re-export pattern, same as serverkit-git/email/
+// wordpress) so their many relative imports keep resolving. DNS records and the
+// Cloudflare connection itself stay core (they back /domains) — this page only
+// adds the per-zone control panel, reached from the "Open in Cloudflare" button
+// on a Cloudflare-managed domain.
+//
+// After sync this file lives at frontend/src/plugins/serverkit-cloudflare-ops/ so
+// the relative import resolves against the host's pages directory.
+//
+// It's a single plain full-bleed route (cloudflare/zones/:zoneId, own PageTopbar
+// + internal Settings/WAF/Workers/Tunnels/Storage tabs), so no tab-group shell or
+// self-rendered sub-router is needed — unlike WordPress.
+import CloudflareZoneSettings from '../../pages/CloudflareZoneSettings';
+
+export function CloudflareZoneSettingsPage() {
+ return <CloudflareZoneSettings />;
+}
+
+export default CloudflareZoneSettingsPage;
diff --git a/builtin-extensions/serverkit-cloudflare-ops/plugin.json b/builtin-extensions/serverkit-cloudflare-ops/plugin.json
new file mode 100644
index 00000000..f0291973
--- /dev/null
+++ b/builtin-extensions/serverkit-cloudflare-ops/plugin.json
@@ -0,0 +1,23 @@
+{
+ "name": "serverkit-cloudflare-ops",
+ "display_name": "Cloudflare Zone Ops",
+ "version": "1.0.0",
+ "description": "Cloudflare zone operations on top of your existing Cloudflare DNS connection — zone settings, cache purge, WAF, Workers, Tunnels, and R2/KV/D1 storage. DNS records and the connection itself stay in the core Domains surface; this adds the per-zone control panel reached from a Cloudflare-managed domain.",
+ "author": "ServerKit",
+ "license": "MIT",
+ "category": "integration",
+ "homepage": "https://github.com/jhd3197/ServerKit",
+ "permissions": ["network"],
+ "min_panel_version": "1.7.0",
+ "entry_point": "cloudflare:cloudflare_bp",
+ "url_prefix": "/api/v1/cloudflare",
+ "icon": "<path d=\"M20 17.5a3.5 3.5 0 00-.5-6.96A5.5 5.5 0 008.6 9.6 4 4 0 007 17.5z\"/>",
+ "contributions": {
+ "routes": [
+ { "path": "cloudflare/zones/:zoneId", "component": "CloudflareZoneSettingsPage" }
+ ],
+ "page_titles": {
+ "/cloudflare/zones": "Cloudflare Zone"
+ }
+ }
+}
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 2a2fe5ef..401306f6 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -56,7 +56,6 @@ import Projects from './pages/Projects';
import ProjectDetail from './pages/ProjectDetail';
import SharedVariables from './pages/SharedVariables';
import FleetProxy from './pages/FleetProxy';
-import CloudflareZoneSettings from './pages/CloudflareZoneSettings';
import StatusPages from './pages/StatusPages';
import PublicStatusPage from './pages/PublicStatusPage';
import CloudProvision from './pages/CloudProvision';
@@ -336,9 +335,10 @@ function AppRoutes() {
keep the old paths working by redirecting. */}
<Route path="dns" element={<Navigate to="/domains" replace />} />
<Route path="dynamic-dns" element={<Navigate to="/domains" replace />} />
- {/* Cloudflare zone settings — a detail page reached from a
- Cloudflare-managed DNS zone (full-bleed, own top bar). */}
- <Route path="cloudflare/zones/:zoneId" element={<CloudflareZoneSettings />} />
+ {/* Cloudflare zone settings moved into the serverkit-cloudflare-ops
+ builtin extension (#36); it contributes the
+ cloudflare/zones/:zoneId route via its manifest. Reached from the
+ "Open in Cloudflare" button on a Cloudflare-managed domain. */}
<Route path="databases" element={<Databases />} />
<Route path="databases/:tab" element={<Databases />} />
<Route path="docker" element={<Docker />} />
diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/index.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/index.jsx
new file mode 100644
index 00000000..646da86b
--- /dev/null
+++ b/frontend/src/plugins/serverkit-cloudflare-ops/index.jsx
@@ -0,0 +1,22 @@
+// Cloudflare Zone Ops UI, contributed through the extension system. The zone-ops
+// backend (the /api/v1/cloudflare blueprint + CloudflareService) lives in this
+// extension's backend/; the page + panels + api client + SCSS stay in the host
+// tree and are re-used here (re-export pattern, same as serverkit-git/email/
+// wordpress) so their many relative imports keep resolving. DNS records and the
+// Cloudflare connection itself stay core (they back /domains) — this page only
+// adds the per-zone control panel, reached from the "Open in Cloudflare" button
+// on a Cloudflare-managed domain.
+//
+// After sync this file lives at frontend/src/plugins/serverkit-cloudflare-ops/ so
+// the relative import resolves against the host's pages directory.
+//
+// It's a single plain full-bleed route (cloudflare/zones/:zoneId, own PageTopbar
+// + internal Settings/WAF/Workers/Tunnels/Storage tabs), so no tab-group shell or
+// self-rendered sub-router is needed — unlike WordPress.
+import CloudflareZoneSettings from '../../pages/CloudflareZoneSettings';
+
+export function CloudflareZoneSettingsPage() {
+ return <CloudflareZoneSettings />;
+}
+
+export default CloudflareZoneSettingsPage;
diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/plugin.json b/frontend/src/plugins/serverkit-cloudflare-ops/plugin.json
new file mode 100644
index 00000000..e57e5d1a
--- /dev/null
+++ b/frontend/src/plugins/serverkit-cloudflare-ops/plugin.json
@@ -0,0 +1,28 @@
+{
+ "name": "serverkit-cloudflare-ops",
+ "display_name": "Cloudflare Zone Ops",
+ "version": "1.0.0",
+ "description": "Cloudflare zone operations on top of your existing Cloudflare DNS connection — zone settings, cache purge, WAF, Workers, Tunnels, and R2/KV/D1 storage. DNS records and the connection itself stay in the core Domains surface; this adds the per-zone control panel reached from a Cloudflare-managed domain.",
+ "author": "ServerKit",
+ "license": "MIT",
+ "category": "integration",
+ "homepage": "https://github.com/jhd3197/ServerKit",
+ "permissions": [
+ "network"
+ ],
+ "min_panel_version": "1.7.0",
+ "entry_point": "cloudflare:cloudflare_bp",
+ "url_prefix": "/api/v1/cloudflare",
+ "icon": "<path d=\"M20 17.5a3.5 3.5 0 00-.5-6.96A5.5 5.5 0 008.6 9.6 4 4 0 007 17.5z\"/>",
+ "contributions": {
+ "routes": [
+ {
+ "path": "cloudflare/zones/:zoneId",
+ "component": "CloudflareZoneSettingsPage"
+ }
+ ],
+ "page_titles": {
+ "/cloudflare/zones": "Cloudflare Zone"
+ }
+ }
+}