V1 2 7 initial merge into dev branch for deployment testing

.github/workflows/code_quality.yml

@@ -0,0 +1,24 @@
+name: Code quality
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+
+      - name: Setup Biome
+        uses: biomejs/setup-biome@v2
+        with:
+          version: latest
+
+      - name: Run Biome
+        run: biome ci .

.gitignore

@@ -145,4 +145,4 @@ setup-installer-site.sh
 install-server.*
 notify-clients-upgrade.sh
 debug-agent.sh
-docker/agents
+docker/compose_dev_data

README.md

@@ -68,10 +68,30 @@ For getting started with Docker, see the [Docker documentation](https://github.c
 
 Run on a clean Ubuntu/Debian server with internet access:
 
+#### Debian:
+```bash
+apt update -y
+apt upgrade -y
+apt install curl -y
+```
+
+#### Ubuntu:
+```bash
+apt-get update -y
+apt-get upgrade -y
+apt install curl -y
+```
+
+#### Script
 ```bash
 curl -fsSL -o setup.sh https://raw.githubusercontent.com/9technologygroup/patchmon.net/main/setup.sh && chmod +x setup.sh && bash setup.sh
 ```
 
+#### Minimum specs for building : #####
+CPU : 2 vCPU
+RAM : 2GB
+Disk : 15GB
+
 During setup you’ll be asked:
 - Domain/IP: public DNS or local IP (default: `patchmon.internal`)
 - SSL/HTTPS: `y` for public deployments with a public IP, `n` for internal networks
@@ -157,14 +177,19 @@ We welcome contributions from the community! Here's how you can get involved:
    git checkout -b fix/your-bug-fix
    ```
 
+4. **Install Dependencies and Setup Hooks**
+   ```bash
+   npm install
+   npm run prepare
+   ```
 
-4. **Make Your Changes**
+5. **Make Your Changes**
    - Write clean, well-documented code
    - Follow existing code style and patterns
    - Add tests for new functionality
    - Update documentation as needed
 
-5. **Test Your Changes**
+6. **Test Your Changes**
    ```bash
    # Run backend tests
    cd backend
@@ -175,21 +200,21 @@ We welcome contributions from the community! Here's how you can get involved:
    npm test
    ```
 
-6. **Commit and Push**
+7. **Commit and Push**
    ```bash
    git add .
    git commit -m "Add: descriptive commit message"
    git push origin feature/your-feature-name
    ```
 
-7. **Create a Pull Request**
+8. **Create a Pull Request**
    - Go to your fork on GitHub
    - Click "New Pull Request"
    - Provide a clear description of your changes
    - Link any related issues
 
 ### Contribution Guidelines
-- **Code Style**: Follow the existing code patterns and ESLint configuration
+- **Code Style**: Follow the existing code patterns and Biome configuration
 - **Commits**: Use conventional commit messages (feat:, fix:, docs:, etc.)
 - **Testing**: Ensure all tests pass and add tests for new features
 - **Documentation**: Update README and code comments as needed

agents/patchmon-agent.sh

@@ -550,33 +550,36 @@ get_apt_packages() {
     local -n packages_ref=$1
     local -n first_ref=$2
 
-    # Update package lists
+    # Update package lists (use apt-get for older distros; quieter output)
     apt-get update -qq
 
-    # Get upgradable packages
-    local upgradable=$(apt list --upgradable 2>/dev/null | grep -v "WARNING")
+    # Determine upgradable packages using apt-get simulation (compatible with Ubuntu 18.04)
+    # Example line format:
+    # Inst bash [4.4.18-2ubuntu1] (4.4.18-2ubuntu1.2 Ubuntu:18.04/bionic-updates [amd64])
+    local upgradable_sim=$(apt-get -s -o Debug::NoLocking=1 upgrade 2>/dev/null | grep "^Inst ")
 
     while IFS= read -r line; do
-        if [[ "$line" =~ ^([^/]+)/([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+.*[[:space:]]([^[:space:]]+)[[:space:]]*(\[.*\])? ]]; then
+        # Extract package name, current version (in brackets), and available version (first token inside parentheses)
+        if [[ "$line" =~ ^Inst[[:space:]]+([^[:space:]]+)[[:space:]]+\[([^\]]+)\][[:space:]]+\(([^[:space:]]+) ]]; then
             local package_name="${BASH_REMATCH[1]}"
-            local current_version="${BASH_REMATCH[4]}"
+            local current_version="${BASH_REMATCH[2]}"
             local available_version="${BASH_REMATCH[3]}"
             local is_security_update=false
 
-            # Check if it's a security update
-            if echo "$line" | grep -q "security"; then
+            # Mark as security update if the line references a security pocket
+            if echo "$line" | grep -qiE "(-|/)security"; then
                 is_security_update=true
             fi
 
             if [[ "$first_ref" == true ]]; then
                 first_ref=false
             else
-                packages_ref+=","
+                packages_ref+="," 
             fi
 
             packages_ref+="{\"name\":\"$package_name\",\"currentVersion\":\"$current_version\",\"availableVersion\":\"$available_version\",\"needsUpdate\":true,\"isSecurityUpdate\":$is_security_update}"
         fi
-    done <<< "$upgradable"
+    done <<< "$upgradable_sim"
 
     # Get installed packages that are up to date
     local installed=$(dpkg-query -W -f='${Package} ${Version}\n' | head -100)
@@ -818,7 +821,7 @@ EOF
             success "Update sent successfully"
             echo "$response" | grep -o '"packagesProcessed":[0-9]*' | cut -d':' -f2 | xargs -I {} info "Processed {} packages"
 
-            # Check for auto-update instructions (look specifically in autoUpdate section)
+            # Check for PatchMon agent update instructions (this updates the agent script, not system packages)
             if echo "$response" | grep -q '"autoUpdate":{'; then
                 local auto_update_section=$(echo "$response" | grep -o '"autoUpdate":{[^}]*}')
                 local should_update=$(echo "$auto_update_section" | grep -o '"shouldUpdate":true' | cut -d':' -f2)
@@ -827,15 +830,15 @@ EOF
                     local current_version=$(echo "$auto_update_section" | grep -o '"currentVersion":"[^"]*' | cut -d'"' -f4)
                     local update_message=$(echo "$auto_update_section" | grep -o '"message":"[^"]*' | cut -d'"' -f4)
 
-                    info "Auto-update detected: $update_message"
+                    info "PatchMon agent update detected: $update_message"
                     info "Current version: $current_version, Latest version: $latest_version"
 
-                    # Automatically run update-agent command
-                    info "Automatically updating agent to latest version..."
+                    # Automatically run update-agent command to update the PatchMon agent script
+                    info "Automatically updating PatchMon agent to latest version..."
                     if "$0" update-agent; then
-                        success "Agent auto-update completed successfully"
+                        success "PatchMon agent update completed successfully"
                     else
-                        warning "Agent auto-update failed, but data was sent successfully"
+                        warning "PatchMon agent update failed, but data was sent successfully"
                     fi
                 fi
             fi

agents/patchmon_install.sh

@@ -158,14 +158,24 @@ else
     warning "Initial package data failed, but agent is configured. You can run 'patchmon-agent.sh update' manually."
 fi
 
-# Setup crontab for automatic updates
-info "⏰ Setting up automatic updates every $UPDATE_INTERVAL minutes..."
+# Setup crontab for automatic package status updates
+info "⏰ Setting up automatic package status update every $UPDATE_INTERVAL minutes..."
+
+# Check if patchmon cron job already exists
+PATCHMON_CRON_EXISTS=$(crontab -l 2>/dev/null | grep -c "patchmon-agent.sh update" || true)
+
+if [[ $PATCHMON_CRON_EXISTS -gt 0 ]]; then
+    info "   Existing PatchMon cron job found, removing old entry..."
+    # Remove existing patchmon cron entries and preserve other entries
+    (crontab -l 2>/dev/null | grep -v "patchmon-agent.sh update") | crontab -
+fi
+
 if [[ $UPDATE_INTERVAL -eq 60 ]]; then
-    # Hourly updates
-    echo "0 * * * * /usr/local/bin/patchmon-agent.sh update >/dev/null 2>&1" | crontab -
+    # Hourly updates - safely append to existing crontab
+    (crontab -l 2>/dev/null; echo "0 * * * * /usr/local/bin/patchmon-agent.sh update >/dev/null 2>&1") | crontab -
 else
-    # Custom interval updates
-    echo "*/$UPDATE_INTERVAL * * * * /usr/local/bin/patchmon-agent.sh update >/dev/null 2>&1" | crontab -
+    # Custom interval updates - safely append to existing crontab
+    (crontab -l 2>/dev/null; echo "*/$UPDATE_INTERVAL * * * * /usr/local/bin/patchmon-agent.sh update >/dev/null 2>&1") | crontab -
 fi
 
 success "🎉 PatchMon Agent installation complete!"
@@ -179,8 +189,8 @@ if [[ "$EXPECTED_VERSION" != "Unknown" ]]; then
 fi
 echo "   • Config directory: /etc/patchmon/"
 echo "   • Credentials file: /etc/patchmon/credentials"
-echo "   • Automatic updates: Every $UPDATE_INTERVAL minutes via crontab"
-echo "   • View logs: tail -f /var/log/patchmon-agent.sh"
+echo "   • Status updates: Every $UPDATE_INTERVAL minutes via crontab"
+echo "   • View logs: tail -f /var/log/patchmon-agent.log"
 echo ""
 echo "🔧 Manual commands:"
 echo "   • Test connection: patchmon-agent.sh test"

backend/package.json

@@ -1,38 +1,40 @@
 {
-  "name": "patchmon-backend",
-  "version": "1.2.6",
-  "description": "Backend API for Linux Patch Monitoring System",
-  "main": "src/server.js",
-  "scripts": {
-    "dev": "nodemon src/server.js",
-    "start": "node src/server.js",
-    "build": "echo 'No build step needed for Node.js'",
-    "db:generate": "prisma generate",
-    "db:migrate": "prisma migrate dev",
-    "db:push": "prisma db push",
-    "db:studio": "prisma studio"
-  },
-  "dependencies": {
-    "@prisma/client": "^5.7.0",
-    "bcryptjs": "^2.4.3",
-    "cors": "^2.8.5",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
-    "express-rate-limit": "^7.1.5",
-    "express-validator": "^7.0.1",
-    "helmet": "^7.1.0",
-    "jsonwebtoken": "^9.0.2",
-    "moment": "^2.30.1",
-    "qrcode": "^1.5.4",
-    "speakeasy": "^2.0.0",
-    "uuid": "^9.0.1",
-    "winston": "^3.11.0"
-  },
-  "devDependencies": {
-    "nodemon": "^3.0.2",
-    "prisma": "^5.7.0"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
+	"name": "patchmon-backend",
+	"version": "1.2.6",
+	"description": "Backend API for Linux Patch Monitoring System",
+	"license": "AGPL-3.0",
+	"main": "src/server.js",
+	"scripts": {
+		"dev": "nodemon src/server.js",
+		"start": "node src/server.js",
+		"build": "echo 'No build step needed for Node.js'",
+		"db:generate": "prisma generate",
+		"db:migrate": "prisma migrate dev",
+		"db:push": "prisma db push",
+		"db:studio": "prisma studio"
+	},
+	"dependencies": {
+		"@prisma/client": "^6.1.0",
+		"bcryptjs": "^2.4.3",
+		"cors": "^2.8.5",
+		"dotenv": "^16.4.7",
+		"express": "^4.21.2",
+		"express-rate-limit": "^7.5.0",
+		"express-validator": "^7.2.0",
+		"helmet": "^8.0.0",
+		"jsonwebtoken": "^9.0.2",
+		"moment": "^2.30.1",
+		"qrcode": "^1.5.4",
+		"speakeasy": "^2.0.0",
+		"uuid": "^11.0.3",
+		"winston": "^3.17.0"
+	},
+	"devDependencies": {
+		"@types/bcryptjs": "^2.4.6",
+		"nodemon": "^3.1.9",
+		"prisma": "^6.1.0"
+	},
+	"engines": {
+		"node": ">=18.0.0"
+	}
 }