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(dns): per-base-domain subdomain modes — wildcard vs per-site (Phase 3)

Juan Denise0e6312c4f52
diff --git a/backend/app/services/site_domain_service.py b/backend/app/services/site_domain_service.py
index d9a41a81..c5759543 100644
--- a/backend/app/services/site_domain_service.py
+++ b/backend/app/services/site_domain_service.py
@@ -108,3 +108,33 @@ class SiteDomainService:
managed subdomains to HTTPS."""
scheme = 'https' if ssl else 'http'
return f'{scheme}://{host}'
+
+ @classmethod
+ def dns_mode(cls):
+ """How managed-site subdomains get their DNS:
+
+ * ``wildcard`` (default) — one ``*.<base_domain>`` record covers every site,
+ so a new site needs no per-site DNS work, and
+ * ``per-site`` — each site gets its own A record, auto-created via a
+ connected provider, so every site is an explicit, visible record.
+ """
+ val = (SystemSettings.get('sites_dns_mode') or '').strip().lower()
+ return val if val in ('wildcard', 'per-site') else 'wildcard'
+
+ @classmethod
+ def ensure_site_dns(cls, host):
+ """Auto-create a managed site's A record when in ``per-site`` mode (via a
+ connected provider, ownership-guarded + logged). In ``wildcard`` mode this is
+ a no-op — the single ``*.<base>`` record already covers ``host``. Never raises;
+ returns the provider result (or a ``skipped``/``no_server_ip`` descriptor)."""
+ if not host or cls.dns_mode() != 'per-site':
+ return {'created': False, 'skipped': True, 'reason': 'wildcard'}
+ ip = cls.server_ip()
+ if not ip:
+ return {'created': False, 'reason': 'no_server_ip',
+ 'message': f'Set the server public IP to auto-create the {host} A record.'}
+ try:
+ from app.services.dns_provider_service import DNSProviderService
+ return DNSProviderService.ensure_a_record(host, ip)
+ except Exception as e:
+ return {'created': False, 'reason': 'error', 'error': str(e)}
diff --git a/backend/app/services/sites_https_service.py b/backend/app/services/sites_https_service.py
index 16f3874e..bf15320c 100644
--- a/backend/app/services/sites_https_service.py
+++ b/backend/app/services/sites_https_service.py
@@ -22,6 +22,7 @@ class SitesHttpsService:
'base_domain': SiteDomainService.base_domain(),
'server_ip': SiteDomainService.server_ip(),
'https_enabled': SiteDomainService.https_enabled(),
+ 'dns_mode': SiteDomainService.dns_mode(),
'providers': DNSProviderService.list_providers(),
}
@@ -63,6 +64,8 @@ class SitesHttpsService:
'dns': dns, 'ssl': cert, 'warning': '; '.join(warnings) if warnings else None}
SettingsService.set('sites_https_enabled', True)
+ # The wildcard record now covers every subdomain, so wildcard is the mode.
+ SettingsService.set('sites_dns_mode', 'wildcard')
return {'success': True, 'base_domain': base, 'https_enabled': True,
'dns': dns, 'ssl': cert, 'cert_path': cert.get('certificate_path'),
diff --git a/backend/app/services/wordpress_service.py b/backend/app/services/wordpress_service.py
index 5032ecf1..75651f7b 100644
--- a/backend/app/services/wordpress_service.py
+++ b/backend/app/services/wordpress_service.py
@@ -2104,6 +2104,7 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]
"""
from app import db
from app.models.domain import Domain
+ from app.services.site_domain_service import SiteDomainService
if not site_host:
return {'domain': None, 'nginx': None, 'warning': None}
@@ -2118,6 +2119,12 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]
db.session.rollback()
warning = f'could not record domain {site_host}: {e}'
+ # Per-site DNS mode: auto-create this site's A record via a connected
+ # provider (wildcard mode relies on the single *.<base> record instead).
+ dns = SiteDomainService.ensure_site_dns(site_host)
+ if dns and not dns.get('skipped') and not dns.get('created') and dns.get('message'):
+ warning = (warning + '; ' + dns['message']) if warning else dns['message']
+
v = cls._write_app_vhost(app)
if v.get('warning'):
warning = (warning + '; ' + v['warning']) if warning else v['warning']
diff --git a/backend/tests/test_dns_subdomain_modes.py b/backend/tests/test_dns_subdomain_modes.py
new file mode 100644
index 00000000..29484d1b
--- /dev/null
+++ b/backend/tests/test_dns_subdomain_modes.py
@@ -0,0 +1,80 @@
+"""Proving tests for per-base-domain subdomain DNS modes (Phase 3).
+
+A managed base domain runs in one of two modes:
+* ``wildcard`` (default) — one ``*.<base>`` record covers every site, so creating a
+ site does no per-site DNS, and
+* ``per-site`` — each new site gets its own A record auto-created via a connected
+ provider (through the ownership-guarded, logged write path).
+"""
+
+
+def _set(key, value):
+ from app import db
+ from app.services.settings_service import SettingsService
+ SettingsService.set(key, value)
+ db.session.commit()
+
+
+# ── mode setting ─────────────────────────────────────────────────────────────
+
+def test_dns_mode_defaults_to_wildcard(app):
+ from app.services.site_domain_service import SiteDomainService
+ assert SiteDomainService.dns_mode() == 'wildcard'
+
+
+def test_dns_mode_reads_per_site(app):
+ from app.services.site_domain_service import SiteDomainService
+ _set('sites_dns_mode', 'per-site')
+ assert SiteDomainService.dns_mode() == 'per-site'
+
+
+def test_dns_mode_rejects_garbage(app):
+ from app.services.site_domain_service import SiteDomainService
+ _set('sites_dns_mode', 'nonsense')
+ assert SiteDomainService.dns_mode() == 'wildcard'
+
+
+# ── ensure_site_dns ──────────────────────────────────────────────────────────
+
+def test_ensure_site_dns_is_noop_in_wildcard_mode(app, monkeypatch):
+ from app.services.site_domain_service import SiteDomainService
+ from app.services.dns_provider_service import DNSProviderService
+
+ called = {'n': 0}
+ monkeypatch.setattr(DNSProviderService, 'ensure_a_record',
+ classmethod(lambda cls, h, ip: called.update(n=called['n'] + 1)))
+ res = SiteDomainService.ensure_site_dns('blog.example.com')
+ assert res.get('skipped') and res.get('reason') == 'wildcard'
+ assert called['n'] == 0 # wildcard already covers it; no provider call
+
+
+def test_ensure_site_dns_creates_record_in_per_site_mode(app, monkeypatch):
+ from app.services.site_domain_service import SiteDomainService
+ from app.services.dns_provider_service import DNSProviderService
+
+ _set('sites_dns_mode', 'per-site')
+ _set('server_public_ip', '203.0.113.7')
+
+ seen = {}
+ monkeypatch.setattr(DNSProviderService, 'ensure_a_record', classmethod(
+ lambda cls, host, ip: (seen.update(host=host, ip=ip) or {'created': True, 'record': {}})))
+
+ res = SiteDomainService.ensure_site_dns('blog.example.com')
+ assert res.get('created') is True
+ assert seen == {'host': 'blog.example.com', 'ip': '203.0.113.7'}
+
+
+def test_ensure_site_dns_per_site_without_ip(app):
+ from app.services.site_domain_service import SiteDomainService
+ _set('sites_dns_mode', 'per-site')
+ res = SiteDomainService.ensure_site_dns('blog.example.com')
+ assert res.get('created') is False and res.get('reason') == 'no_server_ip'
+
+
+# ── status surfaces the mode ─────────────────────────────────────────────────
+
+def test_sites_https_status_reports_mode(app):
+ from app.services.sites_https_service import SitesHttpsService
+ _set('sites_dns_mode', 'per-site')
+ status = SitesHttpsService.status()
+ assert status['dns_mode'] == 'per-site'