Merge pull request #13 from ZeroHost-Code/beta

v1.0.2

Author: ddrayko

.gitignore

@@ -27,6 +27,9 @@ logs/
 port.txt
 reboot.sh
 
+# Uploads
+uploads/
+
 # Secrets (if any local dump)
 *.pem
 *.key

README.md

@@ -225,7 +225,6 @@ flowchart TD
     T["/pyrodactyl\nPanel Redirect"] --> U["5-second auto-redirect\nto panel.zero-host.org"]
 
     V["/account\nAccount Hub"] --> W["/account/edit\n(Email, Password, API Key)"]
-    V --> X["/account/links\n(Linked Accounts)"]
     V --> Y["/account/dangerous\n(Delete Account, RGPD Export)"]
 
     Z["/log\nActivity Log"] --> AA["Paginated list\n(50 per page)"]

config/migrate.js

@@ -13,6 +13,10 @@ const tables = {
       { name: 'last_name', def: 'VARCHAR(255)' },
       { name: 'password_set', def: 'TINYINT(1) NOT NULL DEFAULT 0' },
       { name: 'is_admin', def: 'TINYINT(1) NOT NULL DEFAULT 0' },
+      { name: 'restricted', def: 'TINYINT(1) NOT NULL DEFAULT 0' },
+      { name: 'auth_restricted', def: 'TINYINT(1) NOT NULL DEFAULT 0' },
+      { name: 'token_version', def: 'INT NOT NULL DEFAULT 0' },
+      { name: 'avatar', def: 'VARCHAR(255) DEFAULT NULL' },
       { name: 'ptero_client_api_key', def: 'VARCHAR(255) DEFAULT NULL' },
       { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
     ],
@@ -47,6 +51,38 @@ const tables = {
       { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
     ],
   },
+  nests: {
+    columns: [
+      { name: 'id', def: 'INT AUTO_INCREMENT PRIMARY KEY' },
+      { name: 'ptero_nest_id', def: 'INT NOT NULL UNIQUE' },
+      { name: 'name', def: 'VARCHAR(255) NOT NULL' },
+      { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
+    ],
+  },
+  egg_resources: {
+    columns: [
+      { name: 'id', def: 'INT AUTO_INCREMENT PRIMARY KEY' },
+      { name: 'ptero_nest_id', def: 'INT NOT NULL' },
+      { name: 'ptero_egg_id', def: 'INT NOT NULL' },
+      { name: 'cpu_limit', def: 'INT DEFAULT NULL' },
+      { name: 'memory_limit', def: 'INT DEFAULT NULL' },
+      { name: 'disk_limit', def: 'INT DEFAULT NULL' },
+      { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
+      { name: 'updated_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' },
+    ],
+  },
+  notifications: {
+    columns: [
+      { name: 'id', def: 'INT AUTO_INCREMENT PRIMARY KEY' },
+      { name: 'user_id', def: 'INT NOT NULL' },
+      { name: 'title', def: 'VARCHAR(255) NOT NULL' },
+      { name: 'message', def: 'TEXT NOT NULL' },
+      { name: 'type', def: "VARCHAR(20) NOT NULL DEFAULT 'info'" },
+      { name: 'link', def: 'VARCHAR(255) DEFAULT NULL' },
+      { name: 'is_read', def: 'TINYINT(1) NOT NULL DEFAULT 0' },
+      { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
+    ],
+  },
 
 };
 
@@ -67,6 +103,10 @@ const constraints = [
   { 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' },
+  { table: 'egg_resources', sql: 'ALTER TABLE egg_resources ADD UNIQUE INDEX idx_egg_resources_nest_egg (ptero_nest_id, ptero_egg_id)', name: 'idx_egg_resources_nest_egg' },
+  { table: 'notifications', sql: 'ALTER TABLE notifications ADD INDEX idx_notif_user (user_id)', name: 'idx_notif_user' },
+  { table: 'notifications', sql: 'ALTER TABLE notifications ADD INDEX idx_notif_user_read (user_id, is_read)', name: 'idx_notif_user_read' },
+  { table: 'notifications', sql: 'ALTER TABLE notifications ADD CONSTRAINT fk_notif_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE', name: 'fk_notif_user' },
 ];
 
 export async function migrate() {

config/pyrodactyl.js

@@ -17,5 +17,3 @@ export const FEATURE_LIMITS = {
 };
 
 export const DEPLOY_LOCATIONS = [1];
-
-export const NEST_IDS = [5, 6, 7];

middleware/auth.js

@@ -1,4 +1,5 @@
 import jwt from 'jsonwebtoken';
+import { query } from '../config/db.js';
 
 const JWT_SECRET = process.env.JWT_SECRET;
 
@@ -8,7 +9,7 @@ if (!JWT_SECRET) {
   console.error('JWT_SECRET contains unresolved shell expansion characters ($(), backticks). Generate a proper random key (e.g. openssl rand -hex 32) and hardcode it in .env');
 }
 
-export function authenticateToken(req, res, next) {
+export async function authenticateToken(req, res, next) {
   const authHeader = req.headers['authorization'];
   const token = authHeader && authHeader.split(' ')[1];
 
@@ -19,6 +20,18 @@ export function authenticateToken(req, res, next) {
   try {
     const decoded = jwt.verify(token, JWT_SECRET);
     req.user = decoded;
+
+    if (decoded.tokenVersion !== undefined) {
+      try {
+        const rows = await query('SELECT token_version FROM users WHERE id = ?', [decoded.userId]);
+        if (rows.length > 0 && rows[0].token_version !== decoded.tokenVersion) {
+          return res.status(403).json({ error: 'Session expired. Please log in again.' });
+        }
+      } catch {
+        return res.status(403).json({ error: 'Session validation failed.' });
+      }
+    }
+
     next();
   } catch {
     return res.status(403).json({ error: 'Invalid or expired token' });

package-lock.json

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