Build [v1.9.10] (Access & SSL Recovery: Fixed Admin info and Explicit IP Proxy)

backend/routers/users.py

@@ -166,8 +166,9 @@ def get_users(db: Session = Depends(get_db)):
     users = db.query(models.User).all()
     # Auto-seed if empty
     if not users:
-        # [SECURITY FIX C-03] Generate random password instead of hardcoded "admin"
-        initial_password = secrets.token_urlsafe(16)
+        # [SECURITY] For initial setup and recovery, we use a predictable default.
+        # User MUST change this immediately in Settings.
+        initial_password = "Admin123!"
         new_user = models.User(
             username="Admin",
             role="admin",
@@ -177,7 +178,7 @@ def get_users(db: Session = Depends(get_db)):
         db.add(new_user)
         db.commit()
         db.refresh(new_user)
-        log.warning(f"[SECURITY] Admin initial seeded. Temporary password: {initial_password} — CHANGE IMMEDIATELY!")
+        log.warning(f"[SECURITY] Admin initial seeded. Credentials: Admin / {initial_password} — CHANGE IMMEDIATELY!")
         return [new_user]
     return users
 

backend/scripts/reset_admin.py

@@ -0,0 +1,41 @@
+import os
+import sys
+from sqlalchemy.orm import Session
+from passlib.context import CryptContext
+from ..database import SessionLocal
+from .. import models
+
+pwd_context = CryptContext(schemes=["pbkdf2_sha256"], deprecated="auto")
+
+def reset_admin():
+    db = SessionLocal()
+    try:
+        username = "Admin"
+        password = "Admin123!"
+        hashed_password = pwd_context.hash(password)
+        
+        user = db.query(models.User).filter(models.User.username == username).first()
+        if user:
+            user.hashed_password = hashed_password
+            user.role = "admin"
+            print(f"✅ User '{username}' found. Password has been reset to: {password}")
+        else:
+            new_user = models.User(
+                username=username,
+                role="admin",
+                origin="local",
+                hashed_password=hashed_password
+            )
+            db.add(new_user)
+            print(f"✅ User '{username}' not found. Created new admin with password: {password}")
+            
+        db.commit()
+        print("💾 Changes saved to database.")
+    except Exception as e:
+        print(f"❌ Error resetting admin: {e}")
+        db.rollback()
+    finally:
+        db.close()
+
+if __name__ == "__main__":
+    reset_admin()

config/Caddyfile

@@ -1,12 +1,21 @@
-# TFM aInventory - Caddy Self-Signed Internal Proxy
-# This replaces the need for `local-ssl-proxy` in Node.
+# TFM aInventory - Caddy Explicit IP Configuration
+# Version 1.9.10 - Focused on resolving Protocol Errors on private IPs.
 {
-:{$FRONTEND_SSL_PORT} {
+    # Global options
+    admin off
+    # Disable automatic HTTP->HTTPS redirects to prevent port conflicts on non-standard ports
+    auto_https disable_redirects
+}
+
+# Frontend SSL Proxy - Explicit address to improve handshake success
+https://{$SERVER_IP:192.168.84.113}:443 {
+    tls internal
     reverse_proxy frontend:3000
 }
 
 # Backend SSL Proxy
-:{$BACKEND_SSL_PORT} {
+https://{$SERVER_IP:192.168.84.113}:444 {
+    tls internal
     reverse_proxy backend:8000
 }
 }

config/ldap_config.json.example

@@ -1,19 +1,17 @@
 {
-  "_comment": "Copy this file to ldap_config.json and fill in real values. NEVER commit ldap_config.json to Git.",
   "ldap_enabled": false,
-  "server_uri": "ldap://YOUR_LDAP_SERVER_IP:389",
-  "base_dn": "dc=yourdomain,dc=com",
-  "user_template": "cn={username},ou=people,dc=yourdomain,dc=com",
-  "groups_dn": "ou=groups",
+  "server_uri": "ldap://192.168.1.100:389",
   "use_tls": false,
   "ignore_cert": false,
+  "base_dn": "dc=example,dc=com",
+  "user_template": "uid={username},ou=users,dc=example,dc=com",
   "role_mappings": [
     {
-      "group": "inventory_admins",
+      "group": "cn=inventory_admins,ou=groups,dc=example,dc=com",
       "role": "admin"
     },
     {
-      "group": "inventory_users",
+      "group": "cn=inventory_users,ou=groups,dc=example,dc=com",
       "role": "user"
     }
   ]

config/network_config.env

@@ -1,28 +0,0 @@
-# =============================================================================
-# TFM aInventory - Central Network Configuration
-# =============================================================================
-# Use this file to customize the ports and IP address used by the application
-# without needing to modify the source code.
-# 
-# IMPORTANT: After modifying this file, restart the application for changes 
-# to take effect.
-# =============================================================================
-
-# The primary IP address where the application will be accessed.
-# Used for CORS settings and documentation links.
-SERVER_IP=192.168.84.113
-
-# --- BACKEND PORTS ---
-# Internal port for the FastAPI server (Backend)
-BACKEND_PORT=8906
-
-# External port for the Backend HTTPS Proxy (Caddy/local-ssl-proxy)
-BACKEND_SSL_PORT=8908
-
-# --- FRONTEND PORTS ---
-# Internal port for the Next.js dev/prod server
-FRONTEND_PORT=8907
-
-# External port for the Frontend HTTPS Proxy (Caddy/local-ssl-proxy)
-# This is the port you will use in your browser (e.g. https://192.168.84.113:8909)
-FRONTEND_SSL_PORT=8909

deploy.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+# =============================================================================
+# TFM aInventory - Bulletproof Deployment Script (v1.9.10)
+# =============================================================================
+
+set -e
+
+# Load environment variables (from root inventory.env)
+if [ -f inventory.env ]; then
+    export $(grep -v '^#' inventory.env | xargs)
+    echo "✅ Loaded configuration from inventory.env"
+else
+    echo "⚠️  inventory.env not found. Using default values."
+fi
+
+# Parse arguments
+RESET_SSL=false
+RESET_ADMIN=false
+
+for arg in "$@"; do
+    case $arg in
+        --reset-ssl)
+            RESET_SSL=true
+            shift
+            ;;
+        --reset-admin)
+            RESET_ADMIN=true
+            shift
+            ;;
+        --help)
+            echo "Usage: ./deploy.sh [options]"
+            echo "Options:"
+            echo "  --reset-ssl    Clear Caddy storage and reset certificates"
+            echo "  --reset-admin  Force reset Admin password to 'Admin123!'"
+            echo "  --help         Show this help message"
+            exit 0
+            ;;
+    esac
+done
+
+if [ "$RESET_SSL" = true ]; then
+    echo "🧹 Resetting SSL certificates..."
+    docker compose down
+    docker volume rm -f inventory_caddy_data 2>/dev/null || true
+    echo "✅ SSL data cleared."
+fi
+
+echo "🚀 Starting TFM aInventory Services..."
+docker compose --env-file inventory.env up -d --build --remove-orphans
+
+if [ "$RESET_ADMIN" = true ]; then
+    echo "🔐 Resetting Admin credentials..."
+    # Wait for container to be ready
+    sleep 2
+    docker compose exec backend python3 -m backend.scripts.reset_admin
+fi
+
+echo ""
+echo "🔍 Verifying port mapping..."
+docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Ports}}"
+
+echo ""
+echo "🚀 DIAGNOSTIC LOGS (Proxy SSL Handshake):"
+docker compose logs proxy --tail 20
+
+echo ""
+echo "✅ Deployment complete."
+echo "   ------------------------------------------------------------"
+echo "   DEFAULT CREDENTIALS:"
+echo "   User: Admin"
+echo "   Pass: Admin123!"
+echo "   ------------------------------------------------------------"
+echo "   1. SECURE ACCESS: https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-8919}"
+echo "   2. DIRECT ACCESS: http://${SERVER_IP:-localhost}:${FRONTEND_PORT:-8917}"
+echo "   ------------------------------------------------------------"
+echo ""

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     ports:
       - ${BACKEND_PORT:-8000}:8000
     env_file:
-      - ./config/network_config.env
+      - inventory.env
     volumes:
       - ./data:/app/data
       - ./logs:/app/logs
@@ -16,10 +16,6 @@ services:
     environment:
       - DATA_DIR=/app/data
       - LOGS_DIR=/app/logs
-      - SERVER_IP=${SERVER_IP}
-      - FRONTEND_PORT=${FRONTEND_PORT}
-      - FRONTEND_SSL_PORT=${FRONTEND_SSL_PORT}
-      - BACKEND_SSL_PORT=${BACKEND_SSL_PORT}
       # [C-01] JWT secret key — GENERATE A SECURE VALUE FOR PRODUCTION!
       - JWT_SECRET_KEY=${JWT_SECRET_KEY:-change_me_in_production}
     restart: unless-stopped
@@ -32,7 +28,7 @@ services:
     ports:
       - ${FRONTEND_PORT:-3000}:3000
     env_file:
-      - ./config/network_config.env
+      - inventory.env
     volumes:
       - ./logs:/app/logs
     # Write Next.js logs to both stdout (docker logs) and file (mapped volume)
@@ -44,10 +40,10 @@ services:
     networks:
       - inventory_net
     ports:
-      - ${BACKEND_SSL_PORT:-3002}:${BACKEND_SSL_PORT:-3002}
-      - ${FRONTEND_SSL_PORT:-3003}:${FRONTEND_SSL_PORT:-3003}
+      - ${BACKEND_SSL_PORT:-8918}:444
+      - ${FRONTEND_SSL_PORT:-8919}:443
     env_file:
-      - ./config/network_config.env
+      - inventory.env
     volumes:
       - ./config/Caddyfile:/etc/caddy/Caddyfile
       # Persist the internal Caddy certificates so users don't get new certificate warnings constantly

export_prod.sh

@@ -29,6 +29,8 @@ cp install_service.sh "$PROD_DIR/"
 cp inventory.service.template "$PROD_DIR/"
 cp USER_GUIDE.md "$PROD_DIR/"
 cp README.md "$PROD_DIR/INSTALLATION_GUIDE.md"
+cp inventory.env "$PROD_DIR/"
+cp deploy.sh "$PROD_DIR/"
 cp .git_path "$PROD_DIR/" 2>/dev/null || true
 cp frontend/VERSION.json "$PROD_DIR/"
 cp frontend/VERSION.json "$PROD_DIR/frontend/"

frontend/VERSION.json

@@ -1 +1 @@
-{"version": "1.9.1", "last_build": "2026-04-13-2052", "codename": "NetworkFix", "commit": "65cc0c7b"}
+{"version": "1.9.9", "last_build": "2026-04-13-2157", "codename": "DirectAccess", "commit": "a2f6cab4"}

inventory.env

@@ -0,0 +1,19 @@
+# =============================================================================
+# TFM aInventory - Docker Compose Environment
+# =============================================================================
+# This file is used by Docker Compose for host-side port mapping.
+# It should match the values in config/network_config.env
+# =============================================================================
+
+SERVER_IP=192.168.84.113
+
+# Backend Ports
+BACKEND_PORT=8916
+BACKEND_SSL_PORT=8918
+
+# Frontend Ports
+FRONTEND_PORT=8917
+FRONTEND_SSL_PORT=8919
+
+# Security
+JWT_SECRET_KEY=change_me_in_production

run_standalone.sh

@@ -7,7 +7,7 @@ echo "🚀 Starting TFM aInventory in Standalone Mode..."
 # Trapping termination signals to clean up child processes
 trap "echo 'Stopping all processes...'; kill 0" SIGINT SIGTERM EXIT
 
-# --- CONFIGURATION (Default values, overridden by network_config.env) ---
+# --- CONFIGURATION (Default values, overridden by network_configinventory.env) ---
 BACKEND_PORT=8000
 FRONTEND_PORT=3001
 BACKEND_SSL_PORT=3002
@@ -15,7 +15,7 @@ FRONTEND_SSL_PORT=3003
 SERVER_IP="localhost"
 
 # Load Configuration from file if it exists
-CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/config/network_config.env"
+CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/inventory.env"
 if [ -f "$CONFIG_PATH" ]; then
     echo "⚙️  Loading network configuration from $CONFIG_PATH..."
     export $(grep -v '^#' "$CONFIG_PATH" | xargs)

start_server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# --- CONFIGURATION (Default values, will be overridden by network_config.env) ---
+# --- CONFIGURATION (Default values, will be overridden by network_configinventory.env) ---
 BACKEND_PORT=8000
 FRONTEND_PORT=3001
 BACKEND_SSL_PORT=3002
@@ -8,10 +8,10 @@ FRONTEND_SSL_PORT=3003
 SERVER_IP="localhost"
 
 # Load Configuration from file if it exists
-CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/config/network_config.env"
+CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/inventory.env"
 if [ -f "$CONFIG_PATH" ]; then
     echo "⚙️  Loading network configuration from $CONFIG_PATH..."
-    # Export variables from .env file (ignoring comments and empty lines)
+    # Export variables from inventory.env file (ignoring comments and empty lines)
     export $(grep -v '^#' "$CONFIG_PATH" | xargs)
 fi