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.

fix(dns): move DNS provider routes back to core

Juan Denis75a839f556d3
diff --git a/backend/app/__init__.py b/backend/app/__init__.py
index 044201ac..4542ba7b 100644
--- a/backend/app/__init__.py
+++ b/backend/app/__init__.py
@@ -378,6 +378,13 @@ def create_app(config_name=None):
# connection stay core (they back /domains); the extension borrows the single
# core CloudflareClient, never a duplicate.
+ # Register blueprints - DNS provider connections. Core (they back the
+ # Settings -> Connections DNS tiles and wildcard TLS), but kept at the
+ # historical /api/v1/email/dns-providers paths from before the email
+ # extraction so existing frontends keep working.
+ from app.api.dns_providers import dns_providers_bp
+ app.register_blueprint(dns_providers_bp, url_prefix='/api/v1/email')
+
# Register blueprints - Dynamic DNS
from app.api.ddns import ddns_bp
app.register_blueprint(ddns_bp, url_prefix='/api/v1/ddns')
diff --git a/backend/app/api/dns_providers.py b/backend/app/api/dns_providers.py
new file mode 100644
index 00000000..cdaf56c8
--- /dev/null
+++ b/backend/app/api/dns_providers.py
@@ -0,0 +1,64 @@
+"""DNS provider connections (Cloudflare, Route 53, DigitalOcean, GoDaddy).
+
+These routes back the Settings -> Connections DNS tiles and the wildcard-TLS
+flows, so they are core — a panel without the serverkit-email extension must
+still be able to connect a DNS provider. They keep the historical
+/api/v1/email/dns-providers paths (the routes originally lived in the email
+API before the extraction) so existing frontends keep working.
+"""
+from flask import Blueprint, request, jsonify
+
+from app.middleware.rbac import admin_required, viewer_required
+from app.services.dns_provider_service import DNSProviderService
+
+dns_providers_bp = Blueprint('dns_providers', __name__)
+
+
+@dns_providers_bp.route('/dns-providers', methods=['GET'])
+@viewer_required
+def list_dns_providers():
+ """List configured DNS providers."""
+ providers = DNSProviderService.list_providers()
+ return jsonify({'providers': providers}), 200
+
+
+@dns_providers_bp.route('/dns-providers', methods=['POST'])
+@admin_required
+def add_dns_provider():
+ """Add a DNS provider."""
+ data = request.get_json()
+ if not data or not data.get('name') or not data.get('provider') or not data.get('api_key'):
+ return jsonify({'success': False, 'error': 'Name, provider, and api_key are required'}), 400
+ result = DNSProviderService.add_provider(
+ name=data['name'],
+ provider=data['provider'],
+ api_key=data['api_key'],
+ api_secret=data.get('api_secret'),
+ api_email=data.get('api_email'),
+ is_default=data.get('is_default', False),
+ )
+ return jsonify(result), 201 if result.get('success') else 400
+
+
+@dns_providers_bp.route('/dns-providers/<int:provider_id>', methods=['DELETE'])
+@admin_required
+def remove_dns_provider(provider_id):
+ """Remove a DNS provider."""
+ result = DNSProviderService.remove_provider(provider_id)
+ return jsonify(result), 200 if result.get('success') else 400
+
+
+@dns_providers_bp.route('/dns-providers/<int:provider_id>/test', methods=['POST'])
+@admin_required
+def test_dns_provider(provider_id):
+ """Test DNS provider connection."""
+ result = DNSProviderService.test_connection(provider_id)
+ return jsonify(result), 200 if result.get('success') else 400
+
+
+@dns_providers_bp.route('/dns-providers/<int:provider_id>/zones', methods=['GET'])
+@viewer_required
+def list_dns_zones(provider_id):
+ """List DNS zones from a provider."""
+ result = DNSProviderService.list_zones(provider_id)
+ return jsonify(result), 200 if result.get('success') else 400
diff --git a/backend/tests/test_dns_providers_core.py b/backend/tests/test_dns_providers_core.py
new file mode 100644
index 00000000..57d40fb4
--- /dev/null
+++ b/backend/tests/test_dns_providers_core.py
@@ -0,0 +1,33 @@
+"""Proving tests: DNS provider connections are core, not extension-owned.
+
+The /api/v1/email/dns-providers routes used to live only in the serverkit-email
+extension, so a panel without it (email is gated to mail users) got a 404/405
+from the Settings -> Connections DNS tiles — surfaced as a bare "Request
+failed". These prove the routes exist in the core app with no plugins loaded.
+"""
+
+
+def test_list_dns_providers_without_email_extension(client, auth_headers):
+ resp = client.get('/api/v1/email/dns-providers', headers=auth_headers)
+ assert resp.status_code == 200
+ assert resp.get_json() == {'providers': []}
+
+
+def test_add_dns_provider_without_email_extension(client, auth_headers):
+ resp = client.post('/api/v1/email/dns-providers', headers=auth_headers, json={
+ 'name': 'cf', 'provider': 'cloudflare', 'api_key': 'tok',
+ })
+ assert resp.status_code == 201
+ body = resp.get_json()
+ assert body.get('success') is True
+
+ resp = client.get('/api/v1/email/dns-providers', headers=auth_headers)
+ providers = resp.get_json()['providers']
+ assert len(providers) == 1 and providers[0]['name'] == 'cf'
+
+
+def test_add_dns_provider_validates_payload(client, auth_headers):
+ resp = client.post('/api/v1/email/dns-providers', headers=auth_headers,
+ json={'name': 'cf'})
+ assert resp.status_code == 400
+ assert 'required' in resp.get_json()['error']
diff --git a/backend/tests/test_email_extraction.py b/backend/tests/test_email_extraction.py
index 2d4a3075..269ea303 100644
--- a/backend/tests/test_email_extraction.py
+++ b/backend/tests/test_email_extraction.py
@@ -17,9 +17,16 @@ _PKG = f'app.plugins.{SLUG}'
def test_core_has_no_email_routes(app):
- """The mail-server API is gone from core after extraction."""
+ """The mail-server API is gone from core after extraction.
+
+ Exception: /api/v1/email/dns-providers* stayed core (moved back after the
+ extraction broke the Connections DNS tiles on panels without the email
+ extension) — it keeps the historical path but is not mail-server API.
+ """
rules = [r.rule for r in app.url_map.iter_rules()]
- assert not any(r.startswith('/api/v1/email') for r in rules)
+ email_rules = [r for r in rules if r.startswith('/api/v1/email')]
+ assert all(r.startswith('/api/v1/email/dns-providers') for r in email_rules)
+ assert email_rules # the core DNS-provider routes themselves exist
@pytest.fixture
diff --git a/builtin-extensions/serverkit-email/backend/email.py b/builtin-extensions/serverkit-email/backend/email.py
index fb090e33..45afdf28 100644
--- a/builtin-extensions/serverkit-email/backend/email.py
+++ b/builtin-extensions/serverkit-email/backend/email.py
@@ -269,55 +269,9 @@ def delete_forwarding(rule_id):
# ── DNS Providers ──
-
-@email_bp.route('/dns-providers', methods=['GET'])
-@viewer_required
-def list_dns_providers():
- """List configured DNS providers."""
- providers = DNSProviderService.list_providers()
- return jsonify({'providers': providers}), 200
-
-
-@email_bp.route('/dns-providers', methods=['POST'])
-@admin_required
-def add_dns_provider():
- """Add a DNS provider."""
- data = request.get_json()
- if not data or not data.get('name') or not data.get('provider') or not data.get('api_key'):
- return jsonify({'success': False, 'error': 'Name, provider, and api_key are required'}), 400
- result = DNSProviderService.add_provider(
- name=data['name'],
- provider=data['provider'],
- api_key=data['api_key'],
- api_secret=data.get('api_secret'),
- api_email=data.get('api_email'),
- is_default=data.get('is_default', False),
- )
- return jsonify(result), 201 if result.get('success') else 400
-
-
-@email_bp.route('/dns-providers/<int:provider_id>', methods=['DELETE'])
-@admin_required
-def remove_dns_provider(provider_id):
- """Remove a DNS provider."""
- result = DNSProviderService.remove_provider(provider_id)
- return jsonify(result), 200 if result.get('success') else 400
-
-
-@email_bp.route('/dns-providers/<int:provider_id>/test', methods=['POST'])
-@admin_required
-def test_dns_provider(provider_id):
- """Test DNS provider connection."""
- result = DNSProviderService.test_connection(provider_id)
- return jsonify(result), 200 if result.get('success') else 400
-
-
-@email_bp.route('/dns-providers/<int:provider_id>/zones', methods=['GET'])
-@viewer_required
-def list_dns_zones(provider_id):
- """List DNS zones from a provider."""
- result = DNSProviderService.list_zones(provider_id)
- return jsonify(result), 200 if result.get('success') else 400
+# Moved to core (app/api/dns_providers.py, same /api/v1/email/dns-providers
+# paths): the Connections page and wildcard TLS need them without this
+# extension installed.
# ── Outbound SMTP Relay (smarthost) ──