Merge pull request #5 from ZeroHost-Code/beta

Beta

Author: ddrayko

.env.example

@@ -20,8 +20,9 @@ PTERO_API_KEY=change_me
 # Encryption key for sensitive data — Generate with: openssl rand -hex 32
 ENCRYPTION_KEY=change_me_to_a_random_hex_string
 
-# Cloudflare Turnstile
-TURNSTILE_SECRET=change_me
+# Cap CAPTCHA (self-hosted alternative to Turnstile)
+CAP_ENDPOINT=https://cap.zero-host.org/f6c8171b08/
+CAP_SECRET=change_me
 
 # Session & Cookie
 COOKIE_SECRET=change_me_to_a_random_string

config/cap.js

@@ -0,0 +1,35 @@
+const CAP_SECRET = process.env.CAP_SECRET;
+const CAP_ENDPOINT = process.env.CAP_ENDPOINT;
+
+if (!CAP_SECRET) {
+  console.error('Missing CAP_SECRET environment variable');
+}
+
+if (!CAP_ENDPOINT) {
+  console.error('Missing CAP_ENDPOINT environment variable');
+}
+
+async function fetchWithTimeout(url, options = {}, timeout = 10000) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeout);
+  try {
+    return await fetch(url, { ...options, signal: controller.signal });
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export async function verifyCap(token) {
+  if (!token) return false;
+  try {
+    const res = await fetchWithTimeout(`${CAP_ENDPOINT}siteverify`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ secret: CAP_SECRET, response: token }),
+    });
+    const data = await res.json();
+    return data.success === true;
+  } catch {
+    return false;
+  }
+}

config/migrate.js

@@ -12,6 +12,7 @@ const tables = {
       { name: 'first_name', def: 'VARCHAR(255)' },
       { name: 'last_name', def: 'VARCHAR(255)' },
       { name: 'password_set', def: 'TINYINT(1) NOT NULL DEFAULT 0' },
+      { name: 'ptero_client_api_key', def: 'VARCHAR(255) DEFAULT NULL' },
       { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
     ],
   },
@@ -33,6 +34,16 @@ const tables = {
       { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
     ],
   },
+  activity_log: {
+    columns: [
+      { name: 'id', def: 'INT AUTO_INCREMENT PRIMARY KEY' },
+      { name: 'user_id', def: 'INT NOT NULL' },
+      { name: 'action', def: 'VARCHAR(50) NOT NULL' },
+      { name: 'details', def: 'VARCHAR(255) DEFAULT \'\'' },
+      { name: 'server_id', def: 'INT DEFAULT NULL' },
+      { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
+    ],
+  },
 
 };
 
@@ -51,7 +62,8 @@ const constraints = [
   { table: 'user_ips', sql: 'ALTER TABLE user_ips ADD INDEX idx_ip (ip_address)', name: 'idx_ip' },
   { table: 'user_ips', sql: 'ALTER TABLE user_ips ADD INDEX idx_user (user_id)', name: 'idx_user' },
   { table: 'user_ips', sql: 'ALTER TABLE user_ips ADD CONSTRAINT fk_user_ips_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE', name: 'fk_user_ips_user' },
-
+  { table: 'activity_log', sql: 'ALTER TABLE activity_log ADD INDEX idx_activity_user (user_id)', name: 'idx_activity_user' },
+  { table: 'activity_log', sql: 'ALTER TABLE activity_log ADD INDEX idx_activity_created (created_at)', name: 'idx_activity_created' },
 ];
 
 export async function migrate() {

config/turnstile.js

@@ -1,6 +1,6 @@
 {
   "name": "zerohost-dashboard",
-  "version": "1.0.0",
+  "version": "0.9.7",
   "private": true,
   "type": "module",
   "scripts": {