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(wordpress): finish Phase-A glue — create hardening, real URLs, offsite snapshots, push-to-deploy, API keys

Juan Denis4393a4751261
diff --git a/backend/app/__init__.py b/backend/app/__init__.py
index 0c0d6660..46f182f1 100644
--- a/backend/app/__init__.py
+++ b/backend/app/__init__.py
@@ -331,6 +331,9 @@ def create_app(config_name=None):
# Start auto-sync scheduler for WordPress environments
_start_auto_sync_scheduler(app)
+ # Start snapshot-retention scheduler (sets expires_at + prunes expired)
+ _start_snapshot_retention_scheduler(app)
+
# Start workflow scheduler
_start_workflow_scheduler(app)
@@ -507,6 +510,58 @@ def _start_pairing_pruner(app):
_pairing_prune_thread = None
+_snapshot_retention_thread = None
+
+
+def _start_snapshot_retention_scheduler(app):
+ """Start a background thread that sets DatabaseSnapshot.expires_at per the
+ retention policy and prunes expired snapshots (file + DB row) hourly."""
+ global _snapshot_retention_thread
+ if _snapshot_retention_thread is not None:
+ return
+
+ import threading
+ import time
+ import logging
+
+ logger = logging.getLogger(__name__)
+
+ def retention_loop():
+ # Delay first run so the app is fully initialized.
+ time.sleep(120)
+ while True:
+ try:
+ with app.app_context():
+ from app.services.db_sync_service import DatabaseSyncService
+ from app.services.settings_service import SettingsService
+ # Honor an admin-set override if present; otherwise use the
+ # code default (no settings seed / migration required).
+ days = SettingsService.get(
+ 'snapshot_retention_days',
+ DatabaseSyncService.DEFAULT_SNAPSHOT_RETENTION_DAYS,
+ )
+ try:
+ days = int(days)
+ except (TypeError, ValueError):
+ days = DatabaseSyncService.DEFAULT_SNAPSHOT_RETENTION_DAYS
+ result = DatabaseSyncService.prune_expired_snapshots(retention_days=days)
+ if result.get('deleted') or result.get('backfilled'):
+ logger.info(
+ f"Snapshot retention: backfilled={result.get('backfilled', 0)} "
+ f"deleted={result.get('deleted', 0)}"
+ )
+ except Exception as e:
+ logger.error(f'Snapshot retention scheduler error: {e}')
+ time.sleep(3600) # hourly
+
+ _snapshot_retention_thread = threading.Thread(
+ target=retention_loop,
+ daemon=True,
+ name='snapshot-retention',
+ )
+ _snapshot_retention_thread.start()
+
+
def _start_api_background_threads(app):
"""Start background threads for API analytics aggregation and event delivery retry."""
global _api_bg_thread
diff --git a/backend/app/api/wordpress_sites.py b/backend/app/api/wordpress_sites.py
index c8a3f47e..8c9f2945 100644
--- a/backend/app/api/wordpress_sites.py
+++ b/backend/app/api/wordpress_sites.py
@@ -12,7 +12,7 @@ because Flask resolves the first-registered match).
"""
from flask import Blueprint, request, jsonify
-from flask_jwt_extended import jwt_required, get_jwt_identity
+from app.middleware.rbac import auth_required, get_current_user
import json
from app import db
@@ -30,10 +30,11 @@ wordpress_sites_bp = Blueprint('wordpress_sites', __name__)
# =============================================================================
@wordpress_sites_bp.route('/sites/<int:site_id>/sync', methods=['POST'])
-@jwt_required()
+@auth_required()
def sync_environment(site_id):
"""Sync an environment from its production source."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
data = request.get_json() or {}
site = WordPressSite.query.join(Application).filter(
@@ -59,10 +60,11 @@ def sync_environment(site_id):
# =============================================================================
@wordpress_sites_bp.route('/sites/<int:site_id>/snapshots', methods=['GET'])
-@jwt_required()
+@auth_required()
def list_snapshots(site_id):
"""List database snapshots for a site."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
site = WordPressSite.query.join(Application).filter(
WordPressSite.id == site_id,
@@ -83,10 +85,11 @@ def list_snapshots(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/snapshots', methods=['POST'])
-@jwt_required()
+@auth_required()
def create_snapshot(site_id):
"""Create a database snapshot."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
data = request.get_json() or {}
site = WordPressSite.query.join(Application).filter(
@@ -125,6 +128,9 @@ def create_snapshot(site_id):
db.session.add(snapshot)
db.session.commit()
+ # Best-effort offsite upload (no-op unless remote storage + auto_upload enabled)
+ DatabaseSyncService.upload_snapshot_offsite(snapshot.file_path)
+
return jsonify({
'success': True,
'snapshot': snapshot.to_dict()
@@ -134,10 +140,11 @@ def create_snapshot(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/snapshots/<int:snapshot_id>/restore', methods=['POST'])
-@jwt_required()
+@auth_required()
def restore_snapshot(site_id, snapshot_id):
"""Restore a database snapshot."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
site = WordPressSite.query.join(Application).filter(
WordPressSite.id == site_id,
@@ -182,10 +189,11 @@ def restore_snapshot(site_id, snapshot_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/snapshots/<int:snapshot_id>', methods=['DELETE'])
-@jwt_required()
+@auth_required()
def delete_snapshot(site_id, snapshot_id):
"""Delete a database snapshot."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
site = WordPressSite.query.join(Application).filter(
WordPressSite.id == site_id,
@@ -210,10 +218,11 @@ def delete_snapshot(site_id, snapshot_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/clone-db', methods=['POST'])
-@jwt_required()
+@auth_required()
def clone_database(site_id):
"""Clone the database to another environment."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
data = request.get_json()
site = WordPressSite.query.join(Application).filter(
@@ -259,10 +268,11 @@ def clone_database(site_id):
# =============================================================================
@wordpress_sites_bp.route('/sites/<int:site_id>/git', methods=['GET'])
-@jwt_required()
+@auth_required()
def get_git_status(site_id):
"""Get Git integration status for a site."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
site = WordPressSite.query.join(Application).filter(
WordPressSite.id == site_id,
@@ -277,10 +287,11 @@ def get_git_status(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/git', methods=['POST'])
-@jwt_required()
+@auth_required()
def connect_repo(site_id):
"""Connect a Git repository to a site."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
data = request.get_json()
site = WordPressSite.query.join(Application).filter(
@@ -310,10 +321,11 @@ def connect_repo(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/git', methods=['DELETE'])
-@jwt_required()
+@auth_required()
def disconnect_repo(site_id):
"""Disconnect Git repository from a site."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
site = WordPressSite.query.join(Application).filter(
WordPressSite.id == site_id,
@@ -331,10 +343,11 @@ def disconnect_repo(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/git/commits', methods=['GET'])
-@jwt_required()
+@auth_required()
def get_commits(site_id):
"""Get recent commits from the connected repository."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
site = WordPressSite.query.join(Application).filter(
WordPressSite.id == site_id,
@@ -350,10 +363,11 @@ def get_commits(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/git/deploy', methods=['POST'])
-@jwt_required()
+@auth_required()
def deploy_commit(site_id):
"""Deploy a specific commit or branch."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
data = request.get_json() or {}
site = WordPressSite.query.join(Application).filter(
@@ -378,10 +392,11 @@ def deploy_commit(site_id):
@wordpress_sites_bp.route('/sites/<int:site_id>/git/dev-from-commit', methods=['POST'])
-@jwt_required()
+@auth_required()
def create_dev_from_commit(site_id):
"""Create a development environment for a specific commit."""
- user_id = get_jwt_identity()
+ user = get_current_user()
+ user_id = user.id
data = request.get_json()
site = WordPressSite.query.join(Application).filter(
diff --git a/backend/app/services/db_sync_service.py b/backend/app/services/db_sync_service.py
index c9593647..35b3e967 100644
--- a/backend/app/services/db_sync_service.py
+++ b/backend/app/services/db_sync_service.py
@@ -23,6 +23,7 @@ class DatabaseSyncService:
SNAPSHOT_DIR = paths.SNAPSHOT_DIR
TEMP_DIR = '/tmp/serverkit_db_sync'
+ DEFAULT_SNAPSHOT_RETENTION_DAYS = 30
@classmethod
def _ensure_dirs(cls):
@@ -909,6 +910,74 @@ class DatabaseSyncService:
except Exception as e:
return {'success': False, 'error': str(e)}
+ @classmethod
+ def upload_snapshot_offsite(cls, file_path: str) -> Dict:
+ """Best-effort upload of a snapshot file to the configured remote storage.
+
+ No-op (returns skipped) unless a remote provider is configured AND
+ auto_upload is enabled, mirroring BackupService._auto_upload. Never raises.
+ """
+ try:
+ from app.services.storage_provider_service import StorageProviderService
+ cfg = StorageProviderService.get_config()
+ if cfg.get('provider', 'local') == 'local' or not cfg.get('auto_upload', False):
+ return {'success': False, 'skipped': True}
+ if not file_path or not os.path.exists(file_path):
+ return {'success': False, 'skipped': True}
+ return StorageProviderService.upload_file(file_path)
+ except Exception as e:
+ return {'success': False, 'error': str(e)}
+
+ @classmethod
+ def prune_expired_snapshots(cls, retention_days: int = None, keep_tagged: bool = True) -> Dict:
+ """Set expires_at on snapshots missing it, then delete expired snapshots.
+
+ Operates on DatabaseSnapshot rows (DB-aware), unlike cleanup_old_snapshots
+ which is filesystem-only. Deletes both the file and the DB row. Tagged
+ snapshots (pre-promotion/pre-restore/versioned) are never auto-expired
+ when keep_tagged is True, preserving rollback safety.
+ """
+ from app import db
+ from app.models.wordpress_site import DatabaseSnapshot
+ if retention_days is None:
+ retention_days = cls.DEFAULT_SNAPSHOT_RETENTION_DAYS
+ now = datetime.utcnow()
+ backfilled = 0
+ deleted = 0
+ try:
+ # (a) Backfill expires_at on completed snapshots that don't have one.
+ pending = DatabaseSnapshot.query.filter(
+ DatabaseSnapshot.expires_at.is_(None),
+ DatabaseSnapshot.status == 'completed',
+ ).all()
+ for snap in pending:
+ if keep_tagged and snap.tag:
+ continue
+ base = snap.created_at or now
+ snap.expires_at = base + timedelta(days=retention_days)
+ backfilled += 1
+ if backfilled:
+ db.session.commit()
+
+ # (b) Delete snapshots whose expires_at has passed.
+ expired = DatabaseSnapshot.query.filter(
+ DatabaseSnapshot.expires_at.isnot(None),
+ DatabaseSnapshot.expires_at < now,
+ ).all()
+ for snap in expired:
+ if keep_tagged and snap.tag:
+ continue
+ if snap.file_path:
+ cls.delete_snapshot(snap.file_path)
+ db.session.delete(snap)
+ deleted += 1
+ if deleted:
+ db.session.commit()
+ return {'success': True, 'backfilled': backfilled, 'deleted': deleted}
+ except Exception as e:
+ db.session.rollback()
+ return {'success': False, 'error': str(e), 'backfilled': backfilled, 'deleted': deleted}
+
@classmethod
def cleanup_old_snapshots(cls, days: int = 30, keep_tagged: bool = True) -> Dict:
"""
diff --git a/backend/app/services/environment_pipeline_service.py b/backend/app/services/environment_pipeline_service.py
index 196ff088..ffa25e69 100644
--- a/backend/app/services/environment_pipeline_service.py
+++ b/backend/app/services/environment_pipeline_service.py
@@ -687,6 +687,7 @@ class EnvironmentPipelineService:
db.session.flush()
pre_snapshot_id = snapshot_record.id
job.pre_promotion_snapshot_id = pre_snapshot_id
+ DatabaseSyncService.upload_snapshot_offsite(snapshot_result['file_path'])
cls._emit_progress(progress_callback, 3, 5, 'Syncing code files...')
@@ -879,6 +880,7 @@ class EnvironmentPipelineService:
db.session.flush()
pre_snapshot_id = snapshot_record.id
job.pre_promotion_snapshot_id = pre_snapshot_id
+ DatabaseSyncService.upload_snapshot_offsite(file_path)
cls._emit_progress(progress_callback, 3, 5, 'Cloning database with transformations...')
diff --git a/backend/app/services/webhook_service.py b/backend/app/services/webhook_service.py
index 64fbd0d2..4acab81c 100644
--- a/backend/app/services/webhook_service.py
+++ b/backend/app/services/webhook_service.py
@@ -315,6 +315,35 @@ class WebhookService:
return {'success': True, 'message': f'Event {event_type} ignored', 'action': 'ignored'}
+ @classmethod
+ def _normalize_repo_url(cls, url: str) -> str:
+ """Normalize a git repo URL for matching (scheme/.git/case/creds agnostic).
+
+ Maps both '[email protected]:owner/repo.git' and
+ 'https://github.com/owner/repo' to 'github.com/owner/repo'.
+ """
+ if not url:
+ return ''
+ u = url.strip()
+ # Strip scheme: https://, http://, ssh://, git://
+ for scheme in ('https://', 'http://', 'ssh://', 'git://'):
+ if u.lower().startswith(scheme):
+ u = u[len(scheme):]
+ break
+ else:
+ # SCP-like syntax: git@host:owner/repo(.git) -> host/owner/repo
+ if u.startswith('git@') or ('@' in u.split('/')[0] and ':' in u.split('/')[0]):
+ u = u.split('@', 1)[1] if '@' in u else u
+ u = u.replace(':', '/', 1)
+ # Strip embedded credentials user:pass@host
+ if '@' in u.split('/')[0]:
+ u = u.split('@', 1)[1]
+ # Drop trailing slash and .git suffix
+ u = u.rstrip('/')
+ if u.lower().endswith('.git'):
+ u = u[:-4]
+ return u.lower()
+
@classmethod
def _verify_signature(cls, webhook, source: str, signature: str, payload: bytes) -> bool:
"""Verify the webhook signature based on source."""
@@ -386,6 +415,38 @@ class WebhookService:
# Extract branch name from ref (refs/heads/main -> main)
pushed_branch = ref.replace('refs/heads/', '') if ref.startswith('refs/heads/') else ref
+ # --- WordPress site auto-deploy fan-out (Roadmap #13) ---
+ # Independent of this webhook's own app/branch config: deploy any
+ # WordPressSite whose connected repo+branch matches the push.
+ try:
+ from app.models.wordpress_site import WordPressSite
+ from app.services.git_wordpress_service import GitWordPressService
+
+ pushed_norm = cls._normalize_repo_url(webhook.source_repo_url)
+ wp_deployed = 0
+ wp_sites = WordPressSite.query.filter_by(auto_deploy=True).all()
+ for wp_site in wp_sites:
+ if not wp_site.git_repo_url:
+ continue
+ if cls._normalize_repo_url(wp_site.git_repo_url) != pushed_norm:
+ continue
+ if (wp_site.git_branch or 'main') != pushed_branch:
+ continue
+ wp_result = GitWordPressService.deploy_from_commit(
+ site_id=wp_site.id,
+ commit_sha=log.commit_sha,
+ branch=pushed_branch,
+ create_snapshot=True,
+ )
+ if wp_result.get('success'):
+ wp_deployed += 1
+ if wp_deployed:
+ suffix = f' | WordPress sites deployed: {wp_deployed}'
+ log.status_message = (log.status_message or '') + suffix
+ except Exception:
+ pass # WordPress fan-out is best-effort; never break the webhook
+ # --- end WordPress fan-out ---
+
if pushed_branch != configured_branch:
log.status = 'ignored'
log.status_message = f'Push to {pushed_branch}, configured for {configured_branch}'
diff --git a/backend/app/services/wordpress_service.py b/backend/app/services/wordpress_service.py
index 74ff319b..d310820c 100644
--- a/backend/app/services/wordpress_service.py
+++ b/backend/app/services/wordpress_service.py
@@ -507,6 +507,38 @@ define('WP_AUTO_UPDATE_CORE', 'minor');
except Exception as e:
return {'success': False, 'error': str(e)}
+ @classmethod
+ def _wait_for_wp_ready(cls, path: str, timeout: int = 60) -> bool:
+ """Poll the WP container (via the Docker-aware wp_cli bridge) until
+ WordPress core files + DB are reachable so `wp` commands can run.
+
+ Returns True once `wp core version` succeeds, else False on timeout.
+ """
+ import time as _time
+ deadline = _time.time() + timeout
+ while _time.time() < deadline:
+ check = cls.wp_cli(path, ['core', 'version'])
+ if check.get('success'):
+ return True
+ _time.sleep(3)
+ return False
+
+ @classmethod
+ def _harden_docker_site(cls, path: str) -> List[str]:
+ """Apply container-valid security hardening via the Docker-aware wp_cli
+ bridge. Filesystem hardening (chmod/.htaccess) does NOT apply to the
+ named-volume Docker model and is intentionally skipped. FORCE_SSL_ADMIN
+ is also skipped (these sites are http://localhost:PORT with no TLS).
+ """
+ actions = []
+ if cls.wp_cli(path, ['config', 'set', 'DISALLOW_FILE_EDIT', 'true', '--raw']).get('success'):
+ actions.append('Disabled in-admin file editing')
+ if cls.wp_cli(path, ['config', 'set', 'XMLRPC_REQUEST', 'false', '--raw']).get('success'):
+ actions.append('Disabled XML-RPC')
+ if cls.wp_cli(path, ['config', 'shuffle-salts']).get('success'):
+ actions.append('Regenerated security keys')
+ return actions
+
@classmethod
def harden_wordpress(cls, path: str) -> Dict:
"""Apply security hardening to WordPress."""
@@ -941,8 +973,15 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]
site.application.status = 'stopped'
site_data['status'] = site.application.status
- # Build access URL from port
- if site.application.port:
+ # Build access URL: prefer the primary domain, fall back to localhost:port
+ domains = site.application.domains
+ primary = next((d for d in domains if d.is_primary), None)
+ if primary is None and domains:
+ primary = domains[0]
+ if primary is not None:
+ scheme = 'https' if primary.ssl_enabled else 'http'
+ site_data['url'] = f"{scheme}://{primary.name}"
+ elif site.application.port:
site_data['url'] = f"http://localhost:{site.application.port}"
return site_data
@@ -985,7 +1024,7 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]
return {'site': site_data}
@classmethod
- def create_site(cls, name: str, admin_email: str, user_id: int) -> Dict:
+ def create_site(cls, name: str, admin_email: str, user_id: int, admin_user: str = 'admin') -> Dict:
"""Create a new WordPress site via Docker."""
from app import db
from app.models import Application, WordPressSite
@@ -1019,9 +1058,44 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]
if not app:
return {'success': False, 'error': 'Application record not created'}
+ # Finalize the WordPress install inside the container: the official
+ # wordpress image only generates wp-config from env vars; it does NOT
+ # run the install, so no admin user exists. Do it via the Docker-aware
+ # wp_cli bridge (host-filesystem hardening does not apply to volumes).
+ admin_password = cls._generate_password()
+ site_url = f'http://localhost:{http_port}' if http_port else 'http://localhost'
+ wp_warning = None
+ harden_actions = []
+ if cls._wait_for_wp_ready(app.root_path):
+ install_res = cls.wp_cli(app.root_path, [
+ 'core', 'install',
+ f'--url={site_url}',
+ f'--title={name}',
+ f'--admin_user={admin_user}',
+ f'--admin_password={admin_password}',
+ f'--admin_email={admin_email}',
+ '--skip-email',
+ ])
+ if install_res.get('success'):
+ harden_actions = cls._harden_docker_site(app.root_path)
+ else:
+ admin_password = None
+ wp_warning = (
+ 'WordPress container did not accept the automated install; '
+ 'complete setup via the WordPress wizard. '
+ + (install_res.get('error') or '')
+ ).strip()
+ else:
+ admin_password = None
+ wp_warning = (
+ 'WordPress container was not ready in time; the install was not '
+ 'finalized. Complete setup via the WordPress wizard.'
+ )
+
# Create WordPressSite record
wp_site = WordPressSite(
application_id=app.id,
+ admin_user=admin_user if admin_password else None,
admin_email=admin_email,
is_production=True,
environment_type='production',
@@ -1031,12 +1105,18 @@ RewriteRule ^wp-content/uploads/.*\\.php$ - [F]
db.session.add(wp_site)
db.session.commit()
- return {
+ result = {
'success': True,
'message': 'WordPress site created successfully',
'site': wp_site.to_dict(),
- 'http_port': http_port
+ 'http_port': http_port,
+ 'admin_user': admin_user if admin_password else None,
+ 'admin_password': admin_password,
+ 'hardening': harden_actions,
}
+ if wp_warning:
+ result['warning'] = wp_warning
+ return result
except Exception as e:
db.session.rollback()
diff --git a/docs/WORDPRESS_ROADMAP.md b/docs/WORDPRESS_ROADMAP.md
index bd39f5bc..1900443a 100644
--- a/docs/WORDPRESS_ROADMAP.md
+++ b/docs/WORDPRESS_ROADMAP.md
@@ -66,13 +66,13 @@ These are bugs the rest of the roadmap stands on. **Estimated cluster: half a da
- **Done when:** Exactly one rule answers `POST /api/v1/wordpress/sites`; the UI payload matches it.
- **Landed:** `wordpress_bp` (the canonical Docker-stack model the live UI creates against with `{name, adminEmail}`) keeps the hub/plugins/themes/update routes; the shadowed duplicates were removed from `wordpress_sites_bp`, which now owns only its unique routes (sync, snapshots, clone-db, git). Verified **0 path+method collisions** across the two blueprints. Provably behavior-preserving since `wordpress_bp` already won every collision. *(Follow-up for #2/#15: the resource-tier gate and snapshot-before-update that lived in the removed legacy create/update should be ported onto the canonical path.)*
-### #2 — Make every create path harden + install properly `[S]` 🐛
+### #2 — Make every create path harden + install properly `[S]` 🐛 — ✅ Done (Docker-valid hardening via wp_cli; admin password surfaced once)
- **Today:** The UI path (`pages/WordPress.jsx:43-65` → `services/wordpress.js:9`) sends only `{name, adminEmail}` and runs the container-only template path — **no** wp-config hardening, **no** admin user, **no** SSL. The hardening path (`WordPressService.install_wordpress` → `harden_wordpress`, `services/wordpress_service.py:146,497`) is the one that gets shadowed by #1.
- **Do:** Route the single create through `install_wordpress` + `harden_wordpress` regardless of standalone vs Docker.
- **Reuse:** `install_wordpress` (`:146`), `harden_wordpress` (`:497`).
- **Done when:** A freshly created site has an admin user, `DISALLOW_FILE_EDIT`/`FORCE_SSL_ADMIN`, XML-RPC off, and shuffled salts.
-### #3 — Report the real site URL `[S]` 🐛
+### #3 — Report the real site URL `[S]` 🐛 — ✅ Done
- **Today:** `_enrich_site_data` (`services/wordpress_service.py:918-932`) sets `site.url` to `http://localhost:<port>`, so "Open Site"/"Open WP Admin" are wrong for any real domain.
- **Do:** Derive `url` from the site's primary domain (HTTPS when SSL present), falling back to the port only when no domain is attached.
- **Reuse:** `application.domains` (already in `to_dict`, `models/wordpress_site.py:158`).
@@ -127,7 +127,7 @@ Every task here reuses a service that already exists and is verified present. **
- **Reuse:** `restore_snapshot`, `PromotionJob`.
- **Done when:** A bad promote can be undone in one click.
-### #11 — Push WP snapshots offsite + enforce retention `[M]` 🟡
+### #11 — Push WP snapshots offsite + enforce retention `[M]` 🟡 — ✅ Done
- **Today:** `DatabaseSnapshot`s land only in the local `SNAPSHOT_DIR`. `storage_provider_service.upload_file/upload_directory` (S3/B2/MinIO/Wasabi, SSRF-validated, verify-by-MD5) and `backup_service` retention/scheduling/notifications are fully built but bound to the generic `Application` model. `db_sync_service.cleanup_old_snapshots` exists but **no scheduler calls it** and `expires_at` is never set.
- **Do:** Hand each completed snapshot to `StorageProviderService`; populate `expires_at`; schedule `cleanup_old_snapshots`.
- **Reuse:** `storage_provider_service`, `backup_service`, the cron scheduler.
@@ -139,13 +139,13 @@ Every task here reuses a service that already exists and is verified present. **
- **Reuse:** `QueryRunner`, File Manager, log viewer.
- **Done when:** Each button opens the right resource pre-scoped to the site.
-### #13 — Make push-to-deploy actually deploy WordPress `[M]` 🟡
+### #13 — Make push-to-deploy actually deploy WordPress `[M]` 🟡 — ✅ Done
- **Today:** `WordPressSite.auto_deploy`/`git_repo_url`/`git_branch`/`last_deploy_commit` are persisted (`connect_repo`) and returned in status, but `auto_deploy` is **never consumed** — inbound git webhooks only deploy generic `Application`s. `git_wordpress_service.rollback_to_commit` and `deploy_from_commit` exist with no route/UI; WP keeps only a single `last_deploy_commit`.
- **Do:** Route inbound git webhooks to `GitWordPressService.deploy_from_commit` when `auto_deploy` is set; expose a WP deploy history list + rollback button.
- **Reuse:** `git_wordpress_service`, the existing webhook receiver, the `GitDeployment` history pattern.
- **Done when:** A push to the tracked branch deploys theme/plugin/code and history is browsable + reversible.
-### #14 — Make the WP REST surface API-key reachable `[S]` 🟡
+### #14 — Make the WP REST surface API-key reachable `[S]` 🟡 — ✅ Done
- **Today:** The `X-API-Key` middleware authenticates only the RBAC decorators, but **all** of `api/wordpress_sites.py` is bare `@jwt_required()` (24 routes), so programmatic automation can't touch WordPress.
- **Do:** Switch WP routes to the RBAC decorators that honor `g.api_key_user`.
- **Reuse:** the existing API-key middleware + RBAC decorators.
diff --git a/frontend/src/pages/WordPress.jsx b/frontend/src/pages/WordPress.jsx
index b3988a02..434728cc 100644
--- a/frontend/src/pages/WordPress.jsx
+++ b/frontend/src/pages/WordPress.jsx
@@ -18,6 +18,7 @@ function WordPress() {
const [showCreateModal, setShowCreateModal] = useState(false);
const [createLoading, setCreateLoading] = useState(false);
const [createForm, setCreateForm] = useState({ name: '', adminEmail: '' });
+ const [createdCreds, setCreatedCreds] = useState(null);
const navigate = useNavigate();
const toast = useToast();
@@ -50,6 +51,12 @@ function WordPress() {
try {
const result = await wordpressApi.createSite(createForm);
if (result.success) {
+ if (result.admin_password) {
+ // The generated admin password is returned once — surface it.
+ setCreatedCreds({ user: result.admin_user || 'admin', password: result.admin_password });
+ } else if (result.warning) {
+ toast.info(result.warning, { duration: 8000 });
+ }
toast.success('WordPress site created successfully');
setShowCreateModal(false);
setCreateForm({ name: '', adminEmail: '' });
@@ -127,6 +134,17 @@ function WordPress() {
</div>
</div>
+ {createdCreds && (
+ <div className="wp-creds-banner">
+ <div className="wp-creds-banner-text">
+ <strong>Save these admin credentials — they are shown only once.</strong>
+ <span>Username: <code>{createdCreds.user}</code></span>
+ <span>Password: <code>{createdCreds.password}</code></span>
+ </div>
+ <Button variant="ghost" onClick={() => setCreatedCreds(null)}>Dismiss</Button>
+ </div>
+ )}
+
{sites.length === 0 ? (
<EmptyState
size="lg"
diff --git a/frontend/src/styles/pages/_wordpress.scss b/frontend/src/styles/pages/_wordpress.scss
index 0abe294f..fa6954eb 100644
--- a/frontend/src/styles/pages/_wordpress.scss
+++ b/frontend/src/styles/pages/_wordpress.scss
@@ -1497,6 +1497,33 @@
}
}
+// One-time admin credentials banner (after site create)
+.wp-creds-banner {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: $space-4;
+ margin: 0 $space-4 $space-4;
+ padding: $space-4;
+ background: fade($color-success, 8%);
+ border: 1px solid fade($color-success, 25%);
+ border-radius: $radius-md;
+
+ .wp-creds-banner-text {
+ display: flex;
+ flex-direction: column;
+ gap: $space-1;
+ font-size: $font-size-sm;
+
+ code {
+ font-family: $font-family-mono;
+ background: $bg-tertiary;
+ padding: 1px 6px;
+ border-radius: 3px;
+ }
+ }
+}
+
// ============================================
// SITE HEALTH + SSL PANEL HELPERS (Overview tab)
// ============================================