Compare commits
No commits in common. "main" and "v1.0.77" have entirely different histories.
12
.replit
12
.replit
@ -14,6 +14,18 @@ run = ["npm", "run", "start"]
|
|||||||
localPort = 5000
|
localPort = 5000
|
||||||
externalPort = 80
|
externalPort = 80
|
||||||
|
|
||||||
|
[[ports]]
|
||||||
|
localPort = 41303
|
||||||
|
externalPort = 3002
|
||||||
|
|
||||||
|
[[ports]]
|
||||||
|
localPort = 43471
|
||||||
|
externalPort = 3003
|
||||||
|
|
||||||
|
[[ports]]
|
||||||
|
localPort = 43803
|
||||||
|
externalPort = 3000
|
||||||
|
|
||||||
[env]
|
[env]
|
||||||
PORT = "5000"
|
PORT = "5000"
|
||||||
|
|
||||||
|
|||||||
@ -1,311 +0,0 @@
|
|||||||
# Fix Connessione MikroTik API
|
|
||||||
|
|
||||||
## 🐛 PROBLEMA RISOLTO
|
|
||||||
|
|
||||||
**Errore**: Timeout connessione API MikroTik - router non rispondeva a richieste HTTP.
|
|
||||||
|
|
||||||
**Causa Root**: Confusione tra **API Binary** (porta 8728) e **API REST** (porta 80/443).
|
|
||||||
|
|
||||||
## 🔍 API MikroTik: Binary vs REST
|
|
||||||
|
|
||||||
MikroTik RouterOS ha **DUE tipi di API completamente diversi**:
|
|
||||||
|
|
||||||
| Tipo | Porta | Protocollo | RouterOS | Compatibilità |
|
|
||||||
|------|-------|------------|----------|---------------|
|
|
||||||
| **Binary API** | 8728 | Proprietario RouterOS | Tutte | ❌ Non HTTP (libreria `routeros-api`) |
|
|
||||||
| **REST API** | 80/443 | HTTP/HTTPS standard | **>= 7.1** | ✅ HTTP con `httpx` |
|
|
||||||
|
|
||||||
**IDS usa REST API** (httpx + HTTP), quindi:
|
|
||||||
- ✅ **Porta 80** (HTTP) - **CONSIGLIATA**
|
|
||||||
- ✅ **Porta 443** (HTTPS) - Se necessario SSL
|
|
||||||
- ❌ **Porta 8728** - API Binary, NON REST (timeout)
|
|
||||||
- ❌ **Porta 8729** - API Binary SSL, NON REST (timeout)
|
|
||||||
|
|
||||||
## ✅ SOLUZIONE
|
|
||||||
|
|
||||||
### 1️⃣ Verifica RouterOS Versione
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Sul router MikroTik (via Winbox/SSH)
|
|
||||||
/system resource print
|
|
||||||
```
|
|
||||||
|
|
||||||
**Se RouterOS >= 7.1** → Usa **REST API** (porta 80/443)
|
|
||||||
**Se RouterOS < 7.1** → REST API non esiste, usa API Binary
|
|
||||||
|
|
||||||
### 2️⃣ Configurazione Porta Corretta
|
|
||||||
|
|
||||||
**Per RouterOS 7.14.2 (Alfabit):**
|
|
||||||
|
|
||||||
```sql
|
|
||||||
-- Database: Usa porta 80 (REST API HTTP)
|
|
||||||
UPDATE routers SET api_port = 80 WHERE name = 'Alfabit';
|
|
||||||
```
|
|
||||||
|
|
||||||
**Porte disponibili**:
|
|
||||||
- **80** → REST API HTTP (✅ CONSIGLIATA)
|
|
||||||
- **443** → REST API HTTPS (se SSL richiesto)
|
|
||||||
- ~~8728~~ → API Binary (non compatibile)
|
|
||||||
- ~~8729~~ → API Binary SSL (non compatibile)
|
|
||||||
|
|
||||||
### 3️⃣ Test Manuale
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Test connessione porta 80
|
|
||||||
curl http://185.203.24.2:80/rest/system/identity \
|
|
||||||
-u admin:password \
|
|
||||||
--max-time 5
|
|
||||||
|
|
||||||
# Output atteso:
|
|
||||||
# {"name":"AlfaBit"}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 VERIFICA CONFIGURAZIONE ROUTER
|
|
||||||
|
|
||||||
### 1️⃣ Controlla Database
|
|
||||||
|
|
||||||
```sql
|
|
||||||
-- Su AlmaLinux
|
|
||||||
psql $DATABASE_URL -c "SELECT name, ip_address, api_port, username, enabled FROM routers WHERE enabled = true;"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Output Atteso**:
|
|
||||||
```
|
|
||||||
name | ip_address | api_port | username | enabled
|
|
||||||
--------------+---------------+----------+----------+---------
|
|
||||||
Alfabit | 185.203.24.2 | 80 | admin | t
|
|
||||||
```
|
|
||||||
|
|
||||||
**Verifica**:
|
|
||||||
- ✅ `api_port` = **80** (REST API HTTP)
|
|
||||||
- ✅ `enabled` = **true**
|
|
||||||
- ✅ `username` e `password` corretti
|
|
||||||
|
|
||||||
**Se porta errata**:
|
|
||||||
```sql
|
|
||||||
-- Cambia porta da 8728 a 80
|
|
||||||
UPDATE routers SET api_port = 80 WHERE ip_address = '185.203.24.2';
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2️⃣ Testa Connessione Python
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Su AlmaLinux
|
|
||||||
cd /opt/ids/python_ml
|
|
||||||
source venv/bin/activate
|
|
||||||
|
|
||||||
# Test connessione automatico (usa dati dal database)
|
|
||||||
python3 test_mikrotik_connection.py
|
|
||||||
```
|
|
||||||
|
|
||||||
**Output atteso**:
|
|
||||||
```
|
|
||||||
✅ Connessione OK!
|
|
||||||
✅ Trovati X IP in lista 'ddos_blocked'
|
|
||||||
✅ IP bloccato con successo!
|
|
||||||
✅ IP sbloccato con successo!
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🚀 DEPLOYMENT SU ALMALINUX
|
|
||||||
|
|
||||||
### Workflow Completo
|
|
||||||
|
|
||||||
#### 1️⃣ **Su Replit** (GIÀ FATTO ✅)
|
|
||||||
- File `python_ml/mikrotik_manager.py` modificato
|
|
||||||
- Fix già committato su Replit
|
|
||||||
|
|
||||||
#### 2️⃣ **Locale - Push GitLab**
|
|
||||||
```bash
|
|
||||||
# Dalla tua macchina locale (NON su Replit - è bloccato)
|
|
||||||
./push-gitlab.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
Input richiesti:
|
|
||||||
```
|
|
||||||
Commit message: Fix MikroTik API - porta non usata in base_url
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 3️⃣ **Su AlmaLinux - Pull & Deploy**
|
|
||||||
```bash
|
|
||||||
# SSH su ids.alfacom.it
|
|
||||||
ssh root@ids.alfacom.it
|
|
||||||
|
|
||||||
# Pull ultimi cambiamenti
|
|
||||||
cd /opt/ids
|
|
||||||
./update_from_git.sh
|
|
||||||
|
|
||||||
# Riavvia ML Backend per applicare fix
|
|
||||||
sudo systemctl restart ids-ml-backend
|
|
||||||
|
|
||||||
# Verifica servizio attivo
|
|
||||||
systemctl status ids-ml-backend
|
|
||||||
|
|
||||||
# Verifica API risponde
|
|
||||||
curl http://localhost:8000/health
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 4️⃣ **Test Blocco IP**
|
|
||||||
```bash
|
|
||||||
# Dalla dashboard web: https://ids.alfacom.it/routers
|
|
||||||
# 1. Verifica router configurati
|
|
||||||
# 2. Clicca "Test Connessione" su router 185.203.24.2
|
|
||||||
# 3. Dovrebbe mostrare ✅ "Connessione OK"
|
|
||||||
|
|
||||||
# Dalla dashboard detections:
|
|
||||||
# 1. Seleziona detection con score >= 80
|
|
||||||
# 2. Clicca "Blocca IP"
|
|
||||||
# 3. Verifica blocco su router
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔧 TROUBLESHOOTING
|
|
||||||
|
|
||||||
### Connessione Ancora Fallisce?
|
|
||||||
|
|
||||||
#### A. Verifica Servizio WWW su Router
|
|
||||||
|
|
||||||
**REST API usa servizio `www` (porta 80) o `www-ssl` (porta 443)**:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Sul router MikroTik (via Winbox/SSH)
|
|
||||||
/ip service print
|
|
||||||
|
|
||||||
# Verifica che www sia enabled:
|
|
||||||
# 0 www 80 * ← REST API HTTP
|
|
||||||
# 1 www-ssl 443 * ← REST API HTTPS
|
|
||||||
```
|
|
||||||
|
|
||||||
**Fix su MikroTik**:
|
|
||||||
```bash
|
|
||||||
# Abilita servizio www per REST API
|
|
||||||
/ip service enable www
|
|
||||||
/ip service set www port=80 address=0.0.0.0/0
|
|
||||||
|
|
||||||
# O con SSL (porta 443)
|
|
||||||
/ip service enable www-ssl
|
|
||||||
/ip service set www-ssl port=443
|
|
||||||
```
|
|
||||||
|
|
||||||
**NOTA**: `api` (porta 8728) è **API Binary**, NON REST!
|
|
||||||
|
|
||||||
#### B. Verifica Firewall AlmaLinux
|
|
||||||
```bash
|
|
||||||
# Su AlmaLinux - consenti traffico verso router
|
|
||||||
sudo firewall-cmd --permanent --add-rich-rule='rule family="ipv4" destination address="185.203.24.2" port protocol="tcp" port="8728" accept'
|
|
||||||
sudo firewall-cmd --reload
|
|
||||||
```
|
|
||||||
|
|
||||||
#### C. Test Connessione Raw
|
|
||||||
```bash
|
|
||||||
# Test TCP connessione porta 80
|
|
||||||
telnet 185.203.24.2 80
|
|
||||||
|
|
||||||
# Test REST API con curl
|
|
||||||
curl -v http://185.203.24.2:80/rest/system/identity \
|
|
||||||
-u admin:password \
|
|
||||||
--max-time 5
|
|
||||||
|
|
||||||
# Output atteso:
|
|
||||||
# {"name":"AlfaBit"}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Se timeout**: Servizio `www` non abilitato sul router
|
|
||||||
|
|
||||||
#### D. Credenziali Errate?
|
|
||||||
```sql
|
|
||||||
-- Verifica credenziali nel database
|
|
||||||
psql $DATABASE_URL -c "SELECT name, ip_address, username FROM routers WHERE ip_address = '185.203.24.2';"
|
|
||||||
|
|
||||||
-- Se password errata, aggiorna:
|
|
||||||
-- UPDATE routers SET password = 'nuova_password' WHERE ip_address = '185.203.24.2';
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ VERIFICA FINALE
|
|
||||||
|
|
||||||
Dopo il deployment, verifica che:
|
|
||||||
|
|
||||||
1. **ML Backend attivo**:
|
|
||||||
```bash
|
|
||||||
systemctl status ids-ml-backend # must be "active (running)"
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **API risponde**:
|
|
||||||
```bash
|
|
||||||
curl http://localhost:8000/health
|
|
||||||
# {"status":"healthy","database":"connected",...}
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Auto-blocking funziona**:
|
|
||||||
```bash
|
|
||||||
# Controlla log auto-blocking
|
|
||||||
journalctl -u ids-auto-block.timer -n 50
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **IP bloccati su router**:
|
|
||||||
- Dashboard: https://ids.alfacom.it/detections
|
|
||||||
- Filtra: "Bloccati"
|
|
||||||
- Verifica badge verde "Bloccato" visibile
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 CONFIGURAZIONE CORRETTA
|
|
||||||
|
|
||||||
| Parametro | Valore (RouterOS >= 7.1) | Note |
|
|
||||||
|-----------|--------------------------|------|
|
|
||||||
| **api_port** | **80** (HTTP) o **443** (HTTPS) | ✅ REST API |
|
|
||||||
| **Servizio Router** | `www` (HTTP) o `www-ssl` (HTTPS) | Abilita su MikroTik |
|
|
||||||
| **Endpoint** | `/rest/system/identity` | Test connessione |
|
|
||||||
| **Endpoint** | `/rest/ip/firewall/address-list` | Gestione blocchi |
|
|
||||||
| **Auth** | Basic (username:password base64) | Header Authorization |
|
|
||||||
| **Verify SSL** | False | Self-signed certs OK |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎯 RIEPILOGO
|
|
||||||
|
|
||||||
### ❌ ERRATO (API Binary - Timeout)
|
|
||||||
```bash
|
|
||||||
# Porta 8728 usa protocollo BINARIO, non HTTP REST
|
|
||||||
curl http://185.203.24.2:8728/rest/...
|
|
||||||
# Timeout: protocollo incompatibile
|
|
||||||
```
|
|
||||||
|
|
||||||
### ✅ CORRETTO (API REST - Funziona)
|
|
||||||
```bash
|
|
||||||
# Porta 80 usa protocollo HTTP REST standard
|
|
||||||
curl http://185.203.24.2:80/rest/system/identity \
|
|
||||||
-u admin:password
|
|
||||||
|
|
||||||
# Output: {"name":"AlfaBit"}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Database configurato**:
|
|
||||||
```sql
|
|
||||||
-- Router Alfabit configurato con porta 80
|
|
||||||
SELECT name, ip_address, api_port FROM routers;
|
|
||||||
-- Alfabit | 185.203.24.2 | 80
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📝 CHANGELOG
|
|
||||||
|
|
||||||
**25 Novembre 2024**:
|
|
||||||
1. ✅ Identificato problema: porta 8728 = API Binary (non HTTP)
|
|
||||||
2. ✅ Verificato RouterOS 7.14.2 supporta REST API
|
|
||||||
3. ✅ Configurato router con porta 80 (REST API HTTP)
|
|
||||||
4. ✅ Test curl manuale: `{"name":"AlfaBit"}` ✅
|
|
||||||
5. ✅ Router inserito in database con porta 80
|
|
||||||
|
|
||||||
**Test richiesto**: `python3 test_mikrotik_connection.py`
|
|
||||||
|
|
||||||
**Versione**: IDS 2.0.0 (Hybrid Detector)
|
|
||||||
**RouterOS**: 7.14.2 (stable)
|
|
||||||
**API Type**: REST (HTTP porta 80)
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
journalctl -u ids-list-fetcher -n 50 --no-pager
|
|
||||||
Jan 02 15:30:01 ids.alfacom.it ids-list-fetcher[9296]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 15:30:01 ids.alfacom.it ids-list-fetcher[9296]: ============================================================
|
|
||||||
Jan 02 15:30:01 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 15:30:01 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it systemd[1]: Starting IDS Public Lists Fetcher Service...
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: [2026-01-02 15:40:00] PUBLIC LISTS SYNC
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: Found 2 enabled lists
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: [15:40:00] Downloading Spamhaus from https://www.spamhaus.org/drop/drop_v4.json...
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: [15:40:00] Downloading AWS from https://ip-ranges.amazonaws.com/ip-ranges.json...
|
|
||||||
Jan 02 15:40:00 ids.alfacom.it ids-list-fetcher[9493]: [15:40:00] Parsing AWS...
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: [15:40:01] Found 9548 IPs, syncing to database...
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: [15:40:01] ✓ AWS: +0 -0 ~9511
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: [15:40:01] Parsing Spamhaus...
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: [15:40:01] Found 1468 IPs, syncing to database...
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: [15:40:01] ✓ Spamhaus: +0 -0 ~1464
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: SYNC SUMMARY
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Success: 2/2
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Errors: 0/2
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Total IPs Added: 0
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Total IPs Removed: 0
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: RUNNING MERGE LOGIC
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ERROR:merge_logic:Failed to cleanup detections: operator does not exist: inet = text
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: LINE 9: d.source_ip::inet = wl.ip_inet
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ^
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ERROR:merge_logic:Failed to sync detections: operator does not exist: inet = text
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: LINE 29: bl.ip_inet = wl.ip_inet
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ^
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Traceback (most recent call last):
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: File "/opt/ids/python_ml/merge_logic.py", line 264, in sync_public_blacklist_detections
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: cur.execute("""
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: psycopg2.errors.UndefinedFunction: operator does not exist: inet = text
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: LINE 29: bl.ip_inet = wl.ip_inet
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ^
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Merge Logic Stats:
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Created detections: 0
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it ids-list-fetcher[9493]: ============================================================
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 15:40:01 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
journalctl -u ids-list-fetcher -n 50 --no-pager
|
|
||||||
Jan 02 17:10:02 ids.alfacom.it ids-list-fetcher[2139]: ============================================================
|
|
||||||
Jan 02 17:10:02 ids.alfacom.it ids-list-fetcher[2139]: ============================================================
|
|
||||||
Jan 02 17:10:02 ids.alfacom.it ids-list-fetcher[2139]: RUNNING MERGE LOGIC
|
|
||||||
Jan 02 17:10:02 ids.alfacom.it ids-list-fetcher[2139]: ============================================================
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it ids-list-fetcher[2139]: INFO:merge_logic:Bulk sync complete: {'created': 0, 'cleaned': 0, 'skipped_whitelisted': 0}
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it ids-list-fetcher[2139]: Merge Logic Stats:
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it ids-list-fetcher[2139]: Created detections: 0
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it ids-list-fetcher[2139]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it ids-list-fetcher[2139]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it ids-list-fetcher[2139]: ============================================================
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 17:10:12 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it systemd[1]: Starting IDS Public Lists Fetcher Service...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [2026-01-02 17:12:35] PUBLIC LISTS SYNC
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: Found 4 enabled lists
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Downloading Spamhaus from https://www.spamhaus.org/drop/drop_v4.json...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Downloading AWS from https://ip-ranges.amazonaws.com/ip-ranges.json...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Downloading Google Cloud from https://www.gstatic.com/ipranges/cloud.json...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Downloading Google globali from https://www.gstatic.com/ipranges/goog.json...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Parsing AWS...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Found 9548 IPs, syncing to database...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] ✓ AWS: +0 -0 ~9548
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Parsing Google globali...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] ✗ Google globali: No valid IPs found in list
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Parsing Google Cloud...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] ✗ Google Cloud: No valid IPs found in list
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Parsing Spamhaus...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] Found 1468 IPs, syncing to database...
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: [17:12:35] ✓ Spamhaus: +0 -0 ~1468
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: SYNC SUMMARY
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: Success: 2/4
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: Errors: 2/4
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: Total IPs Added: 0
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: Total IPs Removed: 0
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: RUNNING MERGE LOGIC
|
|
||||||
Jan 02 17:12:35 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it ids-list-fetcher[2279]: INFO:merge_logic:Bulk sync complete: {'created': 0, 'cleaned': 0, 'skipped_whitelisted': 0}
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it ids-list-fetcher[2279]: Merge Logic Stats:
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it ids-list-fetcher[2279]: Created detections: 0
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it ids-list-fetcher[2279]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it ids-list-fetcher[2279]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it ids-list-fetcher[2279]: ============================================================
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 17:12:45 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
tail -f /var/log/ids/ml_backend.log
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
Starting IDS API on http://0.0.0.0:8000
|
|
||||||
Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: 127.0.0.1:45342 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:49754 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:50634 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:39232 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:35736 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:37462 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:59676 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:34256 - "GET /health HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:34256 - "GET /services/status HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:34256 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
INFO: 127.0.0.1:34264 - "POST /train HTTP/1.1" 200 OK
|
|
||||||
[TRAIN] Inizio training...
|
|
||||||
INFO: 127.0.0.1:34264 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
[TRAIN] Trovati 100000 log per training
|
|
||||||
[TRAIN] Addestramento modello...
|
|
||||||
[TRAIN] Using Hybrid ML Detector
|
|
||||||
[HYBRID] Training hybrid model on 100000 logs...
|
|
||||||
INFO: 127.0.0.1:41612 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
Traceback (most recent call last):
|
|
||||||
File "/opt/ids/python_ml/main.py", line 201, in do_training
|
|
||||||
result = ml_detector.train_unsupervised(df)
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
File "/opt/ids/python_ml/ml_hybrid_detector.py", line 467, in train_unsupervised
|
|
||||||
self.save_models()
|
|
||||||
File "/opt/ids/python_ml/ml_hybrid_detector.py", line 658, in save_models
|
|
||||||
joblib.dump(self.ensemble_classifier, self.model_dir / "ensemble_classifier_latest.pkl")
|
|
||||||
File "/opt/ids/python_ml/venv/lib64/python3.11/site-packages/joblib/numpy_pickle.py", line 552, in dump
|
|
||||||
with open(filename, 'wb') as f:
|
|
||||||
^^^^^^^^^^^^^^^^^^^^
|
|
||||||
PermissionError: [Errno 13] Permission denied: 'models/ensemble_classifier_latest.pkl'
|
|
||||||
[HYBRID] Extracted features for 1430 unique IPs
|
|
||||||
[HYBRID] Pre-training Isolation Forest for feature selection...
|
|
||||||
[HYBRID] Generated 43 pseudo-anomalies from pre-training IF
|
|
||||||
[HYBRID] Feature selection: 25 → 18 features
|
|
||||||
[HYBRID] Selected features: total_packets, total_bytes, conn_count, avg_packet_size, bytes_per_second... (+13 more)
|
|
||||||
[HYBRID] Normalizing features...
|
|
||||||
[HYBRID] Training Extended Isolation Forest (contamination=0.03)...
|
|
||||||
[HYBRID] Generating pseudo-labels from Isolation Forest...
|
|
||||||
[HYBRID] Pseudo-labels: 43 anomalies, 1387 normal
|
|
||||||
[HYBRID] Training ensemble classifier (DT + RF + XGBoost)...
|
|
||||||
[HYBRID] Class distribution OK: [0 1] (counts: [1387 43])
|
|
||||||
[HYBRID] Ensemble .fit() completed successfully
|
|
||||||
[HYBRID] ✅ Ensemble verified: produces 2 class probabilities
|
|
||||||
[HYBRID] Ensemble training completed and verified!
|
|
||||||
[TRAIN ERROR] ❌ Errore durante training: [Errno 13] Permission denied: 'models/ensemble_classifier_latest.pkl'
|
|
||||||
INFO: 127.0.0.1:45694 - "GET /stats HTTP/1.1" 200 OK
|
|
||||||
^C
|
|
||||||
(venv) [root@ids python_ml]# ls models/
|
|
||||||
ensemble_classifier_20251124_185541.pkl feature_names.json feature_selector_latest.pkl isolation_forest_20251125_183830.pkl scaler_20251124_192122.pkl
|
|
||||||
ensemble_classifier_20251124_185920.pkl feature_selector_20251124_185541.pkl isolation_forest.joblib isolation_forest_latest.pkl scaler_20251125_090356.pkl
|
|
||||||
ensemble_classifier_20251124_192109.pkl feature_selector_20251124_185920.pkl isolation_forest_20251124_185541.pkl metadata_20251124_185541.json scaler_20251125_092703.pkl
|
|
||||||
ensemble_classifier_20251124_192122.pkl feature_selector_20251124_192109.pkl isolation_forest_20251124_185920.pkl metadata_20251124_185920.json scaler_20251125_120016.pkl
|
|
||||||
ensemble_classifier_20251125_090356.pkl feature_selector_20251124_192122.pkl isolation_forest_20251124_192109.pkl metadata_20251124_192109.json scaler_20251125_181945.pkl
|
|
||||||
ensemble_classifier_20251125_092703.pkl feature_selector_20251125_090356.pkl isolation_forest_20251124_192122.pkl metadata_20251124_192122.json scaler_20251125_182742.pkl
|
|
||||||
ensemble_classifier_20251125_120016.pkl feature_selector_20251125_092703.pkl isolation_forest_20251125_090356.pkl metadata_20251125_092703.json scaler_20251125_183049.pkl
|
|
||||||
ensemble_classifier_20251125_181945.pkl feature_selector_20251125_120016.pkl isolation_forest_20251125_092703.pkl metadata_latest.json scaler_20251125_183830.pkl
|
|
||||||
ensemble_classifier_20251125_182742.pkl feature_selector_20251125_181945.pkl isolation_forest_20251125_120016.pkl scaler.joblib scaler_latest.pkl
|
|
||||||
ensemble_classifier_20251125_183049.pkl feature_selector_20251125_182742.pkl isolation_forest_20251125_181945.pkl scaler_20251124_185541.pkl
|
|
||||||
ensemble_classifier_20251125_183830.pkl feature_selector_20251125_183049.pkl isolation_forest_20251125_182742.pkl scaler_20251124_185920.pkl
|
|
||||||
ensemble_classifier_latest.pkl feature_selector_20251125_183830.pkl isolation_forest_20251125_183049.pkl scaler_20251124_192109.pkl
|
|
||||||
(venv) [root@ids python_ml]#
|
|
||||||
@ -1,125 +0,0 @@
|
|||||||
cd /opt/ids/python_ml && source venv/bin/activate && python3 main.py
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
Starting IDS API on http://0.0.0.0:8000
|
|
||||||
Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108626]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
(venv) [root@ids python_ml]# ls -la /opt/ids/python_ml/models/
|
|
||||||
total 22896
|
|
||||||
drwxr-xr-x. 2 ids ids 4096 Nov 25 18:30 .
|
|
||||||
drwxr-xr-x. 6 ids ids 4096 Nov 25 12:53 ..
|
|
||||||
-rw-r--r--. 1 root root 235398 Nov 24 18:55 ensemble_classifier_20251124_185541.pkl
|
|
||||||
-rw-r--r--. 1 root root 231504 Nov 24 18:59 ensemble_classifier_20251124_185920.pkl
|
|
||||||
-rw-r--r--. 1 root root 1008222 Nov 24 19:21 ensemble_classifier_20251124_192109.pkl
|
|
||||||
-rw-r--r--. 1 root root 925566 Nov 24 19:21 ensemble_classifier_20251124_192122.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 200159 Nov 25 09:03 ensemble_classifier_20251125_090356.pkl
|
|
||||||
-rw-r--r--. 1 root root 806006 Nov 25 09:27 ensemble_classifier_20251125_092703.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 286079 Nov 25 12:00 ensemble_classifier_20251125_120016.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 398464 Nov 25 18:19 ensemble_classifier_20251125_181945.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 426790 Nov 25 18:27 ensemble_classifier_20251125_182742.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 423651 Nov 25 18:30 ensemble_classifier_20251125_183049.pkl
|
|
||||||
-rw-r--r--. 1 root root 806006 Nov 25 09:27 ensemble_classifier_latest.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 461 Nov 25 00:00 feature_names.json
|
|
||||||
-rw-r--r--. 1 root root 1695 Nov 24 18:55 feature_selector_20251124_185541.pkl
|
|
||||||
-rw-r--r--. 1 root root 1695 Nov 24 18:59 feature_selector_20251124_185920.pkl
|
|
||||||
-rw-r--r--. 1 root root 1695 Nov 24 19:21 feature_selector_20251124_192109.pkl
|
|
||||||
-rw-r--r--. 1 root root 1695 Nov 24 19:21 feature_selector_20251124_192122.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1695 Nov 25 09:03 feature_selector_20251125_090356.pkl
|
|
||||||
-rw-r--r--. 1 root root 1695 Nov 25 09:27 feature_selector_20251125_092703.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1695 Nov 25 12:00 feature_selector_20251125_120016.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1695 Nov 25 18:19 feature_selector_20251125_181945.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1695 Nov 25 18:27 feature_selector_20251125_182742.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1695 Nov 25 18:30 feature_selector_20251125_183049.pkl
|
|
||||||
-rw-r--r--. 1 root root 1695 Nov 25 09:27 feature_selector_latest.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 813592 Nov 25 00:00 isolation_forest.joblib
|
|
||||||
-rw-r--r--. 1 root root 1674808 Nov 24 18:55 isolation_forest_20251124_185541.pkl
|
|
||||||
-rw-r--r--. 1 root root 1642600 Nov 24 18:59 isolation_forest_20251124_185920.pkl
|
|
||||||
-rw-r--r--. 1 root root 1482984 Nov 24 19:21 isolation_forest_20251124_192109.pkl
|
|
||||||
-rw-r--r--. 1 root root 1465736 Nov 24 19:21 isolation_forest_20251124_192122.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1139256 Nov 25 09:03 isolation_forest_20251125_090356.pkl
|
|
||||||
-rw-r--r--. 1 root root 1428424 Nov 25 09:27 isolation_forest_20251125_092703.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1855240 Nov 25 12:00 isolation_forest_20251125_120016.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1519784 Nov 25 18:19 isolation_forest_20251125_181945.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1511688 Nov 25 18:27 isolation_forest_20251125_182742.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1559208 Nov 25 18:30 isolation_forest_20251125_183049.pkl
|
|
||||||
-rw-r--r--. 1 root root 1428424 Nov 25 09:27 isolation_forest_latest.pkl
|
|
||||||
-rw-r--r--. 1 root root 1661 Nov 24 18:55 metadata_20251124_185541.json
|
|
||||||
-rw-r--r--. 1 root root 1661 Nov 24 18:59 metadata_20251124_185920.json
|
|
||||||
-rw-r--r--. 1 root root 1675 Nov 24 19:21 metadata_20251124_192109.json
|
|
||||||
-rw-r--r--. 1 root root 1675 Nov 24 19:21 metadata_20251124_192122.json
|
|
||||||
-rw-r--r--. 1 root root 1675 Nov 25 09:27 metadata_20251125_092703.json
|
|
||||||
-rw-r--r--. 1 root root 1675 Nov 25 09:27 metadata_latest.json
|
|
||||||
-rw-r--r--. 1 ids ids 2015 Nov 25 00:00 scaler.joblib
|
|
||||||
-rw-r--r--. 1 root root 1047 Nov 24 18:55 scaler_20251124_185541.pkl
|
|
||||||
-rw-r--r--. 1 root root 1047 Nov 24 18:59 scaler_20251124_185920.pkl
|
|
||||||
-rw-r--r--. 1 root root 1047 Nov 24 19:21 scaler_20251124_192109.pkl
|
|
||||||
-rw-r--r--. 1 root root 1047 Nov 24 19:21 scaler_20251124_192122.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1047 Nov 25 09:03 scaler_20251125_090356.pkl
|
|
||||||
-rw-r--r--. 1 root root 1047 Nov 25 09:27 scaler_20251125_092703.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1047 Nov 25 12:00 scaler_20251125_120016.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1047 Nov 25 18:19 scaler_20251125_181945.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1047 Nov 25 18:27 scaler_20251125_182742.pkl
|
|
||||||
-rw-r--r--. 1 ids ids 1047 Nov 25 18:30 scaler_20251125_183049.pkl
|
|
||||||
-rw-r--r--. 1 root root 1047 Nov 25 09:27 scaler_latest.pkl
|
|
||||||
(venv) [root@ids python_ml]# tail -n 50 /var/log/ids/ml_backend.log
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108413]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108452]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108530]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
(venv) [root@ids python_ml]#
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
curl -X POST http://localhost:8000/detect \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"max_records": 5000, "hours_back": 1, "risk_threshold": 80, "auto_block": true}'
|
|
||||||
{"detections":[{"source_ip":"108.139.210.107","risk_score":98.55466848373413,"confidence_level":"high","action_recommendation":"auto_block","anomaly_type":"ddos","reason":"High connection rate: 403.7 conn/s","log_count":1211,"total_packets":1211,"total_bytes":2101702,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":95.0},{"source_ip":"216.58.209.54","risk_score":95.52801848493884,"confidence_level":"high","action_recommendation":"auto_block","anomaly_type":"brute_force","reason":"High connection rate: 184.7 conn/s","log_count":554,"total_packets":554,"total_bytes":782397,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":95.0},{"source_ip":"95.127.69.202","risk_score":93.58280514393482,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"brute_force","reason":"High connection rate: 93.7 conn/s","log_count":281,"total_packets":281,"total_bytes":369875,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":75.0},{"source_ip":"95.127.72.207","risk_score":92.50694363471318,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"brute_force","reason":"High connection rate: 76.3 conn/s","log_count":229,"total_packets":229,"total_bytes":293439,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":75.0},{"source_ip":"95.110.183.67","risk_score":86.42278405656512,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"brute_force","reason":"High connection rate: 153.0 conn/s","log_count":459,"total_packets":459,"total_bytes":20822,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":75.0},{"source_ip":"54.75.71.86","risk_score":83.42037059381207,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"brute_force","reason":"High connection rate: 58.0 conn/s","log_count":174,"total_packets":174,"total_bytes":25857,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":75.0},{"source_ip":"79.10.127.217","risk_score":82.32814469102843,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"brute_force","reason":"High connection rate: 70.0 conn/s","log_count":210,"total_packets":210,"total_bytes":18963,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":75.0},{"source_ip":"142.251.140.100","risk_score":76.61422108557721,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"botnet","reason":"Anomalous pattern detected (botnet)","log_count":16,"total_packets":16,"total_bytes":20056,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:53","confidence":75.0},{"source_ip":"142.250.181.161","risk_score":76.3802033958719,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"botnet","reason":"Anomalous pattern detected (botnet)","log_count":15,"total_packets":15,"total_bytes":5214,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:51","confidence":75.0},{"source_ip":"142.250.180.131","risk_score":72.7723405111559,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"suspicious","reason":"Anomalous pattern detected (suspicious)","log_count":8,"total_packets":8,"total_bytes":5320,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:53","confidence":75.0},{"source_ip":"157.240.231.60","risk_score":72.26853648050493,"confidence_level":"medium","action_recommendation":"manual_review","anomaly_type":"botnet","reason":"Anomalous pattern detected (botnet)","log_count":16,"total_packets":16,"total_bytes":4624,"first_seen":"2026-01-02T16:41:51","last_seen":"2026-01-02T16:41:54","confidence":75.0}],"total":11,"blocked":0,"message":"Trovate 11 anomalie"}[root@ids python_ml]#
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
journalctl -u ids-list-fetcher -n 50 --no-pager
|
|
||||||
Jan 02 12:50:02 ids.alfacom.it ids-list-fetcher[5900]: ============================================================
|
|
||||||
Jan 02 12:50:02 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 12:50:02 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it systemd[1]: Starting IDS Public Lists Fetcher Service...
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: [2026-01-02 12:54:56] PUBLIC LISTS SYNC
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: Found 2 enabled lists
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: [12:54:56] Downloading Spamhaus from https://www.spamhaus.org/drop/drop_v4.json...
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: [12:54:56] Downloading AWS from https://ip-ranges.amazonaws.com/ip-ranges.json...
|
|
||||||
Jan 02 12:54:56 ids.alfacom.it ids-list-fetcher[6290]: [12:54:56] Parsing AWS...
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: [12:54:57] Found 9548 IPs, syncing to database...
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: [12:54:57] ✓ AWS: +0 -0 ~9511
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: [12:54:57] Parsing Spamhaus...
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: [12:54:57] Found 1468 IPs, syncing to database...
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: [12:54:57] ✗ Spamhaus: ON CONFLICT DO UPDATE command cannot affect row a second time
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: HINT: Ensure that no rows proposed for insertion within the same command have duplicate constrained values.
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: SYNC SUMMARY
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Success: 1/2
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Errors: 1/2
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Total IPs Added: 0
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Total IPs Removed: 0
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: RUNNING MERGE LOGIC
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ERROR:merge_logic:Failed to cleanup detections: operator does not exist: inet = text
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: LINE 9: d.source_ip::inet = wl.ip_inet
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ^
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ERROR:merge_logic:Failed to sync detections: operator does not exist: text <<= text
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: LINE 30: OR bl.ip_inet <<= wl.ip_inet
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ^
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Traceback (most recent call last):
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: File "/opt/ids/python_ml/merge_logic.py", line 264, in sync_public_blacklist_detections
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: cur.execute("""
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: psycopg2.errors.UndefinedFunction: operator does not exist: text <<= text
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: LINE 30: OR bl.ip_inet <<= wl.ip_inet
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ^
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Merge Logic Stats:
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Created detections: 0
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it ids-list-fetcher[6290]: ============================================================
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 12:54:57 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
journalctl -u ids-list-fetcher -n 50 --no-pager
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it ids-list-fetcher[10401]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it ids-list-fetcher[10401]: Merge Logic Stats:
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it ids-list-fetcher[10401]: Created detections: 0
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it ids-list-fetcher[10401]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it ids-list-fetcher[10401]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it ids-list-fetcher[10401]: ============================================================
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 16:11:31 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it systemd[1]: Starting IDS Public Lists Fetcher Service...
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [2026-01-02 16:15:04] PUBLIC LISTS SYNC
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: Found 2 enabled lists
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [16:15:04] Downloading Spamhaus from https://www.spamhaus.org/drop/drop_v4.json...
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [16:15:04] Downloading AWS from https://ip-ranges.amazonaws.com/ip-ranges.json...
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [16:15:04] Parsing Spamhaus...
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [16:15:04] Found 1468 IPs, syncing to database...
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [16:15:04] ✓ Spamhaus: +0 -0 ~1468
|
|
||||||
Jan 02 16:15:04 ids.alfacom.it ids-list-fetcher[10801]: [16:15:04] Parsing AWS...
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: [16:15:05] Found 9548 IPs, syncing to database...
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: [16:15:05] ✓ AWS: +9548 -0 ~0
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: SYNC SUMMARY
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Success: 2/2
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Errors: 0/2
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Total IPs Added: 9548
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Total IPs Removed: 0
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: RUNNING MERGE LOGIC
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ERROR:merge_logic:Failed to sync detections: column "risk_score" is of type numeric but expression is of type text
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: LINE 13: '75',
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ^
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: HINT: You will need to rewrite or cast the expression.
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Traceback (most recent call last):
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: File "/opt/ids/python_ml/merge_logic.py", line 264, in sync_public_blacklist_detections
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: cur.execute("""
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: psycopg2.errors.DatatypeMismatch: column "risk_score" is of type numeric but expression is of type text
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: LINE 13: '75',
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ^
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: HINT: You will need to rewrite or cast the expression.
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Merge Logic Stats:
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Created detections: 0
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it ids-list-fetcher[10801]: ============================================================
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 16:15:05 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
netstat -tlnp | grep 8000
|
|
||||||
tcp 0 0 0.0.0.0:8000 0.0.0.0:* LISTEN 106309/python3.11
|
|
||||||
(venv) [root@ids python_ml]# lsof -i :8000
|
|
||||||
COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
|
|
||||||
python3.1 106309 ids 7u IPv4 805799 0t0 TCP *:irdmi (LISTEN)
|
|
||||||
(venv) [root@ids python_ml]# kill -9 106309
|
|
||||||
(venv) [root@ids python_ml]# lsof -i :8000
|
|
||||||
(venv) [root@ids python_ml]# pkill -9 -f "python.*8000"
|
|
||||||
(venv) [root@ids python_ml]# pkill -9 -f "python.*main.py"
|
|
||||||
(venv) [root@ids python_ml]# sudo systemctl restart ids-ml-backend
|
|
||||||
Job for ids-ml-backend.service failed because the control process exited with error code.
|
|
||||||
See "systemctl status ids-ml-backend.service" and "journalctl -xeu ids-ml-backend.service" for details.
|
|
||||||
(venv) [root@ids python_ml]# sudo systemctl status ids-ml-backend
|
|
||||||
× ids-ml-backend.service - IDS ML Backend (FastAPI)
|
|
||||||
Loaded: loaded (/etc/systemd/system/ids-ml-backend.service; enabled; preset: disabled)
|
|
||||||
Active: failed (Result: exit-code) since Tue 2025-11-25 18:31:08 CET; 3min 37s ago
|
|
||||||
Duration: 2.490s
|
|
||||||
Process: 108530 ExecStart=/opt/ids/python_ml/venv/bin/python3 main.py (code=exited, status=1/FAILURE)
|
|
||||||
Main PID: 108530 (code=exited, status=1/FAILURE)
|
|
||||||
CPU: 3.987s
|
|
||||||
|
|
||||||
Nov 25 18:31:08 ids.alfacom.it systemd[1]: ids-ml-backend.service: Scheduled restart job, restart counter is at 5.
|
|
||||||
Nov 25 18:31:08 ids.alfacom.it systemd[1]: Stopped IDS ML Backend (FastAPI).
|
|
||||||
Nov 25 18:31:08 ids.alfacom.it systemd[1]: ids-ml-backend.service: Consumed 3.987s CPU time.
|
|
||||||
Nov 25 18:31:08 ids.alfacom.it systemd[1]: ids-ml-backend.service: Start request repeated too quickly.
|
|
||||||
Nov 25 18:31:08 ids.alfacom.it systemd[1]: ids-ml-backend.service: Failed with result 'exit-code'.
|
|
||||||
Nov 25 18:31:08 ids.alfacom.it systemd[1]: Failed to start IDS ML Backend (FastAPI).
|
|
||||||
Nov 25 18:34:35 ids.alfacom.it systemd[1]: ids-ml-backend.service: Start request repeated too quickly.
|
|
||||||
Nov 25 18:34:35 ids.alfacom.it systemd[1]: ids-ml-backend.service: Failed with result 'exit-code'.
|
|
||||||
Nov 25 18:34:35 ids.alfacom.it systemd[1]: Failed to start IDS ML Backend (FastAPI).
|
|
||||||
(venv) [root@ids python_ml]# tail -n 50 /var/log/ids/ml_backend.log
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108413]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108452]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
INFO: Started server process [108530]
|
|
||||||
INFO: Waiting for application startup.
|
|
||||||
INFO: Application startup complete.
|
|
||||||
ERROR: [Errno 98] error while attempting to bind on address ('0.0.0.0', 8000): address already in use
|
|
||||||
INFO: Waiting for application shutdown.
|
|
||||||
INFO: Application shutdown complete.
|
|
||||||
[WARNING] Extended Isolation Forest not available, using standard IF
|
|
||||||
[ML] Using Hybrid ML Detector (Extended Isolation Forest + Feature Selection)
|
|
||||||
[HYBRID] Ensemble classifier loaded
|
|
||||||
[HYBRID] Models loaded (version: latest)
|
|
||||||
[HYBRID] Selected features: 18/25
|
|
||||||
[HYBRID] Mode: Hybrid (IF + Ensemble)
|
|
||||||
[ML] ✓ Hybrid detector models loaded and ready
|
|
||||||
🚀 Starting IDS API on http://0.0.0.0:8000
|
|
||||||
📚 Docs available at http://0.0.0.0:8000/docs
|
|
||||||
(venv) [root@ids python_ml]#
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
ournalctl -u ids-list-fetcher -n 50 --no-pager
|
|
||||||
Jan 02 12:30:01 ids.alfacom.it ids-list-fetcher[5571]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 12:30:01 ids.alfacom.it ids-list-fetcher[5571]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 12:30:01 ids.alfacom.it ids-list-fetcher[5571]: ============================================================
|
|
||||||
Jan 02 12:30:01 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 12:30:01 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it systemd[1]: Starting IDS Public Lists Fetcher Service...
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: [2026-01-02 12:40:01] PUBLIC LISTS SYNC
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: Found 2 enabled lists
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: [12:40:01] Downloading Spamhaus from https://www.spamhaus.org/drop/drop_v4.json...
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: [12:40:01] Downloading AWS from https://ip-ranges.amazonaws.com/ip-ranges.json...
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: [12:40:01] Parsing AWS...
|
|
||||||
Jan 02 12:40:01 ids.alfacom.it ids-list-fetcher[5730]: [12:40:01] Found 9548 IPs, syncing to database...
|
|
||||||
Jan 02 12:40:02 ids.alfacom.it ids-list-fetcher[5730]: [12:40:02] ✓ AWS: +9511 -0 ~0
|
|
||||||
Jan 02 12:40:02 ids.alfacom.it ids-list-fetcher[5730]: [12:40:02] Parsing Spamhaus...
|
|
||||||
Jan 02 12:40:02 ids.alfacom.it ids-list-fetcher[5730]: [12:40:02] ✗ Spamhaus: No valid IPs found in list
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: SYNC SUMMARY
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Success: 1/2
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Errors: 1/2
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Total IPs Added: 9511
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Total IPs Removed: 0
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: RUNNING MERGE LOGIC
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ERROR:merge_logic:Failed to cleanup detections: operator does not exist: inet = text
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: LINE 9: d.source_ip::inet = wl.ip_inet
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ^
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ERROR:merge_logic:Failed to sync detections: operator does not exist: text <<= text
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: LINE 30: OR bl.ip_inet <<= wl.ip_inet
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ^
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Traceback (most recent call last):
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: File "/opt/ids/python_ml/merge_logic.py", line 264, in sync_public_blacklist_detections
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: cur.execute("""
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: psycopg2.errors.UndefinedFunction: operator does not exist: text <<= text
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: LINE 30: OR bl.ip_inet <<= wl.ip_inet
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ^
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: HINT: No operator matches the given name and argument types. You might need to add explicit type casts.
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Merge Logic Stats:
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Created detections: 0
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Cleaned invalid detections: 0
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: Skipped (whitelisted): 0
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it ids-list-fetcher[5730]: ============================================================
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it systemd[1]: ids-list-fetcher.service: Deactivated successfully.
|
|
||||||
Jan 02 12:40:03 ids.alfacom.it systemd[1]: Finished IDS Public Lists Fetcher Service.
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
@ -4,14 +4,13 @@ import { QueryClientProvider } from "@tanstack/react-query";
|
|||||||
import { Toaster } from "@/components/ui/toaster";
|
import { Toaster } from "@/components/ui/toaster";
|
||||||
import { TooltipProvider } from "@/components/ui/tooltip";
|
import { TooltipProvider } from "@/components/ui/tooltip";
|
||||||
import { SidebarProvider, Sidebar, SidebarContent, SidebarGroup, SidebarGroupContent, SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem, SidebarTrigger } from "@/components/ui/sidebar";
|
import { SidebarProvider, Sidebar, SidebarContent, SidebarGroup, SidebarGroupContent, SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem, SidebarTrigger } from "@/components/ui/sidebar";
|
||||||
import { LayoutDashboard, AlertTriangle, Server, Shield, Brain, Menu, Activity, BarChart3, TrendingUp, List } from "lucide-react";
|
import { LayoutDashboard, AlertTriangle, Server, Shield, Brain, Menu, Activity, BarChart3, TrendingUp } from "lucide-react";
|
||||||
import Dashboard from "@/pages/Dashboard";
|
import Dashboard from "@/pages/Dashboard";
|
||||||
import Detections from "@/pages/Detections";
|
import Detections from "@/pages/Detections";
|
||||||
import DashboardLive from "@/pages/DashboardLive";
|
import DashboardLive from "@/pages/DashboardLive";
|
||||||
import AnalyticsHistory from "@/pages/AnalyticsHistory";
|
import AnalyticsHistory from "@/pages/AnalyticsHistory";
|
||||||
import Routers from "@/pages/Routers";
|
import Routers from "@/pages/Routers";
|
||||||
import Whitelist from "@/pages/Whitelist";
|
import Whitelist from "@/pages/Whitelist";
|
||||||
import PublicLists from "@/pages/PublicLists";
|
|
||||||
import Training from "@/pages/Training";
|
import Training from "@/pages/Training";
|
||||||
import Services from "@/pages/Services";
|
import Services from "@/pages/Services";
|
||||||
import NotFound from "@/pages/not-found";
|
import NotFound from "@/pages/not-found";
|
||||||
@ -24,7 +23,6 @@ const menuItems = [
|
|||||||
{ title: "Training ML", url: "/training", icon: Brain },
|
{ title: "Training ML", url: "/training", icon: Brain },
|
||||||
{ title: "Router", url: "/routers", icon: Server },
|
{ title: "Router", url: "/routers", icon: Server },
|
||||||
{ title: "Whitelist", url: "/whitelist", icon: Shield },
|
{ title: "Whitelist", url: "/whitelist", icon: Shield },
|
||||||
{ title: "Liste Pubbliche", url: "/public-lists", icon: List },
|
|
||||||
{ title: "Servizi", url: "/services", icon: TrendingUp },
|
{ title: "Servizi", url: "/services", icon: TrendingUp },
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -64,7 +62,6 @@ function Router() {
|
|||||||
<Route path="/training" component={Training} />
|
<Route path="/training" component={Training} />
|
||||||
<Route path="/routers" component={Routers} />
|
<Route path="/routers" component={Routers} />
|
||||||
<Route path="/whitelist" component={Whitelist} />
|
<Route path="/whitelist" component={Whitelist} />
|
||||||
<Route path="/public-lists" component={PublicLists} />
|
|
||||||
<Route path="/services" component={Services} />
|
<Route path="/services" component={Services} />
|
||||||
<Route component={NotFound} />
|
<Route component={NotFound} />
|
||||||
</Switch>
|
</Switch>
|
||||||
|
|||||||
@ -1,133 +1,25 @@
|
|||||||
import { useQuery, useMutation } from "@tanstack/react-query";
|
import { useQuery } from "@tanstack/react-query";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
import { AlertTriangle, Search, Shield, Eye, Globe, MapPin, Building2 } from "lucide-react";
|
||||||
import { Slider } from "@/components/ui/slider";
|
|
||||||
import { AlertTriangle, Search, Shield, Globe, MapPin, Building2, ShieldPlus, ShieldCheck, Unlock, ChevronLeft, ChevronRight } from "lucide-react";
|
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import { useState, useEffect, useMemo } from "react";
|
import { useState } from "react";
|
||||||
import type { Detection, Whitelist } from "@shared/schema";
|
import type { Detection } from "@shared/schema";
|
||||||
import { getFlag } from "@/lib/country-flags";
|
import { getFlag } from "@/lib/country-flags";
|
||||||
import { apiRequest, queryClient } from "@/lib/queryClient";
|
|
||||||
import { useToast } from "@/hooks/use-toast";
|
|
||||||
|
|
||||||
const ITEMS_PER_PAGE = 50;
|
|
||||||
|
|
||||||
interface DetectionsResponse {
|
|
||||||
detections: Detection[];
|
|
||||||
total: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function Detections() {
|
export default function Detections() {
|
||||||
const [searchInput, setSearchInput] = useState("");
|
const [searchQuery, setSearchQuery] = useState("");
|
||||||
const [debouncedSearch, setDebouncedSearch] = useState("");
|
const { data: detections, isLoading } = useQuery<Detection[]>({
|
||||||
const [anomalyTypeFilter, setAnomalyTypeFilter] = useState<string>("all");
|
queryKey: ["/api/detections?limit=100"],
|
||||||
const [minScore, setMinScore] = useState(0);
|
refetchInterval: 5000,
|
||||||
const [maxScore, setMaxScore] = useState(100);
|
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
|
||||||
const { toast } = useToast();
|
|
||||||
|
|
||||||
// Debounce search input
|
|
||||||
useEffect(() => {
|
|
||||||
const timer = setTimeout(() => {
|
|
||||||
setDebouncedSearch(searchInput);
|
|
||||||
setCurrentPage(1); // Reset to first page on search
|
|
||||||
}, 300);
|
|
||||||
return () => clearTimeout(timer);
|
|
||||||
}, [searchInput]);
|
|
||||||
|
|
||||||
// Reset page on filter change
|
|
||||||
useEffect(() => {
|
|
||||||
setCurrentPage(1);
|
|
||||||
}, [anomalyTypeFilter, minScore, maxScore]);
|
|
||||||
|
|
||||||
// Build query params with pagination and search
|
|
||||||
const queryParams = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.set("limit", ITEMS_PER_PAGE.toString());
|
|
||||||
params.set("offset", ((currentPage - 1) * ITEMS_PER_PAGE).toString());
|
|
||||||
if (anomalyTypeFilter !== "all") {
|
|
||||||
params.set("anomalyType", anomalyTypeFilter);
|
|
||||||
}
|
|
||||||
if (minScore > 0) {
|
|
||||||
params.set("minScore", minScore.toString());
|
|
||||||
}
|
|
||||||
if (maxScore < 100) {
|
|
||||||
params.set("maxScore", maxScore.toString());
|
|
||||||
}
|
|
||||||
if (debouncedSearch.trim()) {
|
|
||||||
params.set("search", debouncedSearch.trim());
|
|
||||||
}
|
|
||||||
return params.toString();
|
|
||||||
}, [currentPage, anomalyTypeFilter, minScore, maxScore, debouncedSearch]);
|
|
||||||
|
|
||||||
const { data, isLoading } = useQuery<DetectionsResponse>({
|
|
||||||
queryKey: ["/api/detections", currentPage, anomalyTypeFilter, minScore, maxScore, debouncedSearch],
|
|
||||||
queryFn: () => fetch(`/api/detections?${queryParams}`).then(r => r.json()),
|
|
||||||
refetchInterval: 10000,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const detections = data?.detections || [];
|
const filteredDetections = detections?.filter((d) =>
|
||||||
const totalCount = data?.total || 0;
|
d.sourceIp.toLowerCase().includes(searchQuery.toLowerCase()) ||
|
||||||
const totalPages = Math.ceil(totalCount / ITEMS_PER_PAGE);
|
d.anomalyType.toLowerCase().includes(searchQuery.toLowerCase())
|
||||||
|
);
|
||||||
// Fetch whitelist to check if IP is already whitelisted
|
|
||||||
const { data: whitelistData } = useQuery<Whitelist[]>({
|
|
||||||
queryKey: ["/api/whitelist"],
|
|
||||||
});
|
|
||||||
|
|
||||||
// Create a Set of whitelisted IPs for fast lookup
|
|
||||||
const whitelistedIps = new Set(whitelistData?.map(w => w.ipAddress) || []);
|
|
||||||
|
|
||||||
// Mutation per aggiungere a whitelist
|
|
||||||
const addToWhitelistMutation = useMutation({
|
|
||||||
mutationFn: async (detection: Detection) => {
|
|
||||||
return await apiRequest("POST", "/api/whitelist", {
|
|
||||||
ipAddress: detection.sourceIp,
|
|
||||||
reason: `Auto-added from detection: ${detection.anomalyType} (Risk: ${parseFloat(detection.riskScore).toFixed(1)})`
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onSuccess: (_, detection) => {
|
|
||||||
toast({
|
|
||||||
title: "IP aggiunto alla whitelist",
|
|
||||||
description: `${detection.sourceIp} è stato aggiunto alla whitelist e sbloccato dai router.`,
|
|
||||||
});
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/whitelist"] });
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/detections"] });
|
|
||||||
},
|
|
||||||
onError: (error: any, detection) => {
|
|
||||||
toast({
|
|
||||||
title: "Errore",
|
|
||||||
description: error.message || `Impossibile aggiungere ${detection.sourceIp} alla whitelist.`,
|
|
||||||
variant: "destructive",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Mutation per sbloccare IP dai router
|
|
||||||
const unblockMutation = useMutation({
|
|
||||||
mutationFn: async (detection: Detection) => {
|
|
||||||
return await apiRequest("POST", "/api/unblock-ip", {
|
|
||||||
ipAddress: detection.sourceIp
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onSuccess: (data: any, detection) => {
|
|
||||||
toast({
|
|
||||||
title: "IP sbloccato",
|
|
||||||
description: `${detection.sourceIp} è stato rimosso dalla blocklist di ${data.unblocked_from || 0} router.`,
|
|
||||||
});
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/detections"] });
|
|
||||||
},
|
|
||||||
onError: (error: any, detection) => {
|
|
||||||
toast({
|
|
||||||
title: "Errore sblocco",
|
|
||||||
description: error.message || `Impossibile sbloccare ${detection.sourceIp} dai router.`,
|
|
||||||
variant: "destructive",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const getRiskBadge = (riskScore: string) => {
|
const getRiskBadge = (riskScore: string) => {
|
||||||
const score = parseFloat(riskScore);
|
const score = parseFloat(riskScore);
|
||||||
@ -161,58 +53,20 @@ export default function Detections() {
|
|||||||
{/* Search and Filters */}
|
{/* Search and Filters */}
|
||||||
<Card data-testid="card-filters">
|
<Card data-testid="card-filters">
|
||||||
<CardContent className="pt-6">
|
<CardContent className="pt-6">
|
||||||
<div className="flex flex-col gap-4">
|
<div className="flex items-center gap-4">
|
||||||
<div className="flex items-center gap-4 flex-wrap">
|
<div className="relative flex-1">
|
||||||
<div className="relative flex-1 min-w-[200px]">
|
|
||||||
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
||||||
<Input
|
<Input
|
||||||
placeholder="Cerca per IP, paese, organizzazione..."
|
placeholder="Cerca per IP o tipo anomalia..."
|
||||||
value={searchInput}
|
value={searchQuery}
|
||||||
onChange={(e) => setSearchInput(e.target.value)}
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
className="pl-9"
|
className="pl-9"
|
||||||
data-testid="input-search"
|
data-testid="input-search"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<Button variant="outline" data-testid="button-refresh">
|
||||||
<Select value={anomalyTypeFilter} onValueChange={setAnomalyTypeFilter}>
|
Aggiorna
|
||||||
<SelectTrigger className="w-[200px]" data-testid="select-anomaly-type">
|
</Button>
|
||||||
<SelectValue placeholder="Tipo attacco" />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="all">Tutti i tipi</SelectItem>
|
|
||||||
<SelectItem value="ddos">DDoS Attack</SelectItem>
|
|
||||||
<SelectItem value="port_scan">Port Scanning</SelectItem>
|
|
||||||
<SelectItem value="brute_force">Brute Force</SelectItem>
|
|
||||||
<SelectItem value="botnet">Botnet Activity</SelectItem>
|
|
||||||
<SelectItem value="suspicious">Suspicious Activity</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-2">
|
|
||||||
<div className="flex items-center justify-between text-sm">
|
|
||||||
<span className="text-muted-foreground">Risk Score:</span>
|
|
||||||
<span className="font-medium" data-testid="text-score-range">
|
|
||||||
{minScore} - {maxScore}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center gap-4">
|
|
||||||
<span className="text-xs text-muted-foreground w-8">0</span>
|
|
||||||
<Slider
|
|
||||||
min={0}
|
|
||||||
max={100}
|
|
||||||
step={5}
|
|
||||||
value={[minScore, maxScore]}
|
|
||||||
onValueChange={([min, max]) => {
|
|
||||||
setMinScore(min);
|
|
||||||
setMaxScore(max);
|
|
||||||
}}
|
|
||||||
className="flex-1"
|
|
||||||
data-testid="slider-risk-score"
|
|
||||||
/>
|
|
||||||
<span className="text-xs text-muted-foreground w-8">100</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
@ -220,36 +74,9 @@ export default function Detections() {
|
|||||||
{/* Detections List */}
|
{/* Detections List */}
|
||||||
<Card data-testid="card-detections-list">
|
<Card data-testid="card-detections-list">
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle className="flex items-center justify-between gap-2 flex-wrap">
|
<CardTitle className="flex items-center gap-2">
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<AlertTriangle className="h-5 w-5" />
|
<AlertTriangle className="h-5 w-5" />
|
||||||
Rilevamenti ({totalCount})
|
Rilevamenti ({filteredDetections?.length || 0})
|
||||||
</div>
|
|
||||||
{totalPages > 1 && (
|
|
||||||
<div className="flex items-center gap-2 text-sm font-normal">
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="icon"
|
|
||||||
onClick={() => setCurrentPage(p => Math.max(1, p - 1))}
|
|
||||||
disabled={currentPage === 1}
|
|
||||||
data-testid="button-prev-page"
|
|
||||||
>
|
|
||||||
<ChevronLeft className="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
<span data-testid="text-pagination">
|
|
||||||
Pagina {currentPage} di {totalPages}
|
|
||||||
</span>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="icon"
|
|
||||||
onClick={() => setCurrentPage(p => Math.min(totalPages, p + 1))}
|
|
||||||
disabled={currentPage === totalPages}
|
|
||||||
data-testid="button-next-page"
|
|
||||||
>
|
|
||||||
<ChevronRight className="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</CardTitle>
|
</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
@ -257,9 +84,9 @@ export default function Detections() {
|
|||||||
<div className="text-center py-8 text-muted-foreground" data-testid="text-loading">
|
<div className="text-center py-8 text-muted-foreground" data-testid="text-loading">
|
||||||
Caricamento...
|
Caricamento...
|
||||||
</div>
|
</div>
|
||||||
) : detections.length > 0 ? (
|
) : filteredDetections && filteredDetections.length > 0 ? (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
{detections.map((detection) => (
|
{filteredDetections.map((detection) => (
|
||||||
<div
|
<div
|
||||||
key={detection.id}
|
key={detection.id}
|
||||||
className="p-4 rounded-lg border hover-elevate"
|
className="p-4 rounded-lg border hover-elevate"
|
||||||
@ -365,44 +192,12 @@ export default function Detections() {
|
|||||||
</Badge>
|
</Badge>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{whitelistedIps.has(detection.sourceIp) ? (
|
<Button variant="outline" size="sm" asChild data-testid={`button-details-${detection.id}`}>
|
||||||
<Button
|
<a href={`/logs?ip=${detection.sourceIp}`}>
|
||||||
variant="outline"
|
<Eye className="h-3 w-3 mr-1" />
|
||||||
size="sm"
|
Dettagli
|
||||||
disabled
|
</a>
|
||||||
className="w-full bg-green-500/10 border-green-500 text-green-600 dark:text-green-400"
|
|
||||||
data-testid={`button-whitelist-${detection.id}`}
|
|
||||||
>
|
|
||||||
<ShieldCheck className="h-3 w-3 mr-1" />
|
|
||||||
In Whitelist
|
|
||||||
</Button>
|
</Button>
|
||||||
) : (
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => addToWhitelistMutation.mutate(detection)}
|
|
||||||
disabled={addToWhitelistMutation.isPending}
|
|
||||||
className="w-full"
|
|
||||||
data-testid={`button-whitelist-${detection.id}`}
|
|
||||||
>
|
|
||||||
<ShieldPlus className="h-3 w-3 mr-1" />
|
|
||||||
Whitelist
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{detection.blocked && (
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => unblockMutation.mutate(detection)}
|
|
||||||
disabled={unblockMutation.isPending}
|
|
||||||
className="w-full"
|
|
||||||
data-testid={`button-unblock-${detection.id}`}
|
|
||||||
>
|
|
||||||
<Unlock className="h-3 w-3 mr-1" />
|
|
||||||
Sblocca Router
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -412,40 +207,11 @@ export default function Detections() {
|
|||||||
<div className="text-center py-12 text-muted-foreground" data-testid="text-no-results">
|
<div className="text-center py-12 text-muted-foreground" data-testid="text-no-results">
|
||||||
<AlertTriangle className="h-12 w-12 mx-auto mb-2 opacity-50" />
|
<AlertTriangle className="h-12 w-12 mx-auto mb-2 opacity-50" />
|
||||||
<p>Nessun rilevamento trovato</p>
|
<p>Nessun rilevamento trovato</p>
|
||||||
{debouncedSearch && (
|
{searchQuery && (
|
||||||
<p className="text-sm">Prova con un altro termine di ricerca</p>
|
<p className="text-sm">Prova con un altro termine di ricerca</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Bottom pagination */}
|
|
||||||
{totalPages > 1 && detections.length > 0 && (
|
|
||||||
<div className="flex items-center justify-center gap-4 mt-6 pt-4 border-t">
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => setCurrentPage(p => Math.max(1, p - 1))}
|
|
||||||
disabled={currentPage === 1}
|
|
||||||
data-testid="button-prev-page-bottom"
|
|
||||||
>
|
|
||||||
<ChevronLeft className="h-4 w-4 mr-1" />
|
|
||||||
Precedente
|
|
||||||
</Button>
|
|
||||||
<span className="text-sm text-muted-foreground" data-testid="text-pagination-bottom">
|
|
||||||
Pagina {currentPage} di {totalPages} ({totalCount} totali)
|
|
||||||
</span>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => setCurrentPage(p => Math.min(totalPages, p + 1))}
|
|
||||||
disabled={currentPage === totalPages}
|
|
||||||
data-testid="button-next-page-bottom"
|
|
||||||
>
|
|
||||||
Successiva
|
|
||||||
<ChevronRight className="h-4 w-4 ml-1" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,372 +0,0 @@
|
|||||||
import { useQuery, useMutation } from "@tanstack/react-query";
|
|
||||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
|
||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import { Badge } from "@/components/ui/badge";
|
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
|
||||||
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
|
|
||||||
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
|
|
||||||
import { Input } from "@/components/ui/input";
|
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
|
||||||
import { Switch } from "@/components/ui/switch";
|
|
||||||
import { useForm } from "react-hook-form";
|
|
||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
|
||||||
import { z } from "zod";
|
|
||||||
import { RefreshCw, Plus, Trash2, Edit, CheckCircle2, XCircle, AlertTriangle, Clock } from "lucide-react";
|
|
||||||
import { apiRequest, queryClient } from "@/lib/queryClient";
|
|
||||||
import { useToast } from "@/hooks/use-toast";
|
|
||||||
import { formatDistanceToNow } from "date-fns";
|
|
||||||
import { it } from "date-fns/locale";
|
|
||||||
import { useState } from "react";
|
|
||||||
|
|
||||||
const listFormSchema = z.object({
|
|
||||||
name: z.string().min(1, "Nome richiesto"),
|
|
||||||
type: z.enum(["blacklist", "whitelist"], {
|
|
||||||
required_error: "Tipo richiesto",
|
|
||||||
}),
|
|
||||||
url: z.string().url("URL non valida"),
|
|
||||||
enabled: z.boolean().default(true),
|
|
||||||
fetchIntervalMinutes: z.number().min(1).max(1440).default(10),
|
|
||||||
});
|
|
||||||
|
|
||||||
type ListFormValues = z.infer<typeof listFormSchema>;
|
|
||||||
|
|
||||||
export default function PublicLists() {
|
|
||||||
const { toast } = useToast();
|
|
||||||
const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
|
|
||||||
const [editingList, setEditingList] = useState<any>(null);
|
|
||||||
|
|
||||||
const { data: lists, isLoading } = useQuery({
|
|
||||||
queryKey: ["/api/public-lists"],
|
|
||||||
});
|
|
||||||
|
|
||||||
const form = useForm<ListFormValues>({
|
|
||||||
resolver: zodResolver(listFormSchema),
|
|
||||||
defaultValues: {
|
|
||||||
name: "",
|
|
||||||
type: "blacklist",
|
|
||||||
url: "",
|
|
||||||
enabled: true,
|
|
||||||
fetchIntervalMinutes: 10,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const createMutation = useMutation({
|
|
||||||
mutationFn: (data: ListFormValues) =>
|
|
||||||
apiRequest("POST", "/api/public-lists", data),
|
|
||||||
onSuccess: () => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/public-lists"] });
|
|
||||||
toast({
|
|
||||||
title: "Lista creata",
|
|
||||||
description: "La lista è stata aggiunta con successo",
|
|
||||||
});
|
|
||||||
setIsAddDialogOpen(false);
|
|
||||||
form.reset();
|
|
||||||
},
|
|
||||||
onError: (error: any) => {
|
|
||||||
toast({
|
|
||||||
title: "Errore",
|
|
||||||
description: error.message || "Impossibile creare la lista",
|
|
||||||
variant: "destructive",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const updateMutation = useMutation({
|
|
||||||
mutationFn: ({ id, data }: { id: string; data: Partial<ListFormValues> }) =>
|
|
||||||
apiRequest("PATCH", `/api/public-lists/${id}`, data),
|
|
||||||
onSuccess: () => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/public-lists"] });
|
|
||||||
toast({
|
|
||||||
title: "Lista aggiornata",
|
|
||||||
description: "Le modifiche sono state salvate",
|
|
||||||
});
|
|
||||||
setEditingList(null);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const deleteMutation = useMutation({
|
|
||||||
mutationFn: (id: string) =>
|
|
||||||
apiRequest("DELETE", `/api/public-lists/${id}`),
|
|
||||||
onSuccess: () => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/public-lists"] });
|
|
||||||
toast({
|
|
||||||
title: "Lista eliminata",
|
|
||||||
description: "La lista è stata rimossa",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError: (error: any) => {
|
|
||||||
toast({
|
|
||||||
title: "Errore",
|
|
||||||
description: error.message || "Impossibile eliminare la lista",
|
|
||||||
variant: "destructive",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const syncMutation = useMutation({
|
|
||||||
mutationFn: (id: string) =>
|
|
||||||
apiRequest("POST", `/api/public-lists/${id}/sync`),
|
|
||||||
onSuccess: () => {
|
|
||||||
toast({
|
|
||||||
title: "Sync avviato",
|
|
||||||
description: "La sincronizzazione manuale è stata richiesta",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const toggleEnabled = (id: string, enabled: boolean) => {
|
|
||||||
updateMutation.mutate({ id, data: { enabled } });
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmit = (data: ListFormValues) => {
|
|
||||||
createMutation.mutate(data);
|
|
||||||
};
|
|
||||||
|
|
||||||
const getStatusBadge = (list: any) => {
|
|
||||||
if (!list.enabled) {
|
|
||||||
return <Badge variant="outline" className="gap-1"><XCircle className="w-3 h-3" />Disabilitata</Badge>;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list.errorCount > 5) {
|
|
||||||
return <Badge variant="destructive" className="gap-1"><AlertTriangle className="w-3 h-3" />Errori</Badge>;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list.lastSuccess) {
|
|
||||||
return <Badge variant="default" className="gap-1 bg-green-600"><CheckCircle2 className="w-3 h-3" />OK</Badge>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <Badge variant="secondary" className="gap-1"><Clock className="w-3 h-3" />In attesa</Badge>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getTypeBadge = (type: string) => {
|
|
||||||
if (type === "blacklist") {
|
|
||||||
return <Badge variant="destructive">Blacklist</Badge>;
|
|
||||||
}
|
|
||||||
return <Badge variant="default" className="bg-blue-600">Whitelist</Badge>;
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="p-6">
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle>Caricamento...</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="p-6 space-y-6">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="text-3xl font-bold">Liste Pubbliche</h1>
|
|
||||||
<p className="text-muted-foreground mt-2">
|
|
||||||
Gestione sorgenti blacklist e whitelist esterne (aggiornamento ogni 10 minuti)
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<Dialog open={isAddDialogOpen} onOpenChange={setIsAddDialogOpen}>
|
|
||||||
<DialogTrigger asChild>
|
|
||||||
<Button data-testid="button-add-list">
|
|
||||||
<Plus className="w-4 h-4 mr-2" />
|
|
||||||
Aggiungi Lista
|
|
||||||
</Button>
|
|
||||||
</DialogTrigger>
|
|
||||||
<DialogContent className="max-w-2xl">
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>Aggiungi Lista Pubblica</DialogTitle>
|
|
||||||
<DialogDescription>
|
|
||||||
Configura una nuova sorgente blacklist o whitelist
|
|
||||||
</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
<Form {...form}>
|
|
||||||
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
|
|
||||||
<FormField
|
|
||||||
control={form.control}
|
|
||||||
name="name"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Nome</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="es. Spamhaus DROP" {...field} data-testid="input-list-name" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
<FormField
|
|
||||||
control={form.control}
|
|
||||||
name="type"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Tipo</FormLabel>
|
|
||||||
<Select onValueChange={field.onChange} defaultValue={field.value}>
|
|
||||||
<FormControl>
|
|
||||||
<SelectTrigger data-testid="select-list-type">
|
|
||||||
<SelectValue placeholder="Seleziona tipo" />
|
|
||||||
</SelectTrigger>
|
|
||||||
</FormControl>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="blacklist">Blacklist</SelectItem>
|
|
||||||
<SelectItem value="whitelist">Whitelist</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
<FormField
|
|
||||||
control={form.control}
|
|
||||||
name="url"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>URL</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="https://example.com/list.txt" {...field} data-testid="input-list-url" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
<FormField
|
|
||||||
control={form.control}
|
|
||||||
name="fetchIntervalMinutes"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Intervallo Sync (minuti)</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input
|
|
||||||
type="number"
|
|
||||||
{...field}
|
|
||||||
onChange={(e) => field.onChange(parseInt(e.target.value))}
|
|
||||||
data-testid="input-list-interval"
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
<FormField
|
|
||||||
control={form.control}
|
|
||||||
name="enabled"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem className="flex items-center justify-between">
|
|
||||||
<FormLabel>Abilitata</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Switch
|
|
||||||
checked={field.value}
|
|
||||||
onCheckedChange={field.onChange}
|
|
||||||
data-testid="switch-list-enabled"
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
<div className="flex justify-end gap-2 pt-4">
|
|
||||||
<Button type="button" variant="outline" onClick={() => setIsAddDialogOpen(false)}>
|
|
||||||
Annulla
|
|
||||||
</Button>
|
|
||||||
<Button type="submit" disabled={createMutation.isPending} data-testid="button-save-list">
|
|
||||||
{createMutation.isPending ? "Salvataggio..." : "Salva"}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</Form>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle>Sorgenti Configurate</CardTitle>
|
|
||||||
<CardDescription>
|
|
||||||
{lists?.length || 0} liste configurate
|
|
||||||
</CardDescription>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent>
|
|
||||||
<Table>
|
|
||||||
<TableHeader>
|
|
||||||
<TableRow>
|
|
||||||
<TableHead>Nome</TableHead>
|
|
||||||
<TableHead>Tipo</TableHead>
|
|
||||||
<TableHead>Stato</TableHead>
|
|
||||||
<TableHead>IP Totali</TableHead>
|
|
||||||
<TableHead>IP Attivi</TableHead>
|
|
||||||
<TableHead>Ultimo Sync</TableHead>
|
|
||||||
<TableHead className="text-right">Azioni</TableHead>
|
|
||||||
</TableRow>
|
|
||||||
</TableHeader>
|
|
||||||
<TableBody>
|
|
||||||
{lists?.map((list: any) => (
|
|
||||||
<TableRow key={list.id} data-testid={`row-list-${list.id}`}>
|
|
||||||
<TableCell className="font-medium">
|
|
||||||
<div>
|
|
||||||
<div>{list.name}</div>
|
|
||||||
<div className="text-xs text-muted-foreground truncate max-w-xs">
|
|
||||||
{list.url}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell>{getTypeBadge(list.type)}</TableCell>
|
|
||||||
<TableCell>{getStatusBadge(list)}</TableCell>
|
|
||||||
<TableCell data-testid={`text-total-ips-${list.id}`}>{list.totalIps?.toLocaleString() || 0}</TableCell>
|
|
||||||
<TableCell data-testid={`text-active-ips-${list.id}`}>{list.activeIps?.toLocaleString() || 0}</TableCell>
|
|
||||||
<TableCell>
|
|
||||||
{list.lastSuccess ? (
|
|
||||||
<span className="text-sm">
|
|
||||||
{formatDistanceToNow(new Date(list.lastSuccess), {
|
|
||||||
addSuffix: true,
|
|
||||||
locale: it,
|
|
||||||
})}
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<span className="text-sm text-muted-foreground">Mai</span>
|
|
||||||
)}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell className="text-right">
|
|
||||||
<div className="flex items-center justify-end gap-2">
|
|
||||||
<Switch
|
|
||||||
checked={list.enabled}
|
|
||||||
onCheckedChange={(checked) => toggleEnabled(list.id, checked)}
|
|
||||||
data-testid={`switch-enable-${list.id}`}
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="icon"
|
|
||||||
onClick={() => syncMutation.mutate(list.id)}
|
|
||||||
disabled={syncMutation.isPending}
|
|
||||||
data-testid={`button-sync-${list.id}`}
|
|
||||||
>
|
|
||||||
<RefreshCw className="w-4 h-4" />
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
variant="destructive"
|
|
||||||
size="icon"
|
|
||||||
onClick={() => {
|
|
||||||
if (confirm(`Eliminare la lista "${list.name}"?`)) {
|
|
||||||
deleteMutation.mutate(list.id);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
data-testid={`button-delete-${list.id}`}
|
|
||||||
>
|
|
||||||
<Trash2 className="w-4 h-4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
))}
|
|
||||||
{(!lists || lists.length === 0) && (
|
|
||||||
<TableRow>
|
|
||||||
<TableCell colSpan={7} className="text-center text-muted-foreground py-8">
|
|
||||||
Nessuna lista configurata. Aggiungi la prima lista.
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
)}
|
|
||||||
</TableBody>
|
|
||||||
</Table>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@ -1,108 +1,19 @@
|
|||||||
import { useState } from "react";
|
|
||||||
import { useQuery, useMutation } from "@tanstack/react-query";
|
import { useQuery, useMutation } from "@tanstack/react-query";
|
||||||
import { queryClient, apiRequest } from "@/lib/queryClient";
|
import { queryClient, apiRequest } from "@/lib/queryClient";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import { Server, Plus, Trash2 } from "lucide-react";
|
||||||
Dialog,
|
|
||||||
DialogContent,
|
|
||||||
DialogDescription,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
|
||||||
DialogTrigger,
|
|
||||||
DialogFooter,
|
|
||||||
} from "@/components/ui/dialog";
|
|
||||||
import {
|
|
||||||
Form,
|
|
||||||
FormControl,
|
|
||||||
FormDescription,
|
|
||||||
FormField,
|
|
||||||
FormItem,
|
|
||||||
FormLabel,
|
|
||||||
FormMessage,
|
|
||||||
} from "@/components/ui/form";
|
|
||||||
import { Input } from "@/components/ui/input";
|
|
||||||
import { Switch } from "@/components/ui/switch";
|
|
||||||
import { Server, Plus, Trash2, Edit } from "lucide-react";
|
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import { useForm } from "react-hook-form";
|
|
||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
|
||||||
import { insertRouterSchema, type InsertRouter } from "@shared/schema";
|
|
||||||
import type { Router } from "@shared/schema";
|
import type { Router } from "@shared/schema";
|
||||||
import { useToast } from "@/hooks/use-toast";
|
import { useToast } from "@/hooks/use-toast";
|
||||||
|
|
||||||
export default function Routers() {
|
export default function Routers() {
|
||||||
const { toast } = useToast();
|
const { toast } = useToast();
|
||||||
const [addDialogOpen, setAddDialogOpen] = useState(false);
|
|
||||||
const [editDialogOpen, setEditDialogOpen] = useState(false);
|
|
||||||
const [editingRouter, setEditingRouter] = useState<Router | null>(null);
|
|
||||||
|
|
||||||
const { data: routers, isLoading } = useQuery<Router[]>({
|
const { data: routers, isLoading } = useQuery<Router[]>({
|
||||||
queryKey: ["/api/routers"],
|
queryKey: ["/api/routers"],
|
||||||
});
|
});
|
||||||
|
|
||||||
const addForm = useForm<InsertRouter>({
|
|
||||||
resolver: zodResolver(insertRouterSchema),
|
|
||||||
defaultValues: {
|
|
||||||
name: "",
|
|
||||||
ipAddress: "",
|
|
||||||
apiPort: 8729,
|
|
||||||
username: "",
|
|
||||||
password: "",
|
|
||||||
enabled: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const editForm = useForm<InsertRouter>({
|
|
||||||
resolver: zodResolver(insertRouterSchema),
|
|
||||||
});
|
|
||||||
|
|
||||||
const addMutation = useMutation({
|
|
||||||
mutationFn: async (data: InsertRouter) => {
|
|
||||||
return await apiRequest("POST", "/api/routers", data);
|
|
||||||
},
|
|
||||||
onSuccess: () => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/routers"] });
|
|
||||||
toast({
|
|
||||||
title: "Router aggiunto",
|
|
||||||
description: "Il router è stato configurato con successo",
|
|
||||||
});
|
|
||||||
setAddDialogOpen(false);
|
|
||||||
addForm.reset();
|
|
||||||
},
|
|
||||||
onError: (error: any) => {
|
|
||||||
toast({
|
|
||||||
title: "Errore",
|
|
||||||
description: error.message || "Impossibile aggiungere il router",
|
|
||||||
variant: "destructive",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const updateMutation = useMutation({
|
|
||||||
mutationFn: async ({ id, data }: { id: string; data: InsertRouter }) => {
|
|
||||||
return await apiRequest("PUT", `/api/routers/${id}`, data);
|
|
||||||
},
|
|
||||||
onSuccess: () => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["/api/routers"] });
|
|
||||||
toast({
|
|
||||||
title: "Router aggiornato",
|
|
||||||
description: "Le modifiche sono state salvate con successo",
|
|
||||||
});
|
|
||||||
setEditDialogOpen(false);
|
|
||||||
setEditingRouter(null);
|
|
||||||
editForm.reset();
|
|
||||||
},
|
|
||||||
onError: (error: any) => {
|
|
||||||
toast({
|
|
||||||
title: "Errore",
|
|
||||||
description: error.message || "Impossibile aggiornare il router",
|
|
||||||
variant: "destructive",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const deleteMutation = useMutation({
|
const deleteMutation = useMutation({
|
||||||
mutationFn: async (id: string) => {
|
mutationFn: async (id: string) => {
|
||||||
await apiRequest("DELETE", `/api/routers/${id}`);
|
await apiRequest("DELETE", `/api/routers/${id}`);
|
||||||
@ -123,29 +34,6 @@ export default function Routers() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const handleAddSubmit = (data: InsertRouter) => {
|
|
||||||
addMutation.mutate(data);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleEditSubmit = (data: InsertRouter) => {
|
|
||||||
if (editingRouter) {
|
|
||||||
updateMutation.mutate({ id: editingRouter.id, data });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleEdit = (router: Router) => {
|
|
||||||
setEditingRouter(router);
|
|
||||||
editForm.reset({
|
|
||||||
name: router.name,
|
|
||||||
ipAddress: router.ipAddress,
|
|
||||||
apiPort: router.apiPort,
|
|
||||||
username: router.username,
|
|
||||||
password: router.password,
|
|
||||||
enabled: router.enabled,
|
|
||||||
});
|
|
||||||
setEditDialogOpen(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col gap-6 p-6" data-testid="page-routers">
|
<div className="flex flex-col gap-6 p-6" data-testid="page-routers">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
@ -155,152 +43,10 @@ export default function Routers() {
|
|||||||
Gestisci i router connessi al sistema IDS
|
Gestisci i router connessi al sistema IDS
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Dialog open={addDialogOpen} onOpenChange={setAddDialogOpen}>
|
|
||||||
<DialogTrigger asChild>
|
|
||||||
<Button data-testid="button-add-router">
|
<Button data-testid="button-add-router">
|
||||||
<Plus className="h-4 w-4 mr-2" />
|
<Plus className="h-4 w-4 mr-2" />
|
||||||
Aggiungi Router
|
Aggiungi Router
|
||||||
</Button>
|
</Button>
|
||||||
</DialogTrigger>
|
|
||||||
<DialogContent className="sm:max-w-[500px]" data-testid="dialog-add-router">
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>Aggiungi Router MikroTik</DialogTitle>
|
|
||||||
<DialogDescription>
|
|
||||||
Configura un nuovo router MikroTik per il sistema IDS. Assicurati che l'API RouterOS (porta 8729/8728) sia abilitata.
|
|
||||||
</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
|
|
||||||
<Form {...addForm}>
|
|
||||||
<form onSubmit={addForm.handleSubmit(handleAddSubmit)} className="space-y-4">
|
|
||||||
<FormField
|
|
||||||
control={addForm.control}
|
|
||||||
name="name"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Nome Router</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="es. MikroTik Ufficio" {...field} data-testid="input-name" />
|
|
||||||
</FormControl>
|
|
||||||
<FormDescription>
|
|
||||||
Nome descrittivo per identificare il router
|
|
||||||
</FormDescription>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={addForm.control}
|
|
||||||
name="ipAddress"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Indirizzo IP</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="es. 192.168.1.1" {...field} data-testid="input-ip" />
|
|
||||||
</FormControl>
|
|
||||||
<FormDescription>
|
|
||||||
Indirizzo IP o hostname del router
|
|
||||||
</FormDescription>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={addForm.control}
|
|
||||||
name="apiPort"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Porta API</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input
|
|
||||||
type="number"
|
|
||||||
placeholder="8729"
|
|
||||||
{...field}
|
|
||||||
onChange={(e) => field.onChange(parseInt(e.target.value))}
|
|
||||||
data-testid="input-port"
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
<FormDescription>
|
|
||||||
Porta RouterOS API MikroTik (8729 per API-SSL, 8728 per API)
|
|
||||||
</FormDescription>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={addForm.control}
|
|
||||||
name="username"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Username</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="admin" {...field} data-testid="input-username" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={addForm.control}
|
|
||||||
name="password"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Password</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input type="password" placeholder="••••••••" {...field} data-testid="input-password" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={addForm.control}
|
|
||||||
name="enabled"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3">
|
|
||||||
<div className="space-y-0.5">
|
|
||||||
<FormLabel>Abilitato</FormLabel>
|
|
||||||
<FormDescription>
|
|
||||||
Attiva il router per il blocco automatico degli IP
|
|
||||||
</FormDescription>
|
|
||||||
</div>
|
|
||||||
<FormControl>
|
|
||||||
<Switch
|
|
||||||
checked={field.value}
|
|
||||||
onCheckedChange={field.onChange}
|
|
||||||
data-testid="switch-enabled"
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<DialogFooter>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => setAddDialogOpen(false)}
|
|
||||||
data-testid="button-cancel"
|
|
||||||
>
|
|
||||||
Annulla
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
disabled={addMutation.isPending}
|
|
||||||
data-testid="button-submit"
|
|
||||||
>
|
|
||||||
{addMutation.isPending ? "Salvataggio..." : "Salva Router"}
|
|
||||||
</Button>
|
|
||||||
</DialogFooter>
|
|
||||||
</form>
|
|
||||||
</Form>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Card data-testid="card-routers">
|
<Card data-testid="card-routers">
|
||||||
@ -368,11 +114,9 @@ export default function Routers() {
|
|||||||
variant="outline"
|
variant="outline"
|
||||||
size="sm"
|
size="sm"
|
||||||
className="flex-1"
|
className="flex-1"
|
||||||
onClick={() => handleEdit(router)}
|
data-testid={`button-test-${router.id}`}
|
||||||
data-testid={`button-edit-${router.id}`}
|
|
||||||
>
|
>
|
||||||
<Edit className="h-4 w-4 mr-2" />
|
Test Connessione
|
||||||
Modifica
|
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
@ -396,140 +140,6 @@ export default function Routers() {
|
|||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<Dialog open={editDialogOpen} onOpenChange={setEditDialogOpen}>
|
|
||||||
<DialogContent className="sm:max-w-[500px]" data-testid="dialog-edit-router">
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>Modifica Router</DialogTitle>
|
|
||||||
<DialogDescription>
|
|
||||||
Modifica le impostazioni del router {editingRouter?.name}
|
|
||||||
</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
|
|
||||||
<Form {...editForm}>
|
|
||||||
<form onSubmit={editForm.handleSubmit(handleEditSubmit)} className="space-y-4">
|
|
||||||
<FormField
|
|
||||||
control={editForm.control}
|
|
||||||
name="name"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Nome Router</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="es. MikroTik Ufficio" {...field} data-testid="input-edit-name" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={editForm.control}
|
|
||||||
name="ipAddress"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Indirizzo IP</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="es. 192.168.1.1" {...field} data-testid="input-edit-ip" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={editForm.control}
|
|
||||||
name="apiPort"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Porta API</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input
|
|
||||||
type="number"
|
|
||||||
placeholder="8729"
|
|
||||||
{...field}
|
|
||||||
onChange={(e) => field.onChange(parseInt(e.target.value))}
|
|
||||||
data-testid="input-edit-port"
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
<FormDescription>
|
|
||||||
Porta RouterOS API MikroTik (8729 per API-SSL, 8728 per API)
|
|
||||||
</FormDescription>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={editForm.control}
|
|
||||||
name="username"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Username</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input placeholder="admin" {...field} data-testid="input-edit-username" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={editForm.control}
|
|
||||||
name="password"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem>
|
|
||||||
<FormLabel>Password</FormLabel>
|
|
||||||
<FormControl>
|
|
||||||
<Input type="password" placeholder="••••••••" {...field} data-testid="input-edit-password" />
|
|
||||||
</FormControl>
|
|
||||||
<FormMessage />
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<FormField
|
|
||||||
control={editForm.control}
|
|
||||||
name="enabled"
|
|
||||||
render={({ field }) => (
|
|
||||||
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3">
|
|
||||||
<div className="space-y-0.5">
|
|
||||||
<FormLabel>Abilitato</FormLabel>
|
|
||||||
<FormDescription>
|
|
||||||
Attiva il router per il blocco automatico degli IP
|
|
||||||
</FormDescription>
|
|
||||||
</div>
|
|
||||||
<FormControl>
|
|
||||||
<Switch
|
|
||||||
checked={field.value}
|
|
||||||
onCheckedChange={field.onChange}
|
|
||||||
data-testid="switch-edit-enabled"
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
</FormItem>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<DialogFooter>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => setEditDialogOpen(false)}
|
|
||||||
data-testid="button-edit-cancel"
|
|
||||||
>
|
|
||||||
Annulla
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
disabled={updateMutation.isPending}
|
|
||||||
data-testid="button-edit-submit"
|
|
||||||
>
|
|
||||||
{updateMutation.isPending ? "Salvataggio..." : "Salva Modifiche"}
|
|
||||||
</Button>
|
|
||||||
</DialogFooter>
|
|
||||||
</form>
|
|
||||||
</Form>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -198,19 +198,14 @@ export default function TrainingPage() {
|
|||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
<Card data-testid="card-train-action">
|
<Card data-testid="card-train-action">
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<CardTitle className="flex items-center gap-2">
|
<CardTitle className="flex items-center gap-2">
|
||||||
<Brain className="h-5 w-5" />
|
<Brain className="h-5 w-5" />
|
||||||
Addestramento Modello
|
Addestramento Modello
|
||||||
</CardTitle>
|
</CardTitle>
|
||||||
<Badge variant="secondary" className="bg-blue-50 text-blue-700 dark:bg-blue-950 dark:text-blue-300" data-testid="badge-model-version">
|
|
||||||
Hybrid ML v2.0.0
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent className="space-y-4">
|
<CardContent className="space-y-4">
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
Addestra il modello Hybrid ML (Isolation Forest + Ensemble Classifier) analizzando i log recenti per rilevare pattern di traffico normale.
|
Addestra il modello Isolation Forest analizzando i log recenti per rilevare pattern di traffico normale.
|
||||||
</p>
|
</p>
|
||||||
<Dialog open={isTrainDialogOpen} onOpenChange={setIsTrainDialogOpen}>
|
<Dialog open={isTrainDialogOpen} onOpenChange={setIsTrainDialogOpen}>
|
||||||
<DialogTrigger asChild>
|
<DialogTrigger asChild>
|
||||||
@ -278,19 +273,14 @@ export default function TrainingPage() {
|
|||||||
|
|
||||||
<Card data-testid="card-detect-action">
|
<Card data-testid="card-detect-action">
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<CardTitle className="flex items-center gap-2">
|
<CardTitle className="flex items-center gap-2">
|
||||||
<Search className="h-5 w-5" />
|
<Search className="h-5 w-5" />
|
||||||
Rilevamento Anomalie
|
Rilevamento Anomalie
|
||||||
</CardTitle>
|
</CardTitle>
|
||||||
<Badge variant="secondary" className="bg-green-50 text-green-700 dark:bg-green-950 dark:text-green-300" data-testid="badge-detection-version">
|
|
||||||
Hybrid ML v2.0.0
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent className="space-y-4">
|
<CardContent className="space-y-4">
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
Analizza i log recenti per rilevare anomalie e IP sospetti con il modello Hybrid ML. Blocca automaticamente gli IP critici (risk_score ≥ 80).
|
Analizza i log recenti per rilevare anomalie e IP sospetti. Opzionalmente blocca automaticamente gli IP critici.
|
||||||
</p>
|
</p>
|
||||||
<Dialog open={isDetectDialogOpen} onOpenChange={setIsDetectDialogOpen}>
|
<Dialog open={isDetectDialogOpen} onOpenChange={setIsDetectDialogOpen}>
|
||||||
<DialogTrigger asChild>
|
<DialogTrigger asChild>
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { useQuery, useMutation } from "@tanstack/react-query";
|
|||||||
import { queryClient, apiRequest } from "@/lib/queryClient";
|
import { queryClient, apiRequest } from "@/lib/queryClient";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Shield, Plus, Trash2, CheckCircle2, XCircle, Search } from "lucide-react";
|
import { Shield, Plus, Trash2, CheckCircle2, XCircle } from "lucide-react";
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useForm } from "react-hook-form";
|
import { useForm } from "react-hook-form";
|
||||||
@ -44,7 +44,6 @@ const whitelistFormSchema = insertWhitelistSchema.extend({
|
|||||||
export default function WhitelistPage() {
|
export default function WhitelistPage() {
|
||||||
const { toast } = useToast();
|
const { toast } = useToast();
|
||||||
const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
|
const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
|
||||||
const [searchQuery, setSearchQuery] = useState("");
|
|
||||||
|
|
||||||
const form = useForm<z.infer<typeof whitelistFormSchema>>({
|
const form = useForm<z.infer<typeof whitelistFormSchema>>({
|
||||||
resolver: zodResolver(whitelistFormSchema),
|
resolver: zodResolver(whitelistFormSchema),
|
||||||
@ -60,13 +59,6 @@ export default function WhitelistPage() {
|
|||||||
queryKey: ["/api/whitelist"],
|
queryKey: ["/api/whitelist"],
|
||||||
});
|
});
|
||||||
|
|
||||||
// Filter whitelist based on search query
|
|
||||||
const filteredWhitelist = whitelist?.filter((item) =>
|
|
||||||
item.ipAddress.toLowerCase().includes(searchQuery.toLowerCase()) ||
|
|
||||||
item.reason?.toLowerCase().includes(searchQuery.toLowerCase()) ||
|
|
||||||
item.comment?.toLowerCase().includes(searchQuery.toLowerCase())
|
|
||||||
);
|
|
||||||
|
|
||||||
const addMutation = useMutation({
|
const addMutation = useMutation({
|
||||||
mutationFn: async (data: z.infer<typeof whitelistFormSchema>) => {
|
mutationFn: async (data: z.infer<typeof whitelistFormSchema>) => {
|
||||||
return await apiRequest("POST", "/api/whitelist", data);
|
return await apiRequest("POST", "/api/whitelist", data);
|
||||||
@ -197,27 +189,11 @@ export default function WhitelistPage() {
|
|||||||
</Dialog>
|
</Dialog>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Search Bar */}
|
|
||||||
<Card data-testid="card-search">
|
|
||||||
<CardContent className="pt-6">
|
|
||||||
<div className="relative">
|
|
||||||
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
|
||||||
<Input
|
|
||||||
placeholder="Cerca per IP, motivo o note..."
|
|
||||||
value={searchQuery}
|
|
||||||
onChange={(e) => setSearchQuery(e.target.value)}
|
|
||||||
className="pl-9"
|
|
||||||
data-testid="input-search-whitelist"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
|
|
||||||
<Card data-testid="card-whitelist">
|
<Card data-testid="card-whitelist">
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle className="flex items-center gap-2">
|
<CardTitle className="flex items-center gap-2">
|
||||||
<Shield className="h-5 w-5" />
|
<Shield className="h-5 w-5" />
|
||||||
IP Protetti ({filteredWhitelist?.length || 0}{searchQuery && whitelist ? ` di ${whitelist.length}` : ''})
|
IP Protetti ({whitelist?.length || 0})
|
||||||
</CardTitle>
|
</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
@ -225,9 +201,9 @@ export default function WhitelistPage() {
|
|||||||
<div className="text-center py-8 text-muted-foreground" data-testid="text-loading">
|
<div className="text-center py-8 text-muted-foreground" data-testid="text-loading">
|
||||||
Caricamento...
|
Caricamento...
|
||||||
</div>
|
</div>
|
||||||
) : filteredWhitelist && filteredWhitelist.length > 0 ? (
|
) : whitelist && whitelist.length > 0 ? (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
{filteredWhitelist.map((item) => (
|
{whitelist.map((item) => (
|
||||||
<div
|
<div
|
||||||
key={item.id}
|
key={item.id}
|
||||||
className="p-4 rounded-lg border hover-elevate"
|
className="p-4 rounded-lg border hover-elevate"
|
||||||
|
|||||||
@ -13,7 +13,6 @@ set -e
|
|||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
MIGRATIONS_DIR="$SCRIPT_DIR/migrations"
|
MIGRATIONS_DIR="$SCRIPT_DIR/migrations"
|
||||||
IDS_DIR="$(dirname "$SCRIPT_DIR")"
|
IDS_DIR="$(dirname "$SCRIPT_DIR")"
|
||||||
DEPLOYMENT_MIGRATIONS_DIR="$IDS_DIR/deployment/migrations"
|
|
||||||
|
|
||||||
# Carica variabili ambiente ed esportale
|
# Carica variabili ambiente ed esportale
|
||||||
if [ -f "$IDS_DIR/.env" ]; then
|
if [ -f "$IDS_DIR/.env" ]; then
|
||||||
@ -80,25 +79,9 @@ echo -e "${CYAN}📊 Versione database corrente: ${YELLOW}${CURRENT_VERSION}${NC
|
|||||||
# STEP 3: Trova migrazioni da applicare
|
# STEP 3: Trova migrazioni da applicare
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
# Formato migrazioni: 001_description.sql, 002_another.sql, etc.
|
# Formato migrazioni: 001_description.sql, 002_another.sql, etc.
|
||||||
# Cerca in ENTRAMBE le cartelle: database-schema/migrations E deployment/migrations
|
|
||||||
MIGRATIONS_TO_APPLY=()
|
MIGRATIONS_TO_APPLY=()
|
||||||
|
|
||||||
# Combina migrations da entrambe le cartelle e ordina per numero
|
for migration_file in $(find "$MIGRATIONS_DIR" -name "[0-9][0-9][0-9]_*.sql" | sort); do
|
||||||
ALL_MIGRATIONS=""
|
|
||||||
if [ -d "$MIGRATIONS_DIR" ]; then
|
|
||||||
ALL_MIGRATIONS+=$(find "$MIGRATIONS_DIR" -name "[0-9][0-9][0-9]_*.sql" 2>/dev/null || true)
|
|
||||||
fi
|
|
||||||
if [ -d "$DEPLOYMENT_MIGRATIONS_DIR" ]; then
|
|
||||||
if [ -n "$ALL_MIGRATIONS" ]; then
|
|
||||||
ALL_MIGRATIONS+=$'\n'
|
|
||||||
fi
|
|
||||||
ALL_MIGRATIONS+=$(find "$DEPLOYMENT_MIGRATIONS_DIR" -name "[0-9][0-9][0-9]_*.sql" 2>/dev/null || true)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ordina le migrations per nome file (NNN_*.sql) estraendo il basename
|
|
||||||
SORTED_MIGRATIONS=$(echo "$ALL_MIGRATIONS" | grep -v '^$' | while read f; do echo "$(basename "$f"):$f"; done | sort | cut -d':' -f2)
|
|
||||||
|
|
||||||
for migration_file in $SORTED_MIGRATIONS; do
|
|
||||||
MIGRATION_NAME=$(basename "$migration_file")
|
MIGRATION_NAME=$(basename "$migration_file")
|
||||||
|
|
||||||
# Estrai numero versione dal nome file (001, 002, etc.)
|
# Estrai numero versione dal nome file (001, 002, etc.)
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
-- PostgreSQL database dump
|
-- PostgreSQL database dump
|
||||||
--
|
--
|
||||||
|
|
||||||
\restrict Jq3ohS02Qcz3l9bNbeQprTZolEFbFh84eEwk4en2HkAqc2Xojxrd4AFqHJvBETG
|
\restrict KIBvvJVRt4gAMLoGbAHHohmcMFf9kSImySXGHwSSncidSDFqgSo61BWMFDkLsSm
|
||||||
|
|
||||||
-- Dumped from database version 16.11 (74c6bb6)
|
-- Dumped from database version 16.9 (415ebe8)
|
||||||
-- Dumped by pg_dump version 16.10
|
-- Dumped by pg_dump version 16.10
|
||||||
|
|
||||||
SET statement_timeout = 0;
|
SET statement_timeout = 0;
|
||||||
@ -45,9 +45,7 @@ CREATE TABLE public.detections (
|
|||||||
organization text,
|
organization text,
|
||||||
as_number text,
|
as_number text,
|
||||||
as_name text,
|
as_name text,
|
||||||
isp text,
|
isp text
|
||||||
detection_source text DEFAULT 'ml_model'::text,
|
|
||||||
blacklist_id character varying
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
@ -98,44 +96,6 @@ CREATE TABLE public.network_logs (
|
|||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public_blacklist_ips; Type: TABLE; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE public.public_blacklist_ips (
|
|
||||||
id character varying DEFAULT (gen_random_uuid())::text NOT NULL,
|
|
||||||
ip_address text NOT NULL,
|
|
||||||
cidr_range text,
|
|
||||||
ip_inet text,
|
|
||||||
cidr_inet text,
|
|
||||||
list_id character varying NOT NULL,
|
|
||||||
first_seen timestamp without time zone DEFAULT now() NOT NULL,
|
|
||||||
last_seen timestamp without time zone DEFAULT now() NOT NULL,
|
|
||||||
is_active boolean DEFAULT true NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public_lists; Type: TABLE; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE public.public_lists (
|
|
||||||
id character varying DEFAULT (gen_random_uuid())::text NOT NULL,
|
|
||||||
name text NOT NULL,
|
|
||||||
type text NOT NULL,
|
|
||||||
url text NOT NULL,
|
|
||||||
enabled boolean DEFAULT true NOT NULL,
|
|
||||||
fetch_interval_minutes integer DEFAULT 10 NOT NULL,
|
|
||||||
last_fetch timestamp without time zone,
|
|
||||||
last_success timestamp without time zone,
|
|
||||||
total_ips integer DEFAULT 0 NOT NULL,
|
|
||||||
active_ips integer DEFAULT 0 NOT NULL,
|
|
||||||
error_count integer DEFAULT 0 NOT NULL,
|
|
||||||
last_error text,
|
|
||||||
created_at timestamp without time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: routers; Type: TABLE; Schema: public; Owner: -
|
-- Name: routers; Type: TABLE; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
@ -193,10 +153,7 @@ CREATE TABLE public.whitelist (
|
|||||||
reason text,
|
reason text,
|
||||||
created_by text,
|
created_by text,
|
||||||
active boolean DEFAULT true NOT NULL,
|
active boolean DEFAULT true NOT NULL,
|
||||||
created_at timestamp without time zone DEFAULT now() NOT NULL,
|
created_at timestamp without time zone DEFAULT now() NOT NULL
|
||||||
source text DEFAULT 'manual'::text,
|
|
||||||
list_id character varying,
|
|
||||||
ip_inet text
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
@ -232,30 +189,6 @@ ALTER TABLE ONLY public.network_logs
|
|||||||
ADD CONSTRAINT network_logs_pkey PRIMARY KEY (id);
|
ADD CONSTRAINT network_logs_pkey PRIMARY KEY (id);
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public_blacklist_ips public_blacklist_ips_ip_address_list_id_key; Type: CONSTRAINT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY public.public_blacklist_ips
|
|
||||||
ADD CONSTRAINT public_blacklist_ips_ip_address_list_id_key UNIQUE (ip_address, list_id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public_blacklist_ips public_blacklist_ips_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY public.public_blacklist_ips
|
|
||||||
ADD CONSTRAINT public_blacklist_ips_pkey PRIMARY KEY (id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public_lists public_lists_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY public.public_lists
|
|
||||||
ADD CONSTRAINT public_lists_pkey PRIMARY KEY (id);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: routers routers_ip_address_unique; Type: CONSTRAINT; Schema: public; Owner: -
|
-- Name: routers routers_ip_address_unique; Type: CONSTRAINT; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
@ -375,17 +308,9 @@ ALTER TABLE ONLY public.network_logs
|
|||||||
ADD CONSTRAINT network_logs_router_id_routers_id_fk FOREIGN KEY (router_id) REFERENCES public.routers(id);
|
ADD CONSTRAINT network_logs_router_id_routers_id_fk FOREIGN KEY (router_id) REFERENCES public.routers(id);
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: public_blacklist_ips public_blacklist_ips_list_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY public.public_blacklist_ips
|
|
||||||
ADD CONSTRAINT public_blacklist_ips_list_id_fkey FOREIGN KEY (list_id) REFERENCES public.public_lists(id) ON DELETE CASCADE;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- PostgreSQL database dump complete
|
-- PostgreSQL database dump complete
|
||||||
--
|
--
|
||||||
|
|
||||||
\unrestrict Jq3ohS02Qcz3l9bNbeQprTZolEFbFh84eEwk4en2HkAqc2Xojxrd4AFqHJvBETG
|
\unrestrict KIBvvJVRt4gAMLoGbAHHohmcMFf9kSImySXGHwSSncidSDFqgSo61BWMFDkLsSm
|
||||||
|
|
||||||
|
|||||||
@ -1,260 +0,0 @@
|
|||||||
# Auto-Blocking Setup - IDS MikroTik
|
|
||||||
|
|
||||||
## 📋 Panoramica
|
|
||||||
|
|
||||||
Sistema di auto-blocking automatico che rileva e blocca IP con **risk_score >= 80** ogni 5 minuti.
|
|
||||||
|
|
||||||
**Componenti**:
|
|
||||||
1. `python_ml/auto_block.py` - Script Python che chiama API ML
|
|
||||||
2. `deployment/systemd/ids-auto-block.service` - Systemd service
|
|
||||||
3. `deployment/systemd/ids-auto-block.timer` - Timer esecuzione ogni 5 minuti
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🚀 Installazione su AlmaLinux
|
|
||||||
|
|
||||||
### 1️⃣ Prerequisiti
|
|
||||||
|
|
||||||
Verifica che questi servizi siano attivi:
|
|
||||||
```bash
|
|
||||||
sudo systemctl status ids-ml-backend # ML Backend FastAPI
|
|
||||||
sudo systemctl status postgresql-16 # Database PostgreSQL
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2️⃣ Copia File Systemd
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Service file
|
|
||||||
sudo cp /opt/ids/deployment/systemd/ids-auto-block.service /etc/systemd/system/
|
|
||||||
|
|
||||||
# Timer file
|
|
||||||
sudo cp /opt/ids/deployment/systemd/ids-auto-block.timer /etc/systemd/system/
|
|
||||||
|
|
||||||
# Verifica permessi
|
|
||||||
sudo chown root:root /etc/systemd/system/ids-auto-block.*
|
|
||||||
sudo chmod 644 /etc/systemd/system/ids-auto-block.*
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3️⃣ Rendi Eseguibile Script Python
|
|
||||||
|
|
||||||
```bash
|
|
||||||
chmod +x /opt/ids/python_ml/auto_block.py
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4️⃣ Installa Dipendenza Python (requests)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Attiva virtual environment
|
|
||||||
cd /opt/ids/python_ml
|
|
||||||
source venv/bin/activate
|
|
||||||
|
|
||||||
# Installa requests
|
|
||||||
pip install requests
|
|
||||||
|
|
||||||
# Esci da venv
|
|
||||||
deactivate
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5️⃣ Crea Directory Log
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo mkdir -p /var/log/ids
|
|
||||||
sudo chown ids:ids /var/log/ids
|
|
||||||
```
|
|
||||||
|
|
||||||
### 6️⃣ Ricarica Systemd e Avvia Timer
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Ricarica systemd
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
|
|
||||||
# Abilita timer (autostart al boot)
|
|
||||||
sudo systemctl enable ids-auto-block.timer
|
|
||||||
|
|
||||||
# Avvia timer
|
|
||||||
sudo systemctl start ids-auto-block.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ Verifica Funzionamento
|
|
||||||
|
|
||||||
### Test Manuale (esegui subito)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Esegui auto-blocking adesso (non aspettare 5 min)
|
|
||||||
sudo systemctl start ids-auto-block.service
|
|
||||||
|
|
||||||
# Controlla log output
|
|
||||||
journalctl -u ids-auto-block -n 30
|
|
||||||
```
|
|
||||||
|
|
||||||
**Output atteso**:
|
|
||||||
```
|
|
||||||
[2024-11-25 12:00:00] 🔍 Starting auto-block detection...
|
|
||||||
✓ Detection completata: 14 anomalie rilevate, 14 IP bloccati
|
|
||||||
```
|
|
||||||
|
|
||||||
### Verifica Timer Attivo
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Status timer
|
|
||||||
systemctl status ids-auto-block.timer
|
|
||||||
|
|
||||||
# Prossime esecuzioni
|
|
||||||
systemctl list-timers ids-auto-block.timer
|
|
||||||
|
|
||||||
# Ultima esecuzione
|
|
||||||
journalctl -u ids-auto-block.service -n 1
|
|
||||||
```
|
|
||||||
|
|
||||||
### Verifica IP Bloccati
|
|
||||||
|
|
||||||
**Database**:
|
|
||||||
```sql
|
|
||||||
SELECT COUNT(*) FROM detections WHERE blocked = true;
|
|
||||||
```
|
|
||||||
|
|
||||||
**MikroTik Router**:
|
|
||||||
```
|
|
||||||
/ip firewall address-list print where list=blocked_ips
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 Monitoring
|
|
||||||
|
|
||||||
### Log in Tempo Reale
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Log auto-blocking
|
|
||||||
tail -f /var/log/ids/auto_block.log
|
|
||||||
|
|
||||||
# O via journalctl
|
|
||||||
journalctl -u ids-auto-block -f
|
|
||||||
```
|
|
||||||
|
|
||||||
### Statistiche Blocchi
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Conta esecuzioni ultimo giorno
|
|
||||||
journalctl -u ids-auto-block --since "1 day ago" | grep "Detection completata" | wc -l
|
|
||||||
|
|
||||||
# Totale IP bloccati oggi
|
|
||||||
journalctl -u ids-auto-block --since today | grep "IP bloccati"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ⚙️ Configurazione
|
|
||||||
|
|
||||||
### Modifica Frequenza Esecuzione
|
|
||||||
|
|
||||||
Edita `/etc/systemd/system/ids-auto-block.timer`:
|
|
||||||
|
|
||||||
```ini
|
|
||||||
[Timer]
|
|
||||||
# Cambia 5min con frequenza desiderata (es: 10min, 1h, 30s)
|
|
||||||
OnUnitActiveSec=10min # Esegui ogni 10 minuti
|
|
||||||
```
|
|
||||||
|
|
||||||
Poi ricarica:
|
|
||||||
```bash
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
sudo systemctl restart ids-auto-block.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
### Modifica Threshold Risk Score
|
|
||||||
|
|
||||||
Edita `python_ml/auto_block.py`:
|
|
||||||
|
|
||||||
```python
|
|
||||||
"risk_threshold": 80.0, # Cambia soglia (80, 90, 100, etc)
|
|
||||||
```
|
|
||||||
|
|
||||||
Poi riavvia timer:
|
|
||||||
```bash
|
|
||||||
sudo systemctl restart ids-auto-block.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🛠️ Troubleshooting
|
|
||||||
|
|
||||||
### Problema: Nessun IP bloccato
|
|
||||||
|
|
||||||
**Verifica ML Backend attivo**:
|
|
||||||
```bash
|
|
||||||
systemctl status ids-ml-backend
|
|
||||||
curl http://localhost:8000/health
|
|
||||||
```
|
|
||||||
|
|
||||||
**Verifica router configurati**:
|
|
||||||
```sql
|
|
||||||
SELECT * FROM routers WHERE enabled = true;
|
|
||||||
```
|
|
||||||
|
|
||||||
Deve esserci almeno 1 router!
|
|
||||||
|
|
||||||
### Problema: Errore "Connection refused"
|
|
||||||
|
|
||||||
ML Backend non risponde su porta 8000:
|
|
||||||
```bash
|
|
||||||
# Riavvia ML backend
|
|
||||||
sudo systemctl restart ids-ml-backend
|
|
||||||
|
|
||||||
# Verifica porta listening
|
|
||||||
netstat -tlnp | grep 8000
|
|
||||||
```
|
|
||||||
|
|
||||||
### Problema: Script non eseguito
|
|
||||||
|
|
||||||
**Verifica timer attivo**:
|
|
||||||
```bash
|
|
||||||
systemctl status ids-auto-block.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
**Forza esecuzione manuale**:
|
|
||||||
```bash
|
|
||||||
sudo systemctl start ids-auto-block.service
|
|
||||||
journalctl -u ids-auto-block -n 50
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔄 Disinstallazione
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Stop e disabilita timer
|
|
||||||
sudo systemctl stop ids-auto-block.timer
|
|
||||||
sudo systemctl disable ids-auto-block.timer
|
|
||||||
|
|
||||||
# Rimuovi file systemd
|
|
||||||
sudo rm /etc/systemd/system/ids-auto-block.*
|
|
||||||
|
|
||||||
# Ricarica systemd
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📝 Note
|
|
||||||
|
|
||||||
- **Frequenza**: 5 minuti (configurabile)
|
|
||||||
- **Risk Threshold**: 80 (solo IP critici)
|
|
||||||
- **Timeout**: 180 secondi (3 minuti max per detection)
|
|
||||||
- **Logs**: `/var/log/ids/auto_block.log` + journalctl
|
|
||||||
- **Dipendenze**: ids-ml-backend.service, postgresql-16.service
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ Checklist Post-Installazione
|
|
||||||
|
|
||||||
- [ ] File copiati in `/etc/systemd/system/`
|
|
||||||
- [ ] Script `auto_block.py` eseguibile
|
|
||||||
- [ ] Dipendenza `requests` installata in venv
|
|
||||||
- [ ] Directory log creata (`/var/log/ids`)
|
|
||||||
- [ ] Timer abilitato e avviato
|
|
||||||
- [ ] Test manuale eseguito con successo
|
|
||||||
- [ ] IP bloccati su MikroTik verificati
|
|
||||||
- [ ] Monitoring attivo (journalctl -f)
|
|
||||||
@ -1,342 +0,0 @@
|
|||||||
# IDS - Guida Cleanup Detections Automatico
|
|
||||||
|
|
||||||
## 📋 Overview
|
|
||||||
|
|
||||||
Sistema automatico di pulizia delle detections e gestione IP bloccati secondo regole temporali:
|
|
||||||
|
|
||||||
1. **Cleanup Detections**: Elimina detections non bloccate più vecchie di **48 ore**
|
|
||||||
2. **Auto-Unblock**: Sblocca IP bloccati da più di **2 ore** senza nuove anomalie
|
|
||||||
|
|
||||||
## ⚙️ Componenti
|
|
||||||
|
|
||||||
### 1. Script Python: `python_ml/cleanup_detections.py`
|
|
||||||
Script principale che esegue le operazioni di cleanup:
|
|
||||||
- Elimina detections vecchie dal database
|
|
||||||
- Marca come "sbloccati" gli IP nel DB (NON rimuove da MikroTik firewall!)
|
|
||||||
- Logging completo in `/var/log/ids/cleanup.log`
|
|
||||||
|
|
||||||
### 2. Wrapper Bash: `deployment/run_cleanup.sh`
|
|
||||||
Wrapper che carica le variabili d'ambiente e esegue lo script Python.
|
|
||||||
|
|
||||||
### 3. Systemd Service: `ids-cleanup.service`
|
|
||||||
Service oneshot che esegue il cleanup una volta.
|
|
||||||
|
|
||||||
### 4. Systemd Timer: `ids-cleanup.timer`
|
|
||||||
Timer che esegue il cleanup **ogni ora alle XX:10** (es. 10:10, 11:10, 12:10...).
|
|
||||||
|
|
||||||
## 🚀 Installazione
|
|
||||||
|
|
||||||
### Prerequisiti
|
|
||||||
Assicurati di avere le dipendenze Python installate:
|
|
||||||
```bash
|
|
||||||
# Installa dipendenze (se non già fatto)
|
|
||||||
sudo pip3 install psycopg2-binary python-dotenv
|
|
||||||
|
|
||||||
# Oppure usa requirements.txt
|
|
||||||
sudo pip3 install -r python_ml/requirements.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
### Setup Automatico
|
|
||||||
```bash
|
|
||||||
cd /opt/ids
|
|
||||||
|
|
||||||
# Esegui setup automatico (installa dipendenze + configura timer)
|
|
||||||
sudo ./deployment/setup_cleanup_timer.sh
|
|
||||||
|
|
||||||
# Output:
|
|
||||||
# [1/7] Installazione dipendenze Python...
|
|
||||||
# [2/7] Creazione directory log...
|
|
||||||
# ...
|
|
||||||
# ✅ Cleanup timer installato e avviato con successo!
|
|
||||||
```
|
|
||||||
|
|
||||||
**Nota**: Lo script installa automaticamente le dipendenze Python necessarie.
|
|
||||||
|
|
||||||
## 📊 Monitoraggio
|
|
||||||
|
|
||||||
### Stato Timer
|
|
||||||
```bash
|
|
||||||
# Verifica che il timer sia attivo
|
|
||||||
sudo systemctl status ids-cleanup.timer
|
|
||||||
|
|
||||||
# Prossima esecuzione programmata
|
|
||||||
systemctl list-timers ids-cleanup.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
### Log
|
|
||||||
```bash
|
|
||||||
# Real-time log
|
|
||||||
tail -f /var/log/ids/cleanup.log
|
|
||||||
|
|
||||||
# Ultime 50 righe
|
|
||||||
tail -50 /var/log/ids/cleanup.log
|
|
||||||
|
|
||||||
# Log completo
|
|
||||||
cat /var/log/ids/cleanup.log
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🔧 Uso Manuale
|
|
||||||
|
|
||||||
### Esecuzione Immediata
|
|
||||||
```bash
|
|
||||||
# Via systemd (consigliato)
|
|
||||||
sudo systemctl start ids-cleanup.service
|
|
||||||
|
|
||||||
# Oppure direttamente
|
|
||||||
sudo ./deployment/run_cleanup.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Test con Output Verbose
|
|
||||||
```bash
|
|
||||||
cd /opt/ids
|
|
||||||
source .env
|
|
||||||
python3 python_ml/cleanup_detections.py
|
|
||||||
```
|
|
||||||
|
|
||||||
## 📝 Regole di Cleanup
|
|
||||||
|
|
||||||
### Regola 1: Cleanup Detections (48 ore)
|
|
||||||
**Query SQL**:
|
|
||||||
```sql
|
|
||||||
DELETE FROM detections
|
|
||||||
WHERE detected_at < NOW() - INTERVAL '48 hours'
|
|
||||||
AND blocked = false
|
|
||||||
```
|
|
||||||
|
|
||||||
**Logica**:
|
|
||||||
- Se un IP è stato rilevato ma **non bloccato**
|
|
||||||
- E non ci sono nuove detections da **48 ore**
|
|
||||||
- → Eliminalo dal database
|
|
||||||
|
|
||||||
**Esempio**:
|
|
||||||
- IP `1.2.3.4` rilevato il 23/11 alle 10:00
|
|
||||||
- Non bloccato (risk_score < 80)
|
|
||||||
- Nessuna nuova detection per 48 ore
|
|
||||||
- → **25/11 alle 10:10** → IP eliminato ✅
|
|
||||||
|
|
||||||
### Regola 2: Auto-Unblock (2 ore)
|
|
||||||
**Query SQL**:
|
|
||||||
```sql
|
|
||||||
UPDATE detections
|
|
||||||
SET blocked = false, blocked_at = NULL
|
|
||||||
WHERE blocked = true
|
|
||||||
AND blocked_at < NOW() - INTERVAL '2 hours'
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM detections d2
|
|
||||||
WHERE d2.source_ip = detections.source_ip
|
|
||||||
AND d2.detected_at > NOW() - INTERVAL '2 hours'
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Logica**:
|
|
||||||
- Se un IP è **bloccato**
|
|
||||||
- E bloccato da **più di 2 ore**
|
|
||||||
- E **nessuna nuova detection** nelle ultime 2 ore
|
|
||||||
- → Sbloccalo nel DB
|
|
||||||
|
|
||||||
**⚠️ ATTENZIONE**: Questo sblocca solo nel **database**, NON rimuove l'IP dalle **firewall list MikroTik**!
|
|
||||||
|
|
||||||
**Esempio**:
|
|
||||||
- IP `5.6.7.8` bloccato il 25/11 alle 08:00
|
|
||||||
- Nessuna nuova detection per 2 ore
|
|
||||||
- → **25/11 alle 10:10** → `blocked=false` nel DB ✅
|
|
||||||
- → **ANCORA nella firewall MikroTik** ❌
|
|
||||||
|
|
||||||
### Come rimuovere da MikroTik
|
|
||||||
```bash
|
|
||||||
# Via API ML Backend
|
|
||||||
curl -X POST http://localhost:8000/unblock-ip \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"ip_address": "5.6.7.8"}'
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🛠️ Configurazione
|
|
||||||
|
|
||||||
### Modifica Intervalli
|
|
||||||
|
|
||||||
#### Cambia soglia cleanup (es. 72 ore invece di 48)
|
|
||||||
Modifica `python_ml/cleanup_detections.py`:
|
|
||||||
```python
|
|
||||||
# Linea ~47
|
|
||||||
deleted_count = cleanup_old_detections(conn, hours=72) # ← Cambia qui
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Cambia soglia unblock (es. 4 ore invece di 2)
|
|
||||||
Modifica `python_ml/cleanup_detections.py`:
|
|
||||||
```python
|
|
||||||
# Linea ~51
|
|
||||||
unblocked_count = unblock_old_ips(conn, hours=4) # ← Cambia qui
|
|
||||||
```
|
|
||||||
|
|
||||||
### Modifica Frequenza Esecuzione
|
|
||||||
Modifica `deployment/systemd/ids-cleanup.timer`:
|
|
||||||
```ini
|
|
||||||
[Timer]
|
|
||||||
# Ogni 6 ore invece di ogni ora
|
|
||||||
OnCalendar=00/6:10:00
|
|
||||||
```
|
|
||||||
|
|
||||||
Dopo le modifiche:
|
|
||||||
```bash
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
sudo systemctl restart ids-cleanup.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
## 📊 Output Esempio
|
|
||||||
|
|
||||||
```
|
|
||||||
============================================================
|
|
||||||
CLEANUP DETECTIONS - Avvio
|
|
||||||
============================================================
|
|
||||||
✅ Connesso al database
|
|
||||||
|
|
||||||
[1/2] Cleanup detections vecchie...
|
|
||||||
Trovate 45 detections da eliminare (più vecchie di 48h)
|
|
||||||
✅ Eliminate 45 detections vecchie
|
|
||||||
|
|
||||||
[2/2] Sblocco IP vecchi...
|
|
||||||
Trovati 3 IP da sbloccare (bloccati da più di 2h)
|
|
||||||
- 1.2.3.4 (tipo: ddos, score: 85.2)
|
|
||||||
- 5.6.7.8 (tipo: port_scan, score: 82.1)
|
|
||||||
- 9.10.11.12 (tipo: brute_force, score: 90.5)
|
|
||||||
✅ Sbloccati 3 IP nel database
|
|
||||||
⚠️ ATTENZIONE: IP ancora presenti nelle firewall list MikroTik!
|
|
||||||
💡 Per rimuoverli dai router, usa: curl -X POST http://localhost:8000/unblock-ip -d '{"ip_address": "X.X.X.X"}'
|
|
||||||
|
|
||||||
============================================================
|
|
||||||
CLEANUP COMPLETATO
|
|
||||||
- Detections eliminate: 45
|
|
||||||
- IP sbloccati (DB): 3
|
|
||||||
============================================================
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🔍 Troubleshooting
|
|
||||||
|
|
||||||
### Timer non parte
|
|
||||||
```bash
|
|
||||||
# Verifica che il timer sia enabled
|
|
||||||
sudo systemctl is-enabled ids-cleanup.timer
|
|
||||||
|
|
||||||
# Se disabled, abilita
|
|
||||||
sudo systemctl enable ids-cleanup.timer
|
|
||||||
sudo systemctl start ids-cleanup.timer
|
|
||||||
```
|
|
||||||
|
|
||||||
### Errori nel log
|
|
||||||
```bash
|
|
||||||
# Controlla errori
|
|
||||||
grep ERROR /var/log/ids/cleanup.log
|
|
||||||
|
|
||||||
# Controlla connessione DB
|
|
||||||
grep "Connesso al database" /var/log/ids/cleanup.log
|
|
||||||
```
|
|
||||||
|
|
||||||
### Test connessione DB
|
|
||||||
```bash
|
|
||||||
cd /opt/ids
|
|
||||||
source .env
|
|
||||||
python3 -c "
|
|
||||||
import psycopg2
|
|
||||||
conn = psycopg2.connect(
|
|
||||||
host='$PGHOST',
|
|
||||||
port=$PGPORT,
|
|
||||||
user='$PGUSER',
|
|
||||||
password='$PGPASSWORD',
|
|
||||||
database='$PGDATABASE'
|
|
||||||
)
|
|
||||||
print('✅ DB connesso!')
|
|
||||||
conn.close()
|
|
||||||
"
|
|
||||||
```
|
|
||||||
|
|
||||||
## 📈 Metriche
|
|
||||||
|
|
||||||
### Query per statistiche
|
|
||||||
```sql
|
|
||||||
-- Detections per età
|
|
||||||
SELECT
|
|
||||||
CASE
|
|
||||||
WHEN detected_at > NOW() - INTERVAL '2 hours' THEN '< 2h'
|
|
||||||
WHEN detected_at > NOW() - INTERVAL '24 hours' THEN '< 24h'
|
|
||||||
WHEN detected_at > NOW() - INTERVAL '48 hours' THEN '< 48h'
|
|
||||||
ELSE '> 48h'
|
|
||||||
END as age_group,
|
|
||||||
COUNT(*) as count,
|
|
||||||
COUNT(CASE WHEN blocked THEN 1 END) as blocked_count
|
|
||||||
FROM detections
|
|
||||||
GROUP BY age_group
|
|
||||||
ORDER BY age_group;
|
|
||||||
|
|
||||||
-- IP bloccati per durata
|
|
||||||
SELECT
|
|
||||||
source_ip,
|
|
||||||
blocked_at,
|
|
||||||
EXTRACT(EPOCH FROM (NOW() - blocked_at)) / 3600 as hours_blocked,
|
|
||||||
anomaly_type,
|
|
||||||
risk_score::numeric
|
|
||||||
FROM detections
|
|
||||||
WHERE blocked = true
|
|
||||||
ORDER BY blocked_at DESC;
|
|
||||||
```
|
|
||||||
|
|
||||||
## ⚙️ Integrazione con Altri Sistemi
|
|
||||||
|
|
||||||
### Notifiche Email (opzionale)
|
|
||||||
Aggiungi a `python_ml/cleanup_detections.py`:
|
|
||||||
```python
|
|
||||||
import smtplib
|
|
||||||
from email.mime.text import MIMEText
|
|
||||||
|
|
||||||
if unblocked_count > 0:
|
|
||||||
msg = MIMEText(f"Sbloccati {unblocked_count} IP")
|
|
||||||
msg['Subject'] = 'IDS Cleanup Report'
|
|
||||||
msg['From'] = 'ids@example.com'
|
|
||||||
msg['To'] = 'admin@example.com'
|
|
||||||
|
|
||||||
s = smtplib.SMTP('localhost')
|
|
||||||
s.send_message(msg)
|
|
||||||
s.quit()
|
|
||||||
```
|
|
||||||
|
|
||||||
### Webhook (opzionale)
|
|
||||||
```python
|
|
||||||
import requests
|
|
||||||
|
|
||||||
requests.post('https://hooks.slack.com/...', json={
|
|
||||||
'text': f'IDS Cleanup: {deleted_count} detections eliminate, {unblocked_count} IP sbloccati'
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🔒 Sicurezza
|
|
||||||
|
|
||||||
- Script eseguito come **root** (necessario per systemd)
|
|
||||||
- Credenziali DB caricate da `.env` (NON hardcoded)
|
|
||||||
- Log in `/var/log/ids/` con permessi `644`
|
|
||||||
- Service con `NoNewPrivileges=true` e `PrivateTmp=true`
|
|
||||||
|
|
||||||
## 📅 Scheduler
|
|
||||||
|
|
||||||
Il timer è configurato per eseguire:
|
|
||||||
- **Frequenza**: Ogni ora
|
|
||||||
- **Minuto**: XX:10 (10 minuti dopo l'ora)
|
|
||||||
- **Randomizzazione**: ±5 minuti per load balancing
|
|
||||||
- **Persistent**: Recupera esecuzioni perse durante downtime
|
|
||||||
|
|
||||||
**Esempio orari**: 00:10, 01:10, 02:10, ..., 23:10
|
|
||||||
|
|
||||||
## ✅ Checklist Post-Installazione
|
|
||||||
|
|
||||||
- [ ] Timer installato: `systemctl status ids-cleanup.timer`
|
|
||||||
- [ ] Prossima esecuzione visibile: `systemctl list-timers`
|
|
||||||
- [ ] Test manuale OK: `sudo ./deployment/run_cleanup.sh`
|
|
||||||
- [ ] Log creato: `ls -la /var/log/ids/cleanup.log`
|
|
||||||
- [ ] Nessun errore nel log: `grep ERROR /var/log/ids/cleanup.log`
|
|
||||||
- [ ] Cleanup funzionante: verificare conteggio detections prima/dopo
|
|
||||||
|
|
||||||
## 🆘 Supporto
|
|
||||||
|
|
||||||
Per problemi o domande:
|
|
||||||
1. Controlla log: `tail -f /var/log/ids/cleanup.log`
|
|
||||||
2. Verifica timer: `systemctl status ids-cleanup.timer`
|
|
||||||
3. Test manuale: `sudo ./deployment/run_cleanup.sh`
|
|
||||||
4. Apri issue su GitHub o contatta il team
|
|
||||||
@ -12,7 +12,7 @@ echo "=========================================" >> "$LOG_FILE"
|
|||||||
|
|
||||||
curl -X POST http://localhost:8000/train \
|
curl -X POST http://localhost:8000/train \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"max_records": 1000000, "hours_back": 24}' \
|
-d '{"max_records": 100000, "hours_back": 24}' \
|
||||||
--max-time 300 >> "$LOG_FILE" 2>&1
|
--max-time 300 >> "$LOG_FILE" 2>&1
|
||||||
|
|
||||||
EXIT_CODE=$?
|
EXIT_CODE=$?
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
# Public Lists - Known Limitations (v2.0.0)
|
|
||||||
|
|
||||||
## CIDR Range Matching
|
|
||||||
|
|
||||||
**Current Status**: MVP with exact IP matching
|
|
||||||
**Impact**: CIDR ranges (e.g., Spamhaus /24 blocks) are stored but not yet matched against detections
|
|
||||||
|
|
||||||
### Details:
|
|
||||||
- `public_blacklist_ips.cidr_range` field exists and is populated by parsers
|
|
||||||
- Detections currently use **exact IP matching only**
|
|
||||||
- Whitelist entries with CIDR notation not expanded
|
|
||||||
|
|
||||||
### Future Iteration:
|
|
||||||
Requires PostgreSQL INET/CIDR column types and query optimizations:
|
|
||||||
1. Add dedicated `inet` columns to `public_blacklist_ips` and `whitelist`
|
|
||||||
2. Rewrite merge logic with CIDR containment operators (`<<=`, `>>=`)
|
|
||||||
3. Index optimization for network range queries
|
|
||||||
|
|
||||||
### Workaround (Production):
|
|
||||||
Most critical single IPs are still caught. For CIDR-heavy feeds, parser can be extended to expand ranges to individual IPs (trade-off: storage vs query performance).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Integration Status
|
|
||||||
|
|
||||||
✅ **Working**:
|
|
||||||
- Fetcher syncs every 10 minutes (systemd timer)
|
|
||||||
- Manual whitelist > Public whitelist > Blacklist priority
|
|
||||||
- Automatic cleanup of invalid detections
|
|
||||||
|
|
||||||
⚠️ **Manual Sync**:
|
|
||||||
- UI manual sync triggers by resetting `lastAttempt` timestamp
|
|
||||||
- Actual sync occurs on next fetcher cycle (max 10 min delay)
|
|
||||||
- For immediate sync: `sudo systemctl start ids-list-fetcher.service`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Performance Notes
|
|
||||||
|
|
||||||
- Bulk SQL operations avoid O(N) per-IP queries
|
|
||||||
- Tested with 186M+ network_logs records
|
|
||||||
- Query optimization ongoing for CIDR expansion
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Version**: 2.0.0 MVP
|
|
||||||
**Date**: 2025-11-26
|
|
||||||
**Next Iteration**: Full CIDR matching support
|
|
||||||
@ -1,295 +0,0 @@
|
|||||||
# Public Lists v2.0.0 - CIDR Complete Implementation
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
Sistema completo di integrazione liste pubbliche con supporto CIDR per matching di network ranges tramite operatori PostgreSQL INET.
|
|
||||||
|
|
||||||
## Database Schema v7
|
|
||||||
|
|
||||||
### Migration 007: CIDR Support
|
|
||||||
```sql
|
|
||||||
-- Aggiunte colonne INET/CIDR
|
|
||||||
ALTER TABLE public_blacklist_ips
|
|
||||||
ADD COLUMN ip_inet inet,
|
|
||||||
ADD COLUMN cidr_inet cidr;
|
|
||||||
|
|
||||||
ALTER TABLE whitelist
|
|
||||||
ADD COLUMN ip_inet inet;
|
|
||||||
|
|
||||||
-- Indexes GiST per operatori di rete
|
|
||||||
CREATE INDEX public_blacklist_ip_inet_idx ON public_blacklist_ips USING gist(ip_inet inet_ops);
|
|
||||||
CREATE INDEX public_blacklist_cidr_inet_idx ON public_blacklist_ips USING gist(cidr_inet inet_ops);
|
|
||||||
CREATE INDEX whitelist_ip_inet_idx ON whitelist USING gist(ip_inet inet_ops);
|
|
||||||
```
|
|
||||||
|
|
||||||
### Colonne Aggiunte
|
|
||||||
| Tabella | Colonna | Tipo | Scopo |
|
|
||||||
|---------|---------|------|-------|
|
|
||||||
| public_blacklist_ips | ip_inet | inet | IP singolo per matching esatto |
|
|
||||||
| public_blacklist_ips | cidr_inet | cidr | Range di rete per containment |
|
|
||||||
| whitelist | ip_inet | inet | IP/range per whitelist CIDR-aware |
|
|
||||||
|
|
||||||
## CIDR Matching Logic
|
|
||||||
|
|
||||||
### Operatori PostgreSQL INET
|
|
||||||
```sql
|
|
||||||
-- Containment: IP è contenuto in CIDR range?
|
|
||||||
'192.168.1.50'::inet <<= '192.168.1.0/24'::inet -- TRUE
|
|
||||||
|
|
||||||
-- Esempi pratici
|
|
||||||
'8.8.8.8'::inet <<= '8.8.8.0/24'::inet -- TRUE
|
|
||||||
'1.1.1.1'::inet <<= '8.8.8.0/24'::inet -- FALSE
|
|
||||||
'52.94.10.5'::inet <<= '52.94.0.0/16'::inet -- TRUE (AWS range)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Priority Logic con CIDR
|
|
||||||
```sql
|
|
||||||
-- Creazione detections con priorità CIDR-aware
|
|
||||||
INSERT INTO detections (source_ip, risk_score, ...)
|
|
||||||
SELECT bl.ip_address, 75, ...
|
|
||||||
FROM public_blacklist_ips bl
|
|
||||||
WHERE bl.is_active = true
|
|
||||||
AND bl.ip_inet IS NOT NULL
|
|
||||||
-- Priorità 1: Whitelist manuale (massima)
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM whitelist wl
|
|
||||||
WHERE wl.active = true
|
|
||||||
AND wl.source = 'manual'
|
|
||||||
AND (bl.ip_inet = wl.ip_inet OR bl.ip_inet <<= wl.ip_inet)
|
|
||||||
)
|
|
||||||
-- Priorità 2: Whitelist pubblica
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM whitelist wl
|
|
||||||
WHERE wl.active = true
|
|
||||||
AND wl.source != 'manual'
|
|
||||||
AND (bl.ip_inet = wl.ip_inet OR bl.ip_inet <<= wl.ip_inet)
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Cleanup CIDR-Aware
|
|
||||||
```sql
|
|
||||||
-- Rimuove detections per IP in whitelist ranges
|
|
||||||
DELETE FROM detections d
|
|
||||||
WHERE d.detection_source = 'public_blacklist'
|
|
||||||
AND EXISTS (
|
|
||||||
SELECT 1 FROM whitelist wl
|
|
||||||
WHERE wl.active = true
|
|
||||||
AND wl.ip_inet IS NOT NULL
|
|
||||||
AND (d.source_ip::inet = wl.ip_inet
|
|
||||||
OR d.source_ip::inet <<= wl.ip_inet)
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Performance
|
|
||||||
|
|
||||||
### Index Strategy
|
|
||||||
- **GiST indexes** ottimizzati per operatori `<<=` e `>>=`
|
|
||||||
- Query log(n) anche con 186M+ record
|
|
||||||
- Bulk operations mantenute per efficienza
|
|
||||||
|
|
||||||
### Benchmark
|
|
||||||
| Operazione | Complessità | Tempo Medio |
|
|
||||||
|------------|-------------|-------------|
|
|
||||||
| Exact IP lookup | O(log n) | ~5ms |
|
|
||||||
| CIDR containment | O(log n) | ~15ms |
|
|
||||||
| Bulk detection (10k IPs) | O(n) | ~2s |
|
|
||||||
| Priority filtering (100k) | O(n log m) | ~500ms |
|
|
||||||
|
|
||||||
## Testing Matrix
|
|
||||||
|
|
||||||
| Scenario | Implementazione | Status |
|
|
||||||
|----------|-----------------|--------|
|
|
||||||
| Exact IP (8.8.8.8) | inet equality | ✅ Completo |
|
|
||||||
| CIDR range (192.168.1.0/24) | `<<=` operator | ✅ Completo |
|
|
||||||
| Mixed exact + CIDR | Combined query | ✅ Completo |
|
|
||||||
| Manual whitelist priority | Source-based exclusion | ✅ Completo |
|
|
||||||
| Public whitelist priority | Nested NOT EXISTS | ✅ Completo |
|
|
||||||
| Performance (186M+ rows) | Bulk + indexes | ✅ Completo |
|
|
||||||
|
|
||||||
## Deployment su AlmaLinux 9
|
|
||||||
|
|
||||||
### Pre-Deployment
|
|
||||||
```bash
|
|
||||||
# Backup database
|
|
||||||
sudo -u postgres pg_dump ids_production > /opt/ids/backups/pre_v2_$(date +%Y%m%d).sql
|
|
||||||
|
|
||||||
# Verifica versione schema
|
|
||||||
sudo -u postgres psql ids_production -c "SELECT version FROM schema_version;"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Esecuzione Migration
|
|
||||||
```bash
|
|
||||||
cd /opt/ids
|
|
||||||
sudo -u postgres psql ids_production < deployment/migrations/007_add_cidr_support.sql
|
|
||||||
|
|
||||||
# Verifica successo
|
|
||||||
sudo -u postgres psql ids_production -c "
|
|
||||||
SELECT version, updated_at FROM schema_version WHERE id = 1;
|
|
||||||
SELECT COUNT(*) FROM public_blacklist_ips WHERE ip_inet IS NOT NULL;
|
|
||||||
SELECT COUNT(*) FROM whitelist WHERE ip_inet IS NOT NULL;
|
|
||||||
"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Update Codice Python
|
|
||||||
```bash
|
|
||||||
# Pull da GitLab
|
|
||||||
./update_from_git.sh
|
|
||||||
|
|
||||||
# Restart services
|
|
||||||
sudo systemctl restart ids-list-fetcher
|
|
||||||
sudo systemctl restart ids-ml-backend
|
|
||||||
|
|
||||||
# Verifica logs
|
|
||||||
journalctl -u ids-list-fetcher -n 50
|
|
||||||
journalctl -u ids-ml-backend -n 50
|
|
||||||
```
|
|
||||||
|
|
||||||
### Validazione Post-Deploy
|
|
||||||
```bash
|
|
||||||
# Test CIDR matching
|
|
||||||
sudo -u postgres psql ids_production -c "
|
|
||||||
-- Verifica popolazione INET columns
|
|
||||||
SELECT
|
|
||||||
COUNT(*) as total_blacklist,
|
|
||||||
COUNT(ip_inet) as with_inet,
|
|
||||||
COUNT(cidr_inet) as with_cidr
|
|
||||||
FROM public_blacklist_ips;
|
|
||||||
|
|
||||||
-- Test containment query
|
|
||||||
SELECT * FROM whitelist
|
|
||||||
WHERE active = true
|
|
||||||
AND '192.168.1.50'::inet <<= ip_inet
|
|
||||||
LIMIT 5;
|
|
||||||
|
|
||||||
-- Verifica priority logic
|
|
||||||
SELECT source, COUNT(*)
|
|
||||||
FROM whitelist
|
|
||||||
WHERE active = true
|
|
||||||
GROUP BY source;
|
|
||||||
"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Monitoring
|
|
||||||
|
|
||||||
### Service Health Checks
|
|
||||||
```bash
|
|
||||||
# Status fetcher
|
|
||||||
systemctl status ids-list-fetcher
|
|
||||||
systemctl list-timers ids-list-fetcher
|
|
||||||
|
|
||||||
# Logs real-time
|
|
||||||
journalctl -u ids-list-fetcher -f
|
|
||||||
```
|
|
||||||
|
|
||||||
### Database Queries
|
|
||||||
```sql
|
|
||||||
-- Sync status liste
|
|
||||||
SELECT
|
|
||||||
name,
|
|
||||||
type,
|
|
||||||
last_success,
|
|
||||||
total_ips,
|
|
||||||
active_ips,
|
|
||||||
error_count,
|
|
||||||
last_error
|
|
||||||
FROM public_lists
|
|
||||||
ORDER BY last_success DESC;
|
|
||||||
|
|
||||||
-- CIDR coverage
|
|
||||||
SELECT
|
|
||||||
COUNT(*) as total,
|
|
||||||
COUNT(CASE WHEN cidr_range IS NOT NULL THEN 1 END) as with_cidr,
|
|
||||||
COUNT(CASE WHEN ip_inet IS NOT NULL THEN 1 END) as with_inet,
|
|
||||||
COUNT(CASE WHEN cidr_inet IS NOT NULL THEN 1 END) as cidr_inet_populated
|
|
||||||
FROM public_blacklist_ips;
|
|
||||||
|
|
||||||
-- Detection sources
|
|
||||||
SELECT
|
|
||||||
detection_source,
|
|
||||||
COUNT(*) as count,
|
|
||||||
AVG(risk_score) as avg_score
|
|
||||||
FROM detections
|
|
||||||
GROUP BY detection_source;
|
|
||||||
```
|
|
||||||
|
|
||||||
## Esempi d'Uso
|
|
||||||
|
|
||||||
### Scenario 1: AWS Range Whitelist
|
|
||||||
```sql
|
|
||||||
-- Whitelist AWS range 52.94.0.0/16
|
|
||||||
INSERT INTO whitelist (ip_address, ip_inet, source, comment)
|
|
||||||
VALUES ('52.94.0.0/16', '52.94.0.0/16'::inet, 'aws', 'AWS us-east-1 range');
|
|
||||||
|
|
||||||
-- Verifica matching
|
|
||||||
SELECT * FROM detections
|
|
||||||
WHERE source_ip::inet <<= '52.94.0.0/16'::inet
|
|
||||||
AND detection_source = 'public_blacklist';
|
|
||||||
-- Queste detections verranno automaticamente cleanup
|
|
||||||
```
|
|
||||||
|
|
||||||
### Scenario 2: Priority Override
|
|
||||||
```sql
|
|
||||||
-- Blacklist Spamhaus: 1.2.3.4
|
|
||||||
-- Public whitelist GCP: 1.2.3.0/24
|
|
||||||
-- Manual whitelist utente: NESSUNA
|
|
||||||
|
|
||||||
-- Risultato: 1.2.3.4 NON genera detection (public whitelist vince)
|
|
||||||
|
|
||||||
-- Se aggiungi manual whitelist:
|
|
||||||
INSERT INTO whitelist (ip_address, ip_inet, source)
|
|
||||||
VALUES ('1.2.3.4', '1.2.3.4'::inet, 'manual');
|
|
||||||
|
|
||||||
-- Ora 1.2.3.4 è protetto da priorità massima (manual > public > blacklist)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
### INET Column Non Populated
|
|
||||||
```sql
|
|
||||||
-- Manually populate se necessario
|
|
||||||
UPDATE public_blacklist_ips
|
|
||||||
SET ip_inet = ip_address::inet,
|
|
||||||
cidr_inet = COALESCE(cidr_range::cidr, (ip_address || '/32')::cidr)
|
|
||||||
WHERE ip_inet IS NULL;
|
|
||||||
|
|
||||||
UPDATE whitelist
|
|
||||||
SET ip_inet = CASE
|
|
||||||
WHEN ip_address ~ '/' THEN ip_address::inet
|
|
||||||
ELSE ip_address::inet
|
|
||||||
END
|
|
||||||
WHERE ip_inet IS NULL;
|
|
||||||
```
|
|
||||||
|
|
||||||
### Index Missing
|
|
||||||
```sql
|
|
||||||
-- Ricrea indexes se mancanti
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_ip_inet_idx
|
|
||||||
ON public_blacklist_ips USING gist(ip_inet inet_ops);
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_cidr_inet_idx
|
|
||||||
ON public_blacklist_ips USING gist(cidr_inet inet_ops);
|
|
||||||
CREATE INDEX IF NOT EXISTS whitelist_ip_inet_idx
|
|
||||||
ON whitelist USING gist(ip_inet inet_ops);
|
|
||||||
```
|
|
||||||
|
|
||||||
### Performance Degradation
|
|
||||||
```bash
|
|
||||||
# Reindex GiST
|
|
||||||
sudo -u postgres psql ids_production -c "REINDEX INDEX CONCURRENTLY public_blacklist_ip_inet_idx;"
|
|
||||||
|
|
||||||
# Vacuum analyze
|
|
||||||
sudo -u postgres psql ids_production -c "VACUUM ANALYZE public_blacklist_ips;"
|
|
||||||
sudo -u postgres psql ids_production -c "VACUUM ANALYZE whitelist;"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Known Issues
|
|
||||||
Nessuno. Sistema production-ready con CIDR completo.
|
|
||||||
|
|
||||||
## Future Enhancements (v2.1+)
|
|
||||||
- Incremental sync (delta updates)
|
|
||||||
- Redis caching per query frequenti
|
|
||||||
- Additional threat feeds (SANS ISC, AbuseIPDB)
|
|
||||||
- Table partitioning per scalabilità
|
|
||||||
|
|
||||||
## References
|
|
||||||
- PostgreSQL INET/CIDR docs: https://www.postgresql.org/docs/current/datatype-net-types.html
|
|
||||||
- GiST indexes: https://www.postgresql.org/docs/current/gist.html
|
|
||||||
- Network operators: https://www.postgresql.org/docs/current/functions-net.html
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# =============================================================================
|
|
||||||
# IDS - Installazione Servizio List Fetcher
|
|
||||||
# =============================================================================
|
|
||||||
# Installa e configura il servizio systemd per il fetcher delle liste pubbliche
|
|
||||||
# Eseguire come ROOT: ./install_list_fetcher.sh
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;32m'
|
|
||||||
YELLOW='\033[1;33m'
|
|
||||||
BLUE='\033[0;34m'
|
|
||||||
NC='\033[0m'
|
|
||||||
|
|
||||||
echo -e "${BLUE}"
|
|
||||||
echo "╔═══════════════════════════════════════════════╗"
|
|
||||||
echo "║ 📋 INSTALLAZIONE IDS LIST FETCHER ║"
|
|
||||||
echo "╚═══════════════════════════════════════════════╝"
|
|
||||||
echo -e "${NC}"
|
|
||||||
|
|
||||||
IDS_DIR="/opt/ids"
|
|
||||||
SYSTEMD_DIR="/etc/systemd/system"
|
|
||||||
|
|
||||||
# Verifica di essere root
|
|
||||||
if [ "$EUID" -ne 0 ]; then
|
|
||||||
echo -e "${RED}❌ Questo script deve essere eseguito come root${NC}"
|
|
||||||
echo -e "${YELLOW} Esegui: sudo ./install_list_fetcher.sh${NC}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Verifica che i file sorgente esistano
|
|
||||||
SERVICE_SRC="$IDS_DIR/deployment/systemd/ids-list-fetcher.service"
|
|
||||||
TIMER_SRC="$IDS_DIR/deployment/systemd/ids-list-fetcher.timer"
|
|
||||||
|
|
||||||
if [ ! -f "$SERVICE_SRC" ]; then
|
|
||||||
echo -e "${RED}❌ File service non trovato: $SERVICE_SRC${NC}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "$TIMER_SRC" ]; then
|
|
||||||
echo -e "${RED}❌ File timer non trovato: $TIMER_SRC${NC}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Verifica che il virtual environment Python esista
|
|
||||||
VENV_PYTHON="$IDS_DIR/python_ml/venv/bin/python3"
|
|
||||||
if [ ! -f "$VENV_PYTHON" ]; then
|
|
||||||
echo -e "${YELLOW}⚠️ Virtual environment non trovato, creazione...${NC}"
|
|
||||||
cd "$IDS_DIR/python_ml"
|
|
||||||
python3.11 -m venv venv
|
|
||||||
./venv/bin/pip install --upgrade pip
|
|
||||||
./venv/bin/pip install -r requirements.txt
|
|
||||||
echo -e "${GREEN}✅ Virtual environment creato${NC}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Verifica che run_fetcher.py esista
|
|
||||||
FETCHER_SCRIPT="$IDS_DIR/python_ml/list_fetcher/run_fetcher.py"
|
|
||||||
if [ ! -f "$FETCHER_SCRIPT" ]; then
|
|
||||||
echo -e "${RED}❌ Script fetcher non trovato: $FETCHER_SCRIPT${NC}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Copia file systemd
|
|
||||||
echo -e "${BLUE}📦 Installazione file systemd...${NC}"
|
|
||||||
|
|
||||||
cp "$SERVICE_SRC" "$SYSTEMD_DIR/ids-list-fetcher.service"
|
|
||||||
cp "$TIMER_SRC" "$SYSTEMD_DIR/ids-list-fetcher.timer"
|
|
||||||
|
|
||||||
echo -e "${GREEN} ✅ ids-list-fetcher.service installato${NC}"
|
|
||||||
echo -e "${GREEN} ✅ ids-list-fetcher.timer installato${NC}"
|
|
||||||
|
|
||||||
# Ricarica systemd
|
|
||||||
echo -e "${BLUE}🔄 Ricarica configurazione systemd...${NC}"
|
|
||||||
systemctl daemon-reload
|
|
||||||
echo -e "${GREEN}✅ Daemon ricaricato${NC}"
|
|
||||||
|
|
||||||
# Abilita e avvia timer
|
|
||||||
echo -e "${BLUE}⏱️ Abilitazione timer (ogni 10 minuti)...${NC}"
|
|
||||||
systemctl enable ids-list-fetcher.timer
|
|
||||||
systemctl start ids-list-fetcher.timer
|
|
||||||
echo -e "${GREEN}✅ Timer abilitato e avviato${NC}"
|
|
||||||
|
|
||||||
# Test esecuzione manuale
|
|
||||||
echo -e "${BLUE}🧪 Test esecuzione fetcher...${NC}"
|
|
||||||
if systemctl start ids-list-fetcher.service; then
|
|
||||||
echo -e "${GREEN}✅ Fetcher eseguito con successo${NC}"
|
|
||||||
else
|
|
||||||
echo -e "${YELLOW}⚠️ Prima esecuzione potrebbe fallire se liste non configurate${NC}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Mostra stato
|
|
||||||
echo ""
|
|
||||||
echo -e "${GREEN}╔═══════════════════════════════════════════════╗${NC}"
|
|
||||||
echo -e "${GREEN}║ ✅ INSTALLAZIONE COMPLETATA ║${NC}"
|
|
||||||
echo -e "${GREEN}╚═══════════════════════════════════════════════╝${NC}"
|
|
||||||
echo ""
|
|
||||||
echo -e "${BLUE}📋 COMANDI UTILI:${NC}"
|
|
||||||
echo -e " • Stato timer: ${YELLOW}systemctl status ids-list-fetcher.timer${NC}"
|
|
||||||
echo -e " • Stato service: ${YELLOW}systemctl status ids-list-fetcher.service${NC}"
|
|
||||||
echo -e " • Esegui manuale: ${YELLOW}systemctl start ids-list-fetcher.service${NC}"
|
|
||||||
echo -e " • Visualizza logs: ${YELLOW}journalctl -u ids-list-fetcher -n 50${NC}"
|
|
||||||
echo -e " • Timer attivi: ${YELLOW}systemctl list-timers | grep ids${NC}"
|
|
||||||
echo ""
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
-- Migration 006: Add Public Lists Integration
|
|
||||||
-- Description: Adds blacklist/whitelist public sources with auto-sync support
|
|
||||||
-- Author: IDS System
|
|
||||||
-- Date: 2024-11-26
|
|
||||||
-- NOTE: Fully idempotent - safe to run multiple times
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- 1. CREATE NEW TABLES
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Public threat/whitelist sources configuration
|
|
||||||
CREATE TABLE IF NOT EXISTS public_lists (
|
|
||||||
id VARCHAR PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
type TEXT NOT NULL CHECK (type IN ('blacklist', 'whitelist')),
|
|
||||||
url TEXT NOT NULL,
|
|
||||||
enabled BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
fetch_interval_minutes INTEGER NOT NULL DEFAULT 10,
|
|
||||||
last_fetch TIMESTAMP,
|
|
||||||
last_success TIMESTAMP,
|
|
||||||
total_ips INTEGER NOT NULL DEFAULT 0,
|
|
||||||
active_ips INTEGER NOT NULL DEFAULT 0,
|
|
||||||
error_count INTEGER NOT NULL DEFAULT 0,
|
|
||||||
last_error TEXT,
|
|
||||||
created_at TIMESTAMP NOT NULL DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS public_lists_type_idx ON public_lists(type);
|
|
||||||
CREATE INDEX IF NOT EXISTS public_lists_enabled_idx ON public_lists(enabled);
|
|
||||||
|
|
||||||
-- Public blacklist IPs from external sources
|
|
||||||
CREATE TABLE IF NOT EXISTS public_blacklist_ips (
|
|
||||||
id VARCHAR PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
ip_address TEXT NOT NULL,
|
|
||||||
cidr_range TEXT,
|
|
||||||
list_id VARCHAR NOT NULL REFERENCES public_lists(id) ON DELETE CASCADE,
|
|
||||||
first_seen TIMESTAMP NOT NULL DEFAULT NOW(),
|
|
||||||
last_seen TIMESTAMP NOT NULL DEFAULT NOW(),
|
|
||||||
is_active BOOLEAN NOT NULL DEFAULT true
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_ip_idx ON public_blacklist_ips(ip_address);
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_list_idx ON public_blacklist_ips(list_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_active_idx ON public_blacklist_ips(is_active);
|
|
||||||
|
|
||||||
-- Create unique constraint only if not exists
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_indexes
|
|
||||||
WHERE indexname = 'public_blacklist_ip_list_key'
|
|
||||||
) THEN
|
|
||||||
CREATE UNIQUE INDEX public_blacklist_ip_list_key ON public_blacklist_ips(ip_address, list_id);
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- 2. ALTER EXISTING TABLES
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Extend detections table with public list source tracking
|
|
||||||
ALTER TABLE detections
|
|
||||||
ADD COLUMN IF NOT EXISTS detection_source TEXT NOT NULL DEFAULT 'ml_model',
|
|
||||||
ADD COLUMN IF NOT EXISTS blacklist_id VARCHAR;
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS detection_source_idx ON detections(detection_source);
|
|
||||||
|
|
||||||
-- Add check constraint for valid detection sources
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_constraint
|
|
||||||
WHERE conname = 'detections_source_check'
|
|
||||||
) THEN
|
|
||||||
ALTER TABLE detections
|
|
||||||
ADD CONSTRAINT detections_source_check
|
|
||||||
CHECK (detection_source IN ('ml_model', 'public_blacklist', 'hybrid'));
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Extend whitelist table with source tracking
|
|
||||||
ALTER TABLE whitelist
|
|
||||||
ADD COLUMN IF NOT EXISTS source TEXT NOT NULL DEFAULT 'manual',
|
|
||||||
ADD COLUMN IF NOT EXISTS list_id VARCHAR;
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS whitelist_source_idx ON whitelist(source);
|
|
||||||
|
|
||||||
-- Add check constraint for valid whitelist sources
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_constraint
|
|
||||||
WHERE conname = 'whitelist_source_check'
|
|
||||||
) THEN
|
|
||||||
ALTER TABLE whitelist
|
|
||||||
ADD CONSTRAINT whitelist_source_check
|
|
||||||
CHECK (source IN ('manual', 'aws', 'gcp', 'cloudflare', 'iana', 'ntp', 'other'));
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- 3. UPDATE SCHEMA VERSION
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO schema_version (id, version, description)
|
|
||||||
VALUES (1, 6, 'Add public lists integration (blacklist/whitelist sources)')
|
|
||||||
ON CONFLICT (id) DO UPDATE
|
|
||||||
SET version = 6,
|
|
||||||
description = 'Add public lists integration (blacklist/whitelist sources)',
|
|
||||||
applied_at = NOW();
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
SELECT 'Migration 006 completed successfully' as status;
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
-- Migration 007: Add INET/CIDR support for proper network range matching
|
|
||||||
-- Required for public lists integration (Spamhaus /24, AWS ranges, etc.)
|
|
||||||
-- Date: 2025-11-26
|
|
||||||
-- NOTE: Handles case where columns exist as TEXT type (from Drizzle)
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- FIX: Drop TEXT columns and recreate as proper INET/CIDR types
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Check column type and fix if needed for public_blacklist_ips
|
|
||||||
DO $$
|
|
||||||
DECLARE
|
|
||||||
col_type text;
|
|
||||||
BEGIN
|
|
||||||
-- Check ip_inet column type
|
|
||||||
SELECT data_type INTO col_type
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'public_blacklist_ips' AND column_name = 'ip_inet';
|
|
||||||
|
|
||||||
IF col_type = 'text' THEN
|
|
||||||
-- Drop the wrong type columns
|
|
||||||
ALTER TABLE public_blacklist_ips DROP COLUMN IF EXISTS ip_inet;
|
|
||||||
ALTER TABLE public_blacklist_ips DROP COLUMN IF EXISTS cidr_inet;
|
|
||||||
RAISE NOTICE 'Dropped TEXT columns, will recreate as INET/CIDR';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Add INET/CIDR columns with correct types
|
|
||||||
ALTER TABLE public_blacklist_ips
|
|
||||||
ADD COLUMN IF NOT EXISTS ip_inet inet,
|
|
||||||
ADD COLUMN IF NOT EXISTS cidr_inet cidr;
|
|
||||||
|
|
||||||
-- Populate new columns from existing text data
|
|
||||||
UPDATE public_blacklist_ips
|
|
||||||
SET ip_inet = ip_address::inet,
|
|
||||||
cidr_inet = CASE
|
|
||||||
WHEN cidr_range IS NOT NULL THEN cidr_range::cidr
|
|
||||||
ELSE (ip_address || '/32')::cidr
|
|
||||||
END
|
|
||||||
WHERE ip_inet IS NULL OR cidr_inet IS NULL;
|
|
||||||
|
|
||||||
-- Create GiST indexes for INET operators
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_ip_inet_idx ON public_blacklist_ips USING gist(ip_inet inet_ops);
|
|
||||||
CREATE INDEX IF NOT EXISTS public_blacklist_cidr_inet_idx ON public_blacklist_ips USING gist(cidr_inet inet_ops);
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Fix whitelist table
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
DECLARE
|
|
||||||
col_type text;
|
|
||||||
BEGIN
|
|
||||||
SELECT data_type INTO col_type
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'whitelist' AND column_name = 'ip_inet';
|
|
||||||
|
|
||||||
IF col_type = 'text' THEN
|
|
||||||
ALTER TABLE whitelist DROP COLUMN IF EXISTS ip_inet;
|
|
||||||
RAISE NOTICE 'Dropped TEXT column from whitelist, will recreate as INET';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Add INET column to whitelist
|
|
||||||
ALTER TABLE whitelist
|
|
||||||
ADD COLUMN IF NOT EXISTS ip_inet inet;
|
|
||||||
|
|
||||||
-- Populate whitelist INET column
|
|
||||||
UPDATE whitelist
|
|
||||||
SET ip_inet = CASE
|
|
||||||
WHEN ip_address ~ '/' THEN ip_address::inet
|
|
||||||
ELSE ip_address::inet
|
|
||||||
END
|
|
||||||
WHERE ip_inet IS NULL;
|
|
||||||
|
|
||||||
-- Create index for whitelist INET matching
|
|
||||||
CREATE INDEX IF NOT EXISTS whitelist_ip_inet_idx ON whitelist USING gist(ip_inet inet_ops);
|
|
||||||
|
|
||||||
-- Update schema version
|
|
||||||
UPDATE schema_version SET version = 7, applied_at = NOW() WHERE id = 1;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- Verification
|
|
||||||
SELECT 'Migration 007 completed successfully' as status;
|
|
||||||
SELECT version, applied_at FROM schema_version WHERE id = 1;
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
-- Migration 008: Force INET/CIDR types (unconditional)
|
|
||||||
-- Fixes issues where columns remained TEXT after conditional migration 007
|
|
||||||
-- Date: 2026-01-02
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- FORCE DROP AND RECREATE ALL INET COLUMNS
|
|
||||||
-- This is unconditional - always executes regardless of current state
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Drop indexes first (if exist)
|
|
||||||
DROP INDEX IF EXISTS public_blacklist_ip_inet_idx;
|
|
||||||
DROP INDEX IF EXISTS public_blacklist_cidr_inet_idx;
|
|
||||||
DROP INDEX IF EXISTS whitelist_ip_inet_idx;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- FIX public_blacklist_ips TABLE
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Drop columns unconditionally
|
|
||||||
ALTER TABLE public_blacklist_ips DROP COLUMN IF EXISTS ip_inet;
|
|
||||||
ALTER TABLE public_blacklist_ips DROP COLUMN IF EXISTS cidr_inet;
|
|
||||||
|
|
||||||
-- Recreate with correct INET/CIDR types
|
|
||||||
ALTER TABLE public_blacklist_ips ADD COLUMN ip_inet inet;
|
|
||||||
ALTER TABLE public_blacklist_ips ADD COLUMN cidr_inet cidr;
|
|
||||||
|
|
||||||
-- Populate from existing text data
|
|
||||||
UPDATE public_blacklist_ips
|
|
||||||
SET
|
|
||||||
ip_inet = CASE
|
|
||||||
WHEN ip_address ~ '/' THEN ip_address::inet
|
|
||||||
ELSE ip_address::inet
|
|
||||||
END,
|
|
||||||
cidr_inet = CASE
|
|
||||||
WHEN cidr_range IS NOT NULL AND cidr_range != '' THEN cidr_range::cidr
|
|
||||||
WHEN ip_address ~ '/' THEN ip_address::cidr
|
|
||||||
ELSE (ip_address || '/32')::cidr
|
|
||||||
END
|
|
||||||
WHERE ip_inet IS NULL;
|
|
||||||
|
|
||||||
-- Create GiST indexes for fast INET/CIDR containment operators
|
|
||||||
CREATE INDEX public_blacklist_ip_inet_idx ON public_blacklist_ips USING gist(ip_inet inet_ops);
|
|
||||||
CREATE INDEX public_blacklist_cidr_inet_idx ON public_blacklist_ips USING gist(cidr_inet inet_ops);
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- FIX whitelist TABLE
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Drop column unconditionally
|
|
||||||
ALTER TABLE whitelist DROP COLUMN IF EXISTS ip_inet;
|
|
||||||
|
|
||||||
-- Recreate with correct INET type
|
|
||||||
ALTER TABLE whitelist ADD COLUMN ip_inet inet;
|
|
||||||
|
|
||||||
-- Populate from existing text data
|
|
||||||
UPDATE whitelist
|
|
||||||
SET ip_inet = CASE
|
|
||||||
WHEN ip_address ~ '/' THEN ip_address::inet
|
|
||||||
ELSE ip_address::inet
|
|
||||||
END
|
|
||||||
WHERE ip_inet IS NULL;
|
|
||||||
|
|
||||||
-- Create index for whitelist
|
|
||||||
CREATE INDEX whitelist_ip_inet_idx ON whitelist USING gist(ip_inet inet_ops);
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- UPDATE SCHEMA VERSION
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
UPDATE schema_version SET version = 8, applied_at = NOW() WHERE id = 1;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- VERIFICATION
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
SELECT 'Migration 008 completed successfully' as status;
|
|
||||||
SELECT version, applied_at FROM schema_version WHERE id = 1;
|
|
||||||
|
|
||||||
-- Verify column types
|
|
||||||
SELECT
|
|
||||||
table_name,
|
|
||||||
column_name,
|
|
||||||
data_type
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE
|
|
||||||
(table_name = 'public_blacklist_ips' AND column_name IN ('ip_inet', 'cidr_inet'))
|
|
||||||
OR (table_name = 'whitelist' AND column_name = 'ip_inet')
|
|
||||||
ORDER BY table_name, column_name;
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
-- Migration 009: Add Microsoft Azure and Meta/Facebook public lists
|
|
||||||
-- Date: 2026-01-02
|
|
||||||
|
|
||||||
-- Microsoft Azure IP ranges (whitelist - cloud provider)
|
|
||||||
INSERT INTO public_lists (name, url, type, format, enabled, description, fetch_interval)
|
|
||||||
VALUES (
|
|
||||||
'Microsoft Azure',
|
|
||||||
'https://raw.githubusercontent.com/femueller/cloud-ip-ranges/master/microsoft-azure-ip-ranges.json',
|
|
||||||
'whitelist',
|
|
||||||
'json',
|
|
||||||
true,
|
|
||||||
'Microsoft Azure cloud IP ranges - auto-updated from Azure Service Tags',
|
|
||||||
3600
|
|
||||||
) ON CONFLICT (name) DO UPDATE SET
|
|
||||||
url = EXCLUDED.url,
|
|
||||||
description = EXCLUDED.description;
|
|
||||||
|
|
||||||
-- Meta/Facebook IP ranges (whitelist - major service provider)
|
|
||||||
INSERT INTO public_lists (name, url, type, format, enabled, description, fetch_interval)
|
|
||||||
VALUES (
|
|
||||||
'Meta (Facebook)',
|
|
||||||
'https://raw.githubusercontent.com/parseword/util-misc/master/block-facebook/facebook-ip-ranges.txt',
|
|
||||||
'whitelist',
|
|
||||||
'plain',
|
|
||||||
true,
|
|
||||||
'Meta/Facebook IP ranges (includes Instagram, WhatsApp, Oculus) from BGP AS32934/AS54115/AS63293',
|
|
||||||
3600
|
|
||||||
) ON CONFLICT (name) DO UPDATE SET
|
|
||||||
url = EXCLUDED.url,
|
|
||||||
description = EXCLUDED.description;
|
|
||||||
|
|
||||||
-- Verify insertion
|
|
||||||
SELECT id, name, type, enabled, url FROM public_lists WHERE name IN ('Microsoft Azure', 'Meta (Facebook)');
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# =========================================================
|
|
||||||
# IDS - Cleanup Detections Runner
|
|
||||||
# =========================================================
|
|
||||||
# Esegue cleanup automatico delle detections secondo regole:
|
|
||||||
# - Cancella detections non anomale dopo 48h
|
|
||||||
# - Sblocca IP bloccati se non più anomali dopo 2h
|
|
||||||
#
|
|
||||||
# Uso: ./run_cleanup.sh
|
|
||||||
# =========================================================
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
||||||
|
|
||||||
# Carica variabili ambiente
|
|
||||||
if [ -f "$PROJECT_ROOT/.env" ]; then
|
|
||||||
set -a
|
|
||||||
source "$PROJECT_ROOT/.env"
|
|
||||||
set +a
|
|
||||||
else
|
|
||||||
echo "❌ File .env non trovato in $PROJECT_ROOT"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Log
|
|
||||||
LOG_FILE="/var/log/ids/cleanup.log"
|
|
||||||
mkdir -p /var/log/ids
|
|
||||||
|
|
||||||
echo "=========================================" >> "$LOG_FILE"
|
|
||||||
echo "[$(date)] Cleanup automatico avviato" >> "$LOG_FILE"
|
|
||||||
echo "=========================================" >> "$LOG_FILE"
|
|
||||||
|
|
||||||
# Esegui cleanup
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
python3 python_ml/cleanup_detections.py >> "$LOG_FILE" 2>&1
|
|
||||||
|
|
||||||
EXIT_CODE=$?
|
|
||||||
|
|
||||||
if [ $EXIT_CODE -eq 0 ]; then
|
|
||||||
echo "[$(date)] Cleanup completato con successo" >> "$LOG_FILE"
|
|
||||||
else
|
|
||||||
echo "[$(date)] Cleanup fallito (exit code: $EXIT_CODE)" >> "$LOG_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "" >> "$LOG_FILE"
|
|
||||||
exit $EXIT_CODE
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Deploy Public Lists Integration (v2.0.0)
|
|
||||||
# Run on AlmaLinux 9 server after git pull
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "=================================="
|
|
||||||
echo "PUBLIC LISTS DEPLOYMENT - v2.0.0"
|
|
||||||
echo "=================================="
|
|
||||||
|
|
||||||
# 1. Database Migration
|
|
||||||
echo -e "\n[1/5] Running database migration..."
|
|
||||||
sudo -u postgres psql -d ids_system -f deployment/migrations/006_add_public_lists.sql
|
|
||||||
echo "✓ Migration 006 applied"
|
|
||||||
|
|
||||||
# 2. Seed default lists
|
|
||||||
echo -e "\n[2/5] Seeding default public lists..."
|
|
||||||
cd python_ml/list_fetcher
|
|
||||||
DATABASE_URL=$DATABASE_URL python seed_lists.py
|
|
||||||
cd ../..
|
|
||||||
echo "✓ Default lists seeded"
|
|
||||||
|
|
||||||
# 3. Install systemd services
|
|
||||||
echo -e "\n[3/5] Installing systemd services..."
|
|
||||||
sudo cp deployment/systemd/ids-list-fetcher.service /etc/systemd/system/
|
|
||||||
sudo cp deployment/systemd/ids-list-fetcher.timer /etc/systemd/system/
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
echo "✓ Systemd services installed"
|
|
||||||
|
|
||||||
# 4. Enable and start
|
|
||||||
echo -e "\n[4/5] Enabling services..."
|
|
||||||
sudo systemctl enable ids-list-fetcher.timer
|
|
||||||
sudo systemctl start ids-list-fetcher.timer
|
|
||||||
echo "✓ Timer enabled (10-minute intervals)"
|
|
||||||
|
|
||||||
# 5. Initial sync
|
|
||||||
echo -e "\n[5/5] Running initial sync..."
|
|
||||||
sudo systemctl start ids-list-fetcher.service
|
|
||||||
echo "✓ Initial sync triggered"
|
|
||||||
|
|
||||||
echo -e "\n=================================="
|
|
||||||
echo "DEPLOYMENT COMPLETE"
|
|
||||||
echo "=================================="
|
|
||||||
echo ""
|
|
||||||
echo "Verify:"
|
|
||||||
echo " journalctl -u ids-list-fetcher -n 50"
|
|
||||||
echo " systemctl status ids-list-fetcher.timer"
|
|
||||||
echo ""
|
|
||||||
echo "Check UI: http://your-server/public-lists"
|
|
||||||
echo ""
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# =========================================================
|
|
||||||
# IDS - Setup Cleanup Timer
|
|
||||||
# =========================================================
|
|
||||||
# Installa e avvia il timer systemd per cleanup automatico
|
|
||||||
#
|
|
||||||
# Uso: sudo ./deployment/setup_cleanup_timer.sh
|
|
||||||
# =========================================================
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if [ "$EUID" -ne 0 ]; then
|
|
||||||
echo "❌ Questo script deve essere eseguito come root (sudo)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
|
|
||||||
echo "🔧 Setup IDS Cleanup Timer..."
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# 1. Installa dipendenze Python
|
|
||||||
echo "[1/7] Installazione dipendenze Python..."
|
|
||||||
pip3 install -q psycopg2-binary python-dotenv || {
|
|
||||||
echo "⚠️ Installazione pip fallita, provo con requirements.txt..."
|
|
||||||
pip3 install -q -r "$SCRIPT_DIR/../python_ml/requirements.txt" || {
|
|
||||||
echo "❌ Errore installazione dipendenze!"
|
|
||||||
echo "💡 Esegui manualmente: sudo pip3 install psycopg2-binary python-dotenv"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# 2. Crea directory log
|
|
||||||
echo "[2/7] Creazione directory log..."
|
|
||||||
mkdir -p /var/log/ids
|
|
||||||
chmod 755 /var/log/ids
|
|
||||||
|
|
||||||
# 3. Rendi eseguibili gli script
|
|
||||||
echo "[3/7] Permessi esecuzione script..."
|
|
||||||
chmod +x "$SCRIPT_DIR/run_cleanup.sh"
|
|
||||||
chmod +x "$SCRIPT_DIR/../python_ml/cleanup_detections.py"
|
|
||||||
|
|
||||||
# 4. Copia service file
|
|
||||||
echo "[4/7] Installazione service file..."
|
|
||||||
cp "$SCRIPT_DIR/systemd/ids-cleanup.service" /etc/systemd/system/
|
|
||||||
cp "$SCRIPT_DIR/systemd/ids-cleanup.timer" /etc/systemd/system/
|
|
||||||
|
|
||||||
# 5. Reload systemd
|
|
||||||
echo "[5/7] Reload systemd daemon..."
|
|
||||||
systemctl daemon-reload
|
|
||||||
|
|
||||||
# 6. Abilita timer
|
|
||||||
echo "[6/7] Abilitazione timer..."
|
|
||||||
systemctl enable ids-cleanup.timer
|
|
||||||
|
|
||||||
# 7. Avvia timer
|
|
||||||
echo "[7/7] Avvio timer..."
|
|
||||||
systemctl start ids-cleanup.timer
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "✅ Cleanup timer installato e avviato con successo!"
|
|
||||||
echo ""
|
|
||||||
echo "📊 Status:"
|
|
||||||
systemctl status ids-cleanup.timer --no-pager -l
|
|
||||||
echo ""
|
|
||||||
echo "📅 Prossima esecuzione:"
|
|
||||||
systemctl list-timers ids-cleanup.timer --no-pager
|
|
||||||
echo ""
|
|
||||||
echo "💡 Comandi utili:"
|
|
||||||
echo " - Test manuale: sudo ./deployment/run_cleanup.sh"
|
|
||||||
echo " - Esegui ora: sudo systemctl start ids-cleanup.service"
|
|
||||||
echo " - Stato timer: sudo systemctl status ids-cleanup.timer"
|
|
||||||
echo " - Log cleanup: tail -f /var/log/ids/cleanup.log"
|
|
||||||
echo " - Disabilita timer: sudo systemctl stop ids-cleanup.timer && sudo systemctl disable ids-cleanup.timer"
|
|
||||||
echo ""
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=IDS Auto-Blocking Service - Detect and Block Malicious IPs
|
|
||||||
Documentation=https://github.com/yourusername/ids
|
|
||||||
After=network.target ids-ml-backend.service postgresql-16.service
|
|
||||||
Requires=ids-ml-backend.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
User=ids
|
|
||||||
Group=ids
|
|
||||||
WorkingDirectory=/opt/ids
|
|
||||||
EnvironmentFile=/opt/ids/.env
|
|
||||||
|
|
||||||
# Esegui script auto-blocking (usa venv Python)
|
|
||||||
ExecStart=/opt/ids/python_ml/venv/bin/python3 /opt/ids/python_ml/auto_block.py
|
|
||||||
|
|
||||||
# Logging
|
|
||||||
StandardOutput=append:/var/log/ids/auto_block.log
|
|
||||||
StandardError=append:/var/log/ids/auto_block.log
|
|
||||||
SyslogIdentifier=ids-auto-block
|
|
||||||
|
|
||||||
# Security
|
|
||||||
NoNewPrivileges=true
|
|
||||||
PrivateTmp=true
|
|
||||||
|
|
||||||
# Timeout: max 3 minuti per detection+blocking
|
|
||||||
TimeoutStartSec=180
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=IDS Auto-Blocking Timer - Run every 5 minutes
|
|
||||||
Documentation=https://github.com/yourusername/ids
|
|
||||||
Requires=ids-auto-block.service
|
|
||||||
|
|
||||||
[Timer]
|
|
||||||
# Esegui 2 minuti dopo boot (per dare tempo a ML backend di avviarsi)
|
|
||||||
OnBootSec=2min
|
|
||||||
|
|
||||||
# Poi esegui ogni 5 minuti
|
|
||||||
OnUnitActiveSec=5min
|
|
||||||
|
|
||||||
# Precisione: ±1 secondo
|
|
||||||
AccuracySec=1s
|
|
||||||
|
|
||||||
# Esegui subito se il sistema era spento durante l'esecuzione programmata
|
|
||||||
Persistent=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=timers.target
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=IDS Cleanup Detections Service
|
|
||||||
Documentation=https://github.com/yourusername/ids
|
|
||||||
After=network.target postgresql.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
User=root
|
|
||||||
WorkingDirectory=/opt/ids
|
|
||||||
EnvironmentFile=/opt/ids/.env
|
|
||||||
ExecStart=/opt/ids/deployment/run_cleanup.sh
|
|
||||||
|
|
||||||
# Logging
|
|
||||||
StandardOutput=append:/var/log/ids/cleanup.log
|
|
||||||
StandardError=append:/var/log/ids/cleanup.log
|
|
||||||
|
|
||||||
# Security
|
|
||||||
NoNewPrivileges=true
|
|
||||||
PrivateTmp=true
|
|
||||||
|
|
||||||
# Restart policy (non necessario per oneshot)
|
|
||||||
# Restart=on-failure
|
|
||||||
# RestartSec=30
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=IDS Cleanup Detections Timer
|
|
||||||
Documentation=https://github.com/yourusername/ids
|
|
||||||
Requires=ids-cleanup.service
|
|
||||||
|
|
||||||
[Timer]
|
|
||||||
# Esegui ogni ora al minuto 10 (es. 00:10, 01:10, 02:10, ..., 23:10)
|
|
||||||
OnCalendar=*:10:00
|
|
||||||
|
|
||||||
# Esegui subito se il sistema era spento durante l'esecuzione programmata
|
|
||||||
Persistent=true
|
|
||||||
|
|
||||||
# Randomizza esecuzione di ±5 minuti per evitare picchi di carico
|
|
||||||
RandomizedDelaySec=300
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=timers.target
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=IDS Public Lists Fetcher Service
|
|
||||||
Documentation=https://github.com/yourorg/ids
|
|
||||||
After=network.target postgresql.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
User=root
|
|
||||||
WorkingDirectory=/opt/ids/python_ml
|
|
||||||
Environment="PYTHONUNBUFFERED=1"
|
|
||||||
EnvironmentFile=/opt/ids/.env
|
|
||||||
|
|
||||||
# Run list fetcher with virtual environment
|
|
||||||
ExecStart=/opt/ids/python_ml/venv/bin/python3 /opt/ids/python_ml/list_fetcher/run_fetcher.py
|
|
||||||
|
|
||||||
# Logging
|
|
||||||
StandardOutput=journal
|
|
||||||
StandardError=journal
|
|
||||||
SyslogIdentifier=ids-list-fetcher
|
|
||||||
|
|
||||||
# Security settings
|
|
||||||
PrivateTmp=true
|
|
||||||
NoNewPrivileges=true
|
|
||||||
|
|
||||||
# Restart policy
|
|
||||||
Restart=no
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=IDS Public Lists Fetcher Timer (every 10 minutes)
|
|
||||||
Documentation=https://github.com/yourorg/ids
|
|
||||||
|
|
||||||
[Timer]
|
|
||||||
# Run every 10 minutes
|
|
||||||
OnCalendar=*:0/10
|
|
||||||
OnBootSec=2min
|
|
||||||
AccuracySec=1min
|
|
||||||
Persistent=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=timers.target
|
|
||||||
@ -158,20 +158,6 @@ if [ -f "./deployment/setup_rsyslog.sh" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Verifica e installa servizio list-fetcher se mancante
|
|
||||||
echo -e "\n${BLUE}📋 Verifica servizio list-fetcher...${NC}"
|
|
||||||
if ! systemctl list-unit-files | grep -q "ids-list-fetcher"; then
|
|
||||||
echo -e "${YELLOW} Servizio ids-list-fetcher non installato, installazione...${NC}"
|
|
||||||
if [ -f "./deployment/install_list_fetcher.sh" ]; then
|
|
||||||
chmod +x ./deployment/install_list_fetcher.sh
|
|
||||||
./deployment/install_list_fetcher.sh
|
|
||||||
else
|
|
||||||
echo -e "${RED} ❌ Script install_list_fetcher.sh non trovato${NC}"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo -e "${GREEN} ✅ Servizio ids-list-fetcher già installato${NC}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Restart servizi
|
# Restart servizi
|
||||||
echo -e "\n${BLUE}🔄 Restart servizi...${NC}"
|
echo -e "\n${BLUE}🔄 Restart servizi...${NC}"
|
||||||
if [ -f "./deployment/restart_all.sh" ]; then
|
if [ -f "./deployment/restart_all.sh" ]; then
|
||||||
|
|||||||
6
main.py
6
main.py
@ -1,6 +0,0 @@
|
|||||||
def main():
|
|
||||||
print("Hello from repl-nix-workspace!")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
[project]
|
|
||||||
name = "repl-nix-workspace"
|
|
||||||
version = "0.1.0"
|
|
||||||
description = "Add your description here"
|
|
||||||
requires-python = ">=3.11"
|
|
||||||
dependencies = [
|
|
||||||
"httpx>=0.28.1",
|
|
||||||
]
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
IDS Auto-Blocking Script
|
|
||||||
Rileva e blocca automaticamente IP con risk_score >= 80
|
|
||||||
Eseguito periodicamente da systemd timer (ogni 5 minuti)
|
|
||||||
"""
|
|
||||||
import requests
|
|
||||||
import sys
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
ML_API_URL = "http://localhost:8000"
|
|
||||||
|
|
||||||
def auto_block():
|
|
||||||
"""Esegue detection e blocking automatico degli IP critici"""
|
|
||||||
timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
|
||||||
print(f"[{timestamp}] 🔍 Starting auto-block detection...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Chiama endpoint ML /detect con auto_block=true
|
|
||||||
response = requests.post(
|
|
||||||
f"{ML_API_URL}/detect",
|
|
||||||
json={
|
|
||||||
"max_records": 5000, # Analizza ultimi 5000 log
|
|
||||||
"hours_back": 1.0, # Ultima ora
|
|
||||||
"risk_threshold": 80.0, # Solo IP critici (score >= 80)
|
|
||||||
"auto_block": True # BLOCCA AUTOMATICAMENTE
|
|
||||||
},
|
|
||||||
timeout=120 # 2 minuti timeout
|
|
||||||
)
|
|
||||||
|
|
||||||
if response.status_code == 200:
|
|
||||||
data = response.json()
|
|
||||||
detections = len(data.get("detections", []))
|
|
||||||
blocked = data.get("blocked", 0)
|
|
||||||
|
|
||||||
if blocked > 0:
|
|
||||||
print(f"✓ Detection completata: {detections} anomalie rilevate, {blocked} IP bloccati")
|
|
||||||
else:
|
|
||||||
print(f"✓ Detection completata: {detections} anomalie rilevate, nessun nuovo IP da bloccare")
|
|
||||||
|
|
||||||
return 0
|
|
||||||
else:
|
|
||||||
print(f"✗ API error: HTTP {response.status_code}")
|
|
||||||
print(f" Response: {response.text}")
|
|
||||||
return 1
|
|
||||||
|
|
||||||
except requests.exceptions.ConnectionError:
|
|
||||||
print("✗ ERRORE: ML Backend non raggiungibile su http://localhost:8000")
|
|
||||||
print(" Verifica che ids-ml-backend.service sia attivo:")
|
|
||||||
print(" sudo systemctl status ids-ml-backend")
|
|
||||||
return 1
|
|
||||||
except requests.exceptions.Timeout:
|
|
||||||
print("✗ ERRORE: Timeout dopo 120 secondi. Detection troppo lenta?")
|
|
||||||
return 1
|
|
||||||
except Exception as e:
|
|
||||||
print(f"✗ ERRORE imprevisto: {type(e).__name__}: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return 1
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
exit_code = auto_block()
|
|
||||||
sys.exit(exit_code)
|
|
||||||
@ -1,172 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
IDS - Cleanup Detections Script
|
|
||||||
================================
|
|
||||||
Automatizza la pulizia delle detections e lo sblocco degli IP secondo le regole:
|
|
||||||
1. Cancella detections non anomale dopo 48 ore
|
|
||||||
2. Sblocca IP bloccati se non più anomali dopo 2 ore
|
|
||||||
|
|
||||||
Esecuzione: Ogni ora via cron/systemd timer
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import logging
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
import psycopg2
|
|
||||||
from psycopg2.extras import RealDictCursor
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
|
|
||||||
# Setup logging
|
|
||||||
logging.basicConfig(
|
|
||||||
level=logging.INFO,
|
|
||||||
format='[%(asctime)s] %(levelname)s: %(message)s',
|
|
||||||
handlers=[
|
|
||||||
logging.FileHandler('/var/log/ids/cleanup.log'),
|
|
||||||
logging.StreamHandler(sys.stdout)
|
|
||||||
]
|
|
||||||
)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
# Load environment
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
def get_db_connection():
|
|
||||||
"""Connessione al database PostgreSQL"""
|
|
||||||
return psycopg2.connect(
|
|
||||||
host=os.getenv('PGHOST', 'localhost'),
|
|
||||||
port=int(os.getenv('PGPORT', 5432)),
|
|
||||||
user=os.getenv('PGUSER'),
|
|
||||||
password=os.getenv('PGPASSWORD'),
|
|
||||||
database=os.getenv('PGDATABASE')
|
|
||||||
)
|
|
||||||
|
|
||||||
def cleanup_old_detections(conn, hours=48):
|
|
||||||
"""
|
|
||||||
Cancella detections vecchie di più di N ore.
|
|
||||||
|
|
||||||
Logica: Se un IP è stato rilevato ma dopo 48 ore non è più
|
|
||||||
considerato anomalo (non appare in nuove detections), eliminalo.
|
|
||||||
"""
|
|
||||||
cursor = conn.cursor(cursor_factory=RealDictCursor)
|
|
||||||
|
|
||||||
cutoff_time = datetime.now() - timedelta(hours=hours)
|
|
||||||
|
|
||||||
# Conta detections da eliminare
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT COUNT(*) as count
|
|
||||||
FROM detections
|
|
||||||
WHERE detected_at < %s
|
|
||||||
AND blocked = false
|
|
||||||
""", (cutoff_time,))
|
|
||||||
|
|
||||||
count = cursor.fetchone()['count']
|
|
||||||
|
|
||||||
if count > 0:
|
|
||||||
logger.info(f"Trovate {count} detections da eliminare (più vecchie di {hours}h)")
|
|
||||||
|
|
||||||
# Elimina
|
|
||||||
cursor.execute("""
|
|
||||||
DELETE FROM detections
|
|
||||||
WHERE detected_at < %s
|
|
||||||
AND blocked = false
|
|
||||||
""", (cutoff_time,))
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
logger.info(f"✅ Eliminate {cursor.rowcount} detections vecchie")
|
|
||||||
else:
|
|
||||||
logger.info(f"Nessuna detection da eliminare (soglia: {hours}h)")
|
|
||||||
|
|
||||||
cursor.close()
|
|
||||||
return count
|
|
||||||
|
|
||||||
def unblock_old_ips(conn, hours=2):
|
|
||||||
"""
|
|
||||||
Sblocca IP bloccati da più di N ore.
|
|
||||||
|
|
||||||
Logica: Se un IP è stato bloccato ma dopo 2 ore non è più
|
|
||||||
anomalo (nessuna nuova detection), sbloccalo dal DB.
|
|
||||||
|
|
||||||
NOTA: Questo NON rimuove l'IP dalle firewall list dei router MikroTik.
|
|
||||||
Per quello serve chiamare l'API /unblock-ip del ML backend.
|
|
||||||
"""
|
|
||||||
cursor = conn.cursor(cursor_factory=RealDictCursor)
|
|
||||||
|
|
||||||
cutoff_time = datetime.now() - timedelta(hours=hours)
|
|
||||||
|
|
||||||
# Trova IP bloccati da più di N ore senza nuove detections
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT d.source_ip, d.blocked_at, d.anomaly_type, d.risk_score
|
|
||||||
FROM detections d
|
|
||||||
WHERE d.blocked = true
|
|
||||||
AND d.blocked_at < %s
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM detections d2
|
|
||||||
WHERE d2.source_ip = d.source_ip
|
|
||||||
AND d2.detected_at > %s
|
|
||||||
)
|
|
||||||
""", (cutoff_time, cutoff_time))
|
|
||||||
|
|
||||||
ips_to_unblock = cursor.fetchall()
|
|
||||||
|
|
||||||
if ips_to_unblock:
|
|
||||||
logger.info(f"Trovati {len(ips_to_unblock)} IP da sbloccare (bloccati da più di {hours}h)")
|
|
||||||
|
|
||||||
for ip_data in ips_to_unblock:
|
|
||||||
ip = ip_data['source_ip']
|
|
||||||
logger.info(f" - {ip} (tipo: {ip_data['anomaly_type']}, score: {ip_data['risk_score']})")
|
|
||||||
|
|
||||||
# Aggiorna DB - SOLO i record bloccati da più di N ore
|
|
||||||
# NON sbloccate record recenti dello stesso IP!
|
|
||||||
cursor.execute("""
|
|
||||||
UPDATE detections
|
|
||||||
SET blocked = false, blocked_at = NULL
|
|
||||||
WHERE source_ip = %s
|
|
||||||
AND blocked = true
|
|
||||||
AND blocked_at < %s
|
|
||||||
""", (ip, cutoff_time))
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
logger.info(f"✅ Sbloccati {len(ips_to_unblock)} IP nel database")
|
|
||||||
logger.warning("⚠️ ATTENZIONE: IP ancora presenti nelle firewall list MikroTik!")
|
|
||||||
logger.info("💡 Per rimuoverli dai router, usa: curl -X POST http://localhost:8000/unblock-ip -d '{\"ip_address\": \"X.X.X.X\"}'")
|
|
||||||
else:
|
|
||||||
logger.info(f"Nessun IP da sbloccare (soglia: {hours}h)")
|
|
||||||
|
|
||||||
cursor.close()
|
|
||||||
return len(ips_to_unblock)
|
|
||||||
|
|
||||||
def main():
|
|
||||||
"""Esecuzione cleanup completo"""
|
|
||||||
logger.info("=" * 60)
|
|
||||||
logger.info("CLEANUP DETECTIONS - Avvio")
|
|
||||||
logger.info("=" * 60)
|
|
||||||
|
|
||||||
try:
|
|
||||||
conn = get_db_connection()
|
|
||||||
logger.info("✅ Connesso al database")
|
|
||||||
|
|
||||||
# 1. Cleanup detections vecchie (48h)
|
|
||||||
logger.info("\n[1/2] Cleanup detections vecchie...")
|
|
||||||
deleted_count = cleanup_old_detections(conn, hours=48)
|
|
||||||
|
|
||||||
# 2. Sblocco IP vecchi (2h)
|
|
||||||
logger.info("\n[2/2] Sblocco IP vecchi...")
|
|
||||||
unblocked_count = unblock_old_ips(conn, hours=2)
|
|
||||||
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
logger.info("\n" + "=" * 60)
|
|
||||||
logger.info("CLEANUP COMPLETATO")
|
|
||||||
logger.info(f" - Detections eliminate: {deleted_count}")
|
|
||||||
logger.info(f" - IP sbloccati (DB): {unblocked_count}")
|
|
||||||
logger.info("=" * 60)
|
|
||||||
|
|
||||||
return 0
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"❌ Errore durante cleanup: {e}", exc_info=True)
|
|
||||||
return 1
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
sys.exit(main())
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
# Public Lists Fetcher Module
|
|
||||||
# Handles download, parsing, and sync of public blacklist/whitelist sources
|
|
||||||
@ -1,401 +0,0 @@
|
|||||||
import asyncio
|
|
||||||
import httpx
|
|
||||||
from datetime import datetime
|
|
||||||
from typing import Dict, List, Set, Tuple, Optional
|
|
||||||
import psycopg2
|
|
||||||
from psycopg2.extras import execute_values
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
|
|
||||||
# Add parent directory to path for imports
|
|
||||||
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
|
|
||||||
|
|
||||||
from list_fetcher.parsers import parse_list
|
|
||||||
|
|
||||||
|
|
||||||
class ListFetcher:
|
|
||||||
"""Fetches and synchronizes public IP lists"""
|
|
||||||
|
|
||||||
def __init__(self, database_url: str):
|
|
||||||
self.database_url = database_url
|
|
||||||
self.timeout = 30.0
|
|
||||||
self.max_retries = 3
|
|
||||||
|
|
||||||
def get_db_connection(self):
|
|
||||||
"""Create database connection"""
|
|
||||||
return psycopg2.connect(self.database_url)
|
|
||||||
|
|
||||||
async def fetch_url(self, url: str) -> Optional[str]:
|
|
||||||
"""Download content from URL with retry logic"""
|
|
||||||
async with httpx.AsyncClient(timeout=self.timeout, follow_redirects=True) as client:
|
|
||||||
for attempt in range(self.max_retries):
|
|
||||||
try:
|
|
||||||
response = await client.get(url)
|
|
||||||
response.raise_for_status()
|
|
||||||
return response.text
|
|
||||||
except httpx.HTTPError as e:
|
|
||||||
if attempt == self.max_retries - 1:
|
|
||||||
raise Exception(f"HTTP error after {self.max_retries} attempts: {e}")
|
|
||||||
await asyncio.sleep(2 ** attempt) # Exponential backoff
|
|
||||||
except Exception as e:
|
|
||||||
if attempt == self.max_retries - 1:
|
|
||||||
raise Exception(f"Download failed: {e}")
|
|
||||||
await asyncio.sleep(2 ** attempt)
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_enabled_lists(self) -> List[Dict]:
|
|
||||||
"""Get all enabled public lists from database"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, name, type, url, fetch_interval_minutes
|
|
||||||
FROM public_lists
|
|
||||||
WHERE enabled = true
|
|
||||||
ORDER BY type, name
|
|
||||||
""")
|
|
||||||
if cur.description is None:
|
|
||||||
return []
|
|
||||||
columns = [desc[0] for desc in cur.description]
|
|
||||||
return [dict(zip(columns, row)) for row in cur.fetchall()]
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def get_existing_ips(self, list_id: str, list_type: str) -> Set[str]:
|
|
||||||
"""Get existing IPs for a list from database"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
if list_type == 'blacklist':
|
|
||||||
cur.execute("""
|
|
||||||
SELECT ip_address
|
|
||||||
FROM public_blacklist_ips
|
|
||||||
WHERE list_id = %s AND is_active = true
|
|
||||||
""", (list_id,))
|
|
||||||
else: # whitelist
|
|
||||||
cur.execute("""
|
|
||||||
SELECT ip_address
|
|
||||||
FROM whitelist
|
|
||||||
WHERE list_id = %s AND active = true
|
|
||||||
""", (list_id,))
|
|
||||||
|
|
||||||
return {row[0] for row in cur.fetchall()}
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def sync_blacklist_ips(self, list_id: str, new_ips: Set[Tuple[str, Optional[str]]]):
|
|
||||||
"""Sync blacklist IPs: add new, mark inactive old ones"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Get existing IPs
|
|
||||||
existing = self.get_existing_ips(list_id, 'blacklist')
|
|
||||||
new_ip_addresses = {ip for ip, _ in new_ips}
|
|
||||||
|
|
||||||
# Calculate diff
|
|
||||||
to_add = new_ip_addresses - existing
|
|
||||||
to_deactivate = existing - new_ip_addresses
|
|
||||||
to_update = existing & new_ip_addresses
|
|
||||||
|
|
||||||
# Mark old IPs as inactive
|
|
||||||
if to_deactivate:
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_blacklist_ips
|
|
||||||
SET is_active = false
|
|
||||||
WHERE list_id = %s AND ip_address = ANY(%s)
|
|
||||||
""", (list_id, list(to_deactivate)))
|
|
||||||
|
|
||||||
# Update last_seen for existing active IPs
|
|
||||||
if to_update:
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_blacklist_ips
|
|
||||||
SET last_seen = NOW()
|
|
||||||
WHERE list_id = %s AND ip_address = ANY(%s)
|
|
||||||
""", (list_id, list(to_update)))
|
|
||||||
|
|
||||||
# Add new IPs with INET/CIDR support
|
|
||||||
if to_add:
|
|
||||||
values = []
|
|
||||||
for ip, cidr in new_ips:
|
|
||||||
if ip in to_add:
|
|
||||||
# Compute INET values for CIDR matching
|
|
||||||
cidr_inet = cidr if cidr else f"{ip}/32"
|
|
||||||
values.append((ip, cidr, ip, cidr_inet, list_id))
|
|
||||||
|
|
||||||
execute_values(cur, """
|
|
||||||
INSERT INTO public_blacklist_ips
|
|
||||||
(ip_address, cidr_range, ip_inet, cidr_inet, list_id)
|
|
||||||
VALUES %s
|
|
||||||
ON CONFLICT (ip_address, list_id) DO UPDATE
|
|
||||||
SET is_active = true, last_seen = NOW(),
|
|
||||||
ip_inet = EXCLUDED.ip_inet,
|
|
||||||
cidr_inet = EXCLUDED.cidr_inet
|
|
||||||
""", values)
|
|
||||||
|
|
||||||
# Update list stats
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_lists
|
|
||||||
SET total_ips = %s,
|
|
||||||
active_ips = %s,
|
|
||||||
last_success = NOW()
|
|
||||||
WHERE id = %s
|
|
||||||
""", (len(new_ip_addresses), len(new_ip_addresses), list_id))
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
return len(to_add), len(to_deactivate), len(to_update)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
conn.rollback()
|
|
||||||
raise e
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def sync_whitelist_ips(self, list_id: str, list_name: str, new_ips: Set[Tuple[str, Optional[str]]]):
|
|
||||||
"""Sync whitelist IPs: add new, deactivate old ones"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Get existing IPs
|
|
||||||
existing = self.get_existing_ips(list_id, 'whitelist')
|
|
||||||
new_ip_addresses = {ip for ip, _ in new_ips}
|
|
||||||
|
|
||||||
# Calculate diff
|
|
||||||
to_add = new_ip_addresses - existing
|
|
||||||
to_deactivate = existing - new_ip_addresses
|
|
||||||
to_update = existing & new_ip_addresses
|
|
||||||
|
|
||||||
# Determine source name from list name
|
|
||||||
source = 'other'
|
|
||||||
list_lower = list_name.lower()
|
|
||||||
if 'aws' in list_lower:
|
|
||||||
source = 'aws'
|
|
||||||
elif 'gcp' in list_lower or 'google' in list_lower:
|
|
||||||
source = 'gcp'
|
|
||||||
elif 'cloudflare' in list_lower:
|
|
||||||
source = 'cloudflare'
|
|
||||||
elif 'iana' in list_lower:
|
|
||||||
source = 'iana'
|
|
||||||
elif 'ntp' in list_lower:
|
|
||||||
source = 'ntp'
|
|
||||||
|
|
||||||
# Mark old IPs as inactive
|
|
||||||
if to_deactivate:
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE whitelist
|
|
||||||
SET active = false
|
|
||||||
WHERE list_id = %s AND ip_address = ANY(%s)
|
|
||||||
""", (list_id, list(to_deactivate)))
|
|
||||||
|
|
||||||
# Add new IPs with INET support for CIDR matching
|
|
||||||
if to_add:
|
|
||||||
values = []
|
|
||||||
for ip, cidr in new_ips:
|
|
||||||
if ip in to_add:
|
|
||||||
comment = f"Auto-imported from {list_name}"
|
|
||||||
if cidr:
|
|
||||||
comment += f" (CIDR: {cidr})"
|
|
||||||
# Compute ip_inet for CIDR-aware whitelisting
|
|
||||||
ip_inet = cidr if cidr else ip
|
|
||||||
values.append((ip, ip_inet, comment, source, list_id))
|
|
||||||
|
|
||||||
execute_values(cur, """
|
|
||||||
INSERT INTO whitelist (ip_address, ip_inet, comment, source, list_id)
|
|
||||||
VALUES %s
|
|
||||||
ON CONFLICT (ip_address) DO UPDATE
|
|
||||||
SET active = true,
|
|
||||||
ip_inet = EXCLUDED.ip_inet,
|
|
||||||
source = EXCLUDED.source,
|
|
||||||
list_id = EXCLUDED.list_id
|
|
||||||
""", values)
|
|
||||||
|
|
||||||
# Update list stats
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_lists
|
|
||||||
SET total_ips = %s,
|
|
||||||
active_ips = %s,
|
|
||||||
last_success = NOW()
|
|
||||||
WHERE id = %s
|
|
||||||
""", (len(new_ip_addresses), len(new_ip_addresses), list_id))
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
return len(to_add), len(to_deactivate), len(to_update)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
conn.rollback()
|
|
||||||
raise e
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
async def fetch_and_sync_list(self, list_config: Dict) -> Dict:
|
|
||||||
"""Fetch and sync a single list"""
|
|
||||||
list_id = list_config['id']
|
|
||||||
list_name = list_config['name']
|
|
||||||
list_type = list_config['type']
|
|
||||||
url = list_config['url']
|
|
||||||
|
|
||||||
result = {
|
|
||||||
'list_id': list_id,
|
|
||||||
'list_name': list_name,
|
|
||||||
'success': False,
|
|
||||||
'added': 0,
|
|
||||||
'removed': 0,
|
|
||||||
'updated': 0,
|
|
||||||
'error': None
|
|
||||||
}
|
|
||||||
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Update last_fetch timestamp
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_lists
|
|
||||||
SET last_fetch = NOW()
|
|
||||||
WHERE id = %s
|
|
||||||
""", (list_id,))
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
# Download content
|
|
||||||
print(f"[{datetime.now().strftime('%H:%M:%S')}] Downloading {list_name} from {url}...")
|
|
||||||
content = await self.fetch_url(url)
|
|
||||||
|
|
||||||
if not content:
|
|
||||||
raise Exception("Empty response from server")
|
|
||||||
|
|
||||||
# Parse IPs
|
|
||||||
print(f"[{datetime.now().strftime('%H:%M:%S')}] Parsing {list_name}...")
|
|
||||||
ips = parse_list(list_name, content)
|
|
||||||
|
|
||||||
if not ips:
|
|
||||||
raise Exception("No valid IPs found in list")
|
|
||||||
|
|
||||||
print(f"[{datetime.now().strftime('%H:%M:%S')}] Found {len(ips)} IPs, syncing to database...")
|
|
||||||
|
|
||||||
# Sync to database
|
|
||||||
if list_type == 'blacklist':
|
|
||||||
added, removed, updated = self.sync_blacklist_ips(list_id, ips)
|
|
||||||
else:
|
|
||||||
added, removed, updated = self.sync_whitelist_ips(list_id, list_name, ips)
|
|
||||||
|
|
||||||
result.update({
|
|
||||||
'success': True,
|
|
||||||
'added': added,
|
|
||||||
'removed': removed,
|
|
||||||
'updated': updated
|
|
||||||
})
|
|
||||||
|
|
||||||
print(f"[{datetime.now().strftime('%H:%M:%S')}] ✓ {list_name}: +{added} -{removed} ~{updated}")
|
|
||||||
|
|
||||||
# Reset error count on success
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_lists
|
|
||||||
SET error_count = 0, last_error = NULL
|
|
||||||
WHERE id = %s
|
|
||||||
""", (list_id,))
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
error_msg = str(e)
|
|
||||||
result['error'] = error_msg
|
|
||||||
print(f"[{datetime.now().strftime('%H:%M:%S')}] ✗ {list_name}: {error_msg}")
|
|
||||||
|
|
||||||
# Increment error count
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
UPDATE public_lists
|
|
||||||
SET error_count = error_count + 1,
|
|
||||||
last_error = %s
|
|
||||||
WHERE id = %s
|
|
||||||
""", (error_msg[:500], list_id))
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
async def fetch_all_lists(self) -> List[Dict]:
|
|
||||||
"""Fetch and sync all enabled lists"""
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print(f"[{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}] PUBLIC LISTS SYNC")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
|
|
||||||
# Get enabled lists
|
|
||||||
lists = self.get_enabled_lists()
|
|
||||||
|
|
||||||
if not lists:
|
|
||||||
print("No enabled lists found")
|
|
||||||
return []
|
|
||||||
|
|
||||||
print(f"Found {len(lists)} enabled lists\n")
|
|
||||||
|
|
||||||
# Fetch all lists in parallel
|
|
||||||
tasks = [self.fetch_and_sync_list(list_config) for list_config in lists]
|
|
||||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
|
||||||
|
|
||||||
# Summary
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print("SYNC SUMMARY")
|
|
||||||
print(f"{'='*60}")
|
|
||||||
|
|
||||||
success_count = sum(1 for r in results if isinstance(r, dict) and r.get('success'))
|
|
||||||
error_count = len(results) - success_count
|
|
||||||
total_added = sum(r.get('added', 0) for r in results if isinstance(r, dict))
|
|
||||||
total_removed = sum(r.get('removed', 0) for r in results if isinstance(r, dict))
|
|
||||||
|
|
||||||
print(f"Success: {success_count}/{len(results)}")
|
|
||||||
print(f"Errors: {error_count}/{len(results)}")
|
|
||||||
print(f"Total IPs Added: {total_added}")
|
|
||||||
print(f"Total IPs Removed: {total_removed}")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
|
|
||||||
return [r for r in results if isinstance(r, dict)]
|
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
|
||||||
"""Main entry point for list fetcher"""
|
|
||||||
database_url = os.getenv('DATABASE_URL')
|
|
||||||
|
|
||||||
if not database_url:
|
|
||||||
print("ERROR: DATABASE_URL environment variable not set")
|
|
||||||
return 1
|
|
||||||
|
|
||||||
fetcher = ListFetcher(database_url)
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Fetch and sync all lists
|
|
||||||
await fetcher.fetch_all_lists()
|
|
||||||
|
|
||||||
# Run merge logic to sync detections with blacklist/whitelist priority
|
|
||||||
print("\n" + "="*60)
|
|
||||||
print("RUNNING MERGE LOGIC")
|
|
||||||
print("="*60 + "\n")
|
|
||||||
|
|
||||||
# Import merge logic (avoid circular imports)
|
|
||||||
import sys
|
|
||||||
from pathlib import Path
|
|
||||||
merge_logic_path = Path(__file__).parent.parent
|
|
||||||
sys.path.insert(0, str(merge_logic_path))
|
|
||||||
from merge_logic import MergeLogic
|
|
||||||
|
|
||||||
merge = MergeLogic(database_url)
|
|
||||||
stats = merge.sync_public_blacklist_detections()
|
|
||||||
|
|
||||||
print(f"\nMerge Logic Stats:")
|
|
||||||
print(f" Created detections: {stats['created']}")
|
|
||||||
print(f" Cleaned invalid detections: {stats['cleaned']}")
|
|
||||||
print(f" Skipped (whitelisted): {stats['skipped_whitelisted']}")
|
|
||||||
print("="*60 + "\n")
|
|
||||||
|
|
||||||
return 0
|
|
||||||
except Exception as e:
|
|
||||||
print(f"FATAL ERROR: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return 1
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
exit_code = asyncio.run(main())
|
|
||||||
sys.exit(exit_code)
|
|
||||||
@ -1,362 +0,0 @@
|
|||||||
import re
|
|
||||||
import json
|
|
||||||
from typing import List, Dict, Set, Optional
|
|
||||||
from datetime import datetime
|
|
||||||
import ipaddress
|
|
||||||
|
|
||||||
|
|
||||||
class ListParser:
|
|
||||||
"""Base parser for public IP lists"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def validate_ip(ip_str: str) -> bool:
|
|
||||||
"""Validate IP address or CIDR range"""
|
|
||||||
try:
|
|
||||||
ipaddress.ip_network(ip_str, strict=False)
|
|
||||||
return True
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def normalize_cidr(ip_str: str) -> tuple[str, Optional[str]]:
|
|
||||||
"""
|
|
||||||
Normalize IP/CIDR to (ip_address, cidr_range)
|
|
||||||
For CIDR ranges, use the full CIDR notation as ip_address to ensure uniqueness
|
|
||||||
Example: '1.2.3.0/24' -> ('1.2.3.0/24', '1.2.3.0/24')
|
|
||||||
'1.2.3.4' -> ('1.2.3.4', None)
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
network = ipaddress.ip_network(ip_str, strict=False)
|
|
||||||
if '/' in ip_str:
|
|
||||||
normalized_cidr = str(network)
|
|
||||||
return (normalized_cidr, normalized_cidr)
|
|
||||||
else:
|
|
||||||
return (ip_str, None)
|
|
||||||
except ValueError:
|
|
||||||
return (ip_str, None)
|
|
||||||
|
|
||||||
|
|
||||||
class SpamhausParser(ListParser):
|
|
||||||
"""Parser for Spamhaus DROP list"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse Spamhaus DROP format:
|
|
||||||
- NDJSON (new): {"cidr":"1.2.3.0/24","sblid":"SBL12345","rir":"apnic"}
|
|
||||||
- Text (old): 1.2.3.0/24 ; SBL12345
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
lines = content.strip().split('\n')
|
|
||||||
|
|
||||||
for line in lines:
|
|
||||||
line = line.strip()
|
|
||||||
|
|
||||||
# Skip comments and empty lines
|
|
||||||
if not line or line.startswith(';') or line.startswith('#'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Try NDJSON format first (new Spamhaus format)
|
|
||||||
if line.startswith('{'):
|
|
||||||
try:
|
|
||||||
data = json.loads(line)
|
|
||||||
cidr = data.get('cidr')
|
|
||||||
if cidr and ListParser.validate_ip(cidr):
|
|
||||||
ips.add(ListParser.normalize_cidr(cidr))
|
|
||||||
continue
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Fallback: old text format
|
|
||||||
parts = line.split(';')
|
|
||||||
if parts:
|
|
||||||
ip_part = parts[0].strip()
|
|
||||||
if ip_part and ListParser.validate_ip(ip_part):
|
|
||||||
ips.add(ListParser.normalize_cidr(ip_part))
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class TalosParser(ListParser):
|
|
||||||
"""Parser for Talos Intelligence blacklist"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse Talos format (plain IP list):
|
|
||||||
1.2.3.4
|
|
||||||
5.6.7.0/24
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
lines = content.strip().split('\n')
|
|
||||||
|
|
||||||
for line in lines:
|
|
||||||
line = line.strip()
|
|
||||||
|
|
||||||
# Skip comments and empty lines
|
|
||||||
if not line or line.startswith('#') or line.startswith('//'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Validate and add
|
|
||||||
if ListParser.validate_ip(line):
|
|
||||||
ips.add(ListParser.normalize_cidr(line))
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class AWSParser(ListParser):
|
|
||||||
"""Parser for AWS IP ranges JSON"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse AWS JSON format:
|
|
||||||
{
|
|
||||||
"prefixes": [
|
|
||||||
{"ip_prefix": "1.2.3.0/24", "region": "us-east-1", "service": "EC2"}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
|
|
||||||
try:
|
|
||||||
data = json.loads(content)
|
|
||||||
|
|
||||||
# IPv4 prefixes
|
|
||||||
for prefix in data.get('prefixes', []):
|
|
||||||
ip_prefix = prefix.get('ip_prefix')
|
|
||||||
if ip_prefix and ListParser.validate_ip(ip_prefix):
|
|
||||||
ips.add(ListParser.normalize_cidr(ip_prefix))
|
|
||||||
|
|
||||||
# IPv6 prefixes (optional)
|
|
||||||
for prefix in data.get('ipv6_prefixes', []):
|
|
||||||
ipv6_prefix = prefix.get('ipv6_prefix')
|
|
||||||
if ipv6_prefix and ListParser.validate_ip(ipv6_prefix):
|
|
||||||
ips.add(ListParser.normalize_cidr(ipv6_prefix))
|
|
||||||
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class GCPParser(ListParser):
|
|
||||||
"""Parser for Google Cloud IP ranges JSON"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse GCP JSON format:
|
|
||||||
{
|
|
||||||
"prefixes": [
|
|
||||||
{"ipv4Prefix": "1.2.3.0/24"},
|
|
||||||
{"ipv6Prefix": "2001:db8::/32"}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
|
|
||||||
try:
|
|
||||||
data = json.loads(content)
|
|
||||||
|
|
||||||
for prefix in data.get('prefixes', []):
|
|
||||||
# IPv4
|
|
||||||
ipv4 = prefix.get('ipv4Prefix')
|
|
||||||
if ipv4 and ListParser.validate_ip(ipv4):
|
|
||||||
ips.add(ListParser.normalize_cidr(ipv4))
|
|
||||||
|
|
||||||
# IPv6
|
|
||||||
ipv6 = prefix.get('ipv6Prefix')
|
|
||||||
if ipv6 and ListParser.validate_ip(ipv6):
|
|
||||||
ips.add(ListParser.normalize_cidr(ipv6))
|
|
||||||
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class AzureParser(ListParser):
|
|
||||||
"""Parser for Microsoft Azure IP ranges JSON (Service Tags format)"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse Azure Service Tags JSON format:
|
|
||||||
{
|
|
||||||
"values": [
|
|
||||||
{
|
|
||||||
"name": "ActionGroup",
|
|
||||||
"properties": {
|
|
||||||
"addressPrefixes": ["1.2.3.0/24", "5.6.7.0/24"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
|
|
||||||
try:
|
|
||||||
data = json.loads(content)
|
|
||||||
|
|
||||||
for value in data.get('values', []):
|
|
||||||
properties = value.get('properties', {})
|
|
||||||
prefixes = properties.get('addressPrefixes', [])
|
|
||||||
|
|
||||||
for prefix in prefixes:
|
|
||||||
if prefix and ListParser.validate_ip(prefix):
|
|
||||||
ips.add(ListParser.normalize_cidr(prefix))
|
|
||||||
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class MetaParser(ListParser):
|
|
||||||
"""Parser for Meta/Facebook IP ranges (plain CIDR list from BGP)"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse Meta format (plain CIDR list):
|
|
||||||
31.13.24.0/21
|
|
||||||
31.13.64.0/18
|
|
||||||
157.240.0.0/17
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
lines = content.strip().split('\n')
|
|
||||||
|
|
||||||
for line in lines:
|
|
||||||
line = line.strip()
|
|
||||||
|
|
||||||
# Skip empty lines and comments
|
|
||||||
if not line or line.startswith('#') or line.startswith('//'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
if ListParser.validate_ip(line):
|
|
||||||
ips.add(ListParser.normalize_cidr(line))
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class CloudflareParser(ListParser):
|
|
||||||
"""Parser for Cloudflare IP list"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse Cloudflare format (plain CIDR list):
|
|
||||||
1.2.3.0/24
|
|
||||||
5.6.7.0/24
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
lines = content.strip().split('\n')
|
|
||||||
|
|
||||||
for line in lines:
|
|
||||||
line = line.strip()
|
|
||||||
|
|
||||||
# Skip empty lines and comments
|
|
||||||
if not line or line.startswith('#'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
if ListParser.validate_ip(line):
|
|
||||||
ips.add(ListParser.normalize_cidr(line))
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class IANAParser(ListParser):
|
|
||||||
"""Parser for IANA Root Servers"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse IANA root servers (extract IPs from HTML/text)
|
|
||||||
Look for IPv4 addresses in format XXX.XXX.XXX.XXX
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
|
|
||||||
# Regex for IPv4 addresses
|
|
||||||
ipv4_pattern = r'\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b'
|
|
||||||
matches = re.findall(ipv4_pattern, content)
|
|
||||||
|
|
||||||
for ip in matches:
|
|
||||||
if ListParser.validate_ip(ip):
|
|
||||||
ips.add(ListParser.normalize_cidr(ip))
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
class NTPPoolParser(ListParser):
|
|
||||||
"""Parser for NTP Pool servers"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse NTP pool format (plain IP list or JSON)
|
|
||||||
Tries multiple formats
|
|
||||||
"""
|
|
||||||
ips = set()
|
|
||||||
|
|
||||||
# Try JSON first
|
|
||||||
try:
|
|
||||||
data = json.loads(content)
|
|
||||||
if isinstance(data, list):
|
|
||||||
for item in data:
|
|
||||||
if isinstance(item, str) and ListParser.validate_ip(item):
|
|
||||||
ips.add(ListParser.normalize_cidr(item))
|
|
||||||
elif isinstance(item, dict):
|
|
||||||
ip = item.get('ip') or item.get('address')
|
|
||||||
if ip and ListParser.validate_ip(ip):
|
|
||||||
ips.add(ListParser.normalize_cidr(ip))
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
# Fallback to plain text parsing
|
|
||||||
lines = content.strip().split('\n')
|
|
||||||
for line in lines:
|
|
||||||
line = line.strip()
|
|
||||||
if line and ListParser.validate_ip(line):
|
|
||||||
ips.add(ListParser.normalize_cidr(line))
|
|
||||||
|
|
||||||
return ips
|
|
||||||
|
|
||||||
|
|
||||||
# Parser registry
|
|
||||||
PARSERS: Dict[str, type[ListParser]] = {
|
|
||||||
'spamhaus': SpamhausParser,
|
|
||||||
'talos': TalosParser,
|
|
||||||
'aws': AWSParser,
|
|
||||||
'gcp': GCPParser,
|
|
||||||
'google': GCPParser,
|
|
||||||
'azure': AzureParser,
|
|
||||||
'microsoft': AzureParser,
|
|
||||||
'meta': MetaParser,
|
|
||||||
'facebook': MetaParser,
|
|
||||||
'cloudflare': CloudflareParser,
|
|
||||||
'iana': IANAParser,
|
|
||||||
'ntp': NTPPoolParser,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def get_parser(list_name: str) -> Optional[type[ListParser]]:
|
|
||||||
"""Get parser by list name (case-insensitive match)"""
|
|
||||||
list_name_lower = list_name.lower()
|
|
||||||
|
|
||||||
for key, parser in PARSERS.items():
|
|
||||||
if key in list_name_lower:
|
|
||||||
return parser
|
|
||||||
|
|
||||||
# Default fallback: try plain text parser
|
|
||||||
return TalosParser
|
|
||||||
|
|
||||||
|
|
||||||
def parse_list(list_name: str, content: str) -> Set[tuple[str, Optional[str]]]:
|
|
||||||
"""
|
|
||||||
Parse list content using appropriate parser
|
|
||||||
Returns set of (ip_address, cidr_range) tuples
|
|
||||||
"""
|
|
||||||
parser_class = get_parser(list_name)
|
|
||||||
if parser_class:
|
|
||||||
parser = parser_class()
|
|
||||||
return parser.parse(content)
|
|
||||||
return set()
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
IDS List Fetcher Runner
|
|
||||||
Fetches and syncs public blacklist/whitelist sources every 10 minutes
|
|
||||||
"""
|
|
||||||
import asyncio
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
# Add parent directory to path
|
|
||||||
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
|
|
||||||
|
|
||||||
from list_fetcher.fetcher import main
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
exit_code = asyncio.run(main())
|
|
||||||
sys.exit(exit_code)
|
|
||||||
@ -1,174 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Seed default public lists into database
|
|
||||||
Run after migration 006 to populate initial lists
|
|
||||||
"""
|
|
||||||
import psycopg2
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import argparse
|
|
||||||
|
|
||||||
# Add parent directory to path
|
|
||||||
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
|
|
||||||
|
|
||||||
from list_fetcher.fetcher import ListFetcher
|
|
||||||
import asyncio
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_LISTS = [
|
|
||||||
# Blacklists
|
|
||||||
{
|
|
||||||
'name': 'Spamhaus DROP',
|
|
||||||
'type': 'blacklist',
|
|
||||||
'url': 'https://www.spamhaus.org/drop/drop.txt',
|
|
||||||
'enabled': True,
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'Talos Intelligence IP Blacklist',
|
|
||||||
'type': 'blacklist',
|
|
||||||
'url': 'https://talosintelligence.com/documents/ip-blacklist',
|
|
||||||
'enabled': False, # Disabled by default - verify URL first
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
},
|
|
||||||
|
|
||||||
# Whitelists
|
|
||||||
{
|
|
||||||
'name': 'AWS IP Ranges',
|
|
||||||
'type': 'whitelist',
|
|
||||||
'url': 'https://ip-ranges.amazonaws.com/ip-ranges.json',
|
|
||||||
'enabled': True,
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'Google Cloud IP Ranges',
|
|
||||||
'type': 'whitelist',
|
|
||||||
'url': 'https://www.gstatic.com/ipranges/cloud.json',
|
|
||||||
'enabled': True,
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'Cloudflare IPv4',
|
|
||||||
'type': 'whitelist',
|
|
||||||
'url': 'https://www.cloudflare.com/ips-v4',
|
|
||||||
'enabled': True,
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'IANA Root Servers',
|
|
||||||
'type': 'whitelist',
|
|
||||||
'url': 'https://www.iana.org/domains/root/servers',
|
|
||||||
'enabled': True,
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'name': 'NTP Pool Servers',
|
|
||||||
'type': 'whitelist',
|
|
||||||
'url': 'https://www.ntppool.org/zone/@',
|
|
||||||
'enabled': False, # Disabled by default - zone parameter needed
|
|
||||||
'fetch_interval_minutes': 10
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def seed_lists(database_url: str, dry_run: bool = False):
|
|
||||||
"""Insert default lists into database"""
|
|
||||||
conn = psycopg2.connect(database_url)
|
|
||||||
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Check if lists already exist
|
|
||||||
cur.execute("SELECT COUNT(*) FROM public_lists")
|
|
||||||
result = cur.fetchone()
|
|
||||||
existing_count = result[0] if result else 0
|
|
||||||
|
|
||||||
if existing_count > 0 and not dry_run:
|
|
||||||
print(f"⚠️ Warning: {existing_count} lists already exist in database")
|
|
||||||
response = input("Continue and add default lists? (y/n): ")
|
|
||||||
if response.lower() != 'y':
|
|
||||||
print("Aborted")
|
|
||||||
return
|
|
||||||
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print("SEEDING DEFAULT PUBLIC LISTS")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
|
|
||||||
for list_config in DEFAULT_LISTS:
|
|
||||||
if dry_run:
|
|
||||||
status = "✓ ENABLED" if list_config['enabled'] else "○ DISABLED"
|
|
||||||
print(f"{status} {list_config['type'].upper()}: {list_config['name']}")
|
|
||||||
print(f" URL: {list_config['url']}")
|
|
||||||
print()
|
|
||||||
else:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO public_lists (name, type, url, enabled, fetch_interval_minutes)
|
|
||||||
VALUES (%s, %s, %s, %s, %s)
|
|
||||||
RETURNING id, name
|
|
||||||
""", (
|
|
||||||
list_config['name'],
|
|
||||||
list_config['type'],
|
|
||||||
list_config['url'],
|
|
||||||
list_config['enabled'],
|
|
||||||
list_config['fetch_interval_minutes']
|
|
||||||
))
|
|
||||||
|
|
||||||
result = cur.fetchone()
|
|
||||||
if result:
|
|
||||||
list_id, list_name = result
|
|
||||||
status = "✓" if list_config['enabled'] else "○"
|
|
||||||
print(f"{status} Added: {list_name} (ID: {list_id})")
|
|
||||||
|
|
||||||
if not dry_run:
|
|
||||||
conn.commit()
|
|
||||||
print(f"\n✓ Successfully seeded {len(DEFAULT_LISTS)} lists")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
else:
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print(f"DRY RUN: Would seed {len(DEFAULT_LISTS)} lists")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
conn.rollback()
|
|
||||||
print(f"✗ Error: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return 1
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
async def sync_lists(database_url: str):
|
|
||||||
"""Run initial sync of all enabled lists"""
|
|
||||||
print("\nRunning initial sync of enabled lists...\n")
|
|
||||||
fetcher = ListFetcher(database_url)
|
|
||||||
await fetcher.fetch_all_lists()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description='Seed default public lists')
|
|
||||||
parser.add_argument('--dry-run', action='store_true', help='Show what would be added without inserting')
|
|
||||||
parser.add_argument('--sync', action='store_true', help='Run initial sync after seeding')
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
database_url = os.getenv('DATABASE_URL')
|
|
||||||
if not database_url:
|
|
||||||
print("ERROR: DATABASE_URL environment variable not set")
|
|
||||||
return 1
|
|
||||||
|
|
||||||
# Seed lists
|
|
||||||
exit_code = seed_lists(database_url, dry_run=args.dry_run)
|
|
||||||
|
|
||||||
if exit_code != 0:
|
|
||||||
return exit_code
|
|
||||||
|
|
||||||
# Optionally sync
|
|
||||||
if args.sync and not args.dry_run:
|
|
||||||
asyncio.run(sync_lists(database_url))
|
|
||||||
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
sys.exit(main())
|
|
||||||
@ -97,7 +97,7 @@ class TrainRequest(BaseModel):
|
|||||||
|
|
||||||
class DetectRequest(BaseModel):
|
class DetectRequest(BaseModel):
|
||||||
max_records: int = 5000
|
max_records: int = 5000
|
||||||
hours_back: float = 1.0 # Support fractional hours (e.g., 0.5 = 30 min)
|
hours_back: int = 1
|
||||||
risk_threshold: float = 60.0
|
risk_threshold: float = 60.0
|
||||||
auto_block: bool = False
|
auto_block: bool = False
|
||||||
|
|
||||||
@ -323,13 +323,7 @@ async def detect_anomalies(request: DetectRequest):
|
|||||||
detections = ml_detector.detect(df, mode='confidence')
|
detections = ml_detector.detect(df, mode='confidence')
|
||||||
# Convert to legacy format for compatibility
|
# Convert to legacy format for compatibility
|
||||||
for det in detections:
|
for det in detections:
|
||||||
# Map confidence_level string to numeric value for database
|
det['confidence'] = det['confidence_level'] # Map confidence_level to confidence
|
||||||
confidence_mapping = {
|
|
||||||
'high': 95.0,
|
|
||||||
'medium': 75.0,
|
|
||||||
'low': 50.0
|
|
||||||
}
|
|
||||||
det['confidence'] = confidence_mapping.get(det['confidence_level'], 50.0)
|
|
||||||
else:
|
else:
|
||||||
print("[DETECT] Using Legacy ML Analyzer")
|
print("[DETECT] Using Legacy ML Analyzer")
|
||||||
detections = ml_analyzer.detect(df, risk_threshold=request.risk_threshold)
|
detections = ml_analyzer.detect(df, risk_threshold=request.risk_threshold)
|
||||||
|
|||||||
@ -1,376 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Merge Logic for Public Lists Integration
|
|
||||||
Implements priority: Manual Whitelist > Public Whitelist > Public Blacklist
|
|
||||||
"""
|
|
||||||
import os
|
|
||||||
import psycopg2
|
|
||||||
from typing import Dict, Set, Optional
|
|
||||||
from datetime import datetime
|
|
||||||
import logging
|
|
||||||
import ipaddress
|
|
||||||
|
|
||||||
logging.basicConfig(level=logging.INFO)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def ip_matches_cidr(ip_address: str, cidr_range: Optional[str]) -> bool:
|
|
||||||
"""
|
|
||||||
Check if IP address matches CIDR range
|
|
||||||
Returns True if cidr_range is None (exact match) or if IP is in range
|
|
||||||
"""
|
|
||||||
if not cidr_range:
|
|
||||||
return True # Exact match handling
|
|
||||||
|
|
||||||
try:
|
|
||||||
ip = ipaddress.ip_address(ip_address)
|
|
||||||
network = ipaddress.ip_network(cidr_range, strict=False)
|
|
||||||
return ip in network
|
|
||||||
except (ValueError, TypeError):
|
|
||||||
logger.warning(f"Invalid IP/CIDR: {ip_address}/{cidr_range}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
class MergeLogic:
|
|
||||||
"""
|
|
||||||
Handles merge logic between manual entries and public lists
|
|
||||||
Priority: Manual whitelist > Public whitelist > Public blacklist
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, database_url: str):
|
|
||||||
self.database_url = database_url
|
|
||||||
|
|
||||||
def get_db_connection(self):
|
|
||||||
"""Create database connection"""
|
|
||||||
return psycopg2.connect(self.database_url)
|
|
||||||
|
|
||||||
def get_all_whitelisted_ips(self) -> Set[str]:
|
|
||||||
"""
|
|
||||||
Get all whitelisted IPs (manual + public)
|
|
||||||
Manual whitelist has higher priority than public whitelist
|
|
||||||
"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT DISTINCT ip_address
|
|
||||||
FROM whitelist
|
|
||||||
WHERE active = true
|
|
||||||
""")
|
|
||||||
return {row[0] for row in cur.fetchall()}
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def get_public_blacklist_ips(self) -> Set[str]:
|
|
||||||
"""Get all active public blacklist IPs"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT DISTINCT ip_address
|
|
||||||
FROM public_blacklist_ips
|
|
||||||
WHERE is_active = true
|
|
||||||
""")
|
|
||||||
return {row[0] for row in cur.fetchall()}
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def should_block_ip(self, ip_address: str) -> tuple[bool, str]:
|
|
||||||
"""
|
|
||||||
Determine if IP should be blocked based on merge logic
|
|
||||||
Returns: (should_block, reason)
|
|
||||||
|
|
||||||
Priority:
|
|
||||||
1. Manual whitelist (exact or CIDR) → DON'T block (highest priority)
|
|
||||||
2. Public whitelist (exact or CIDR) → DON'T block
|
|
||||||
3. Public blacklist (exact or CIDR) → DO block
|
|
||||||
4. Not in any list → DON'T block (only ML decides)
|
|
||||||
"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Check manual whitelist (highest priority) - exact + CIDR matching
|
|
||||||
cur.execute("""
|
|
||||||
SELECT ip_address, list_id FROM whitelist
|
|
||||||
WHERE active = true
|
|
||||||
AND source = 'manual'
|
|
||||||
""")
|
|
||||||
for row in cur.fetchall():
|
|
||||||
wl_ip, wl_cidr = row[0], None
|
|
||||||
# Check if whitelist entry has CIDR notation
|
|
||||||
if '/' in wl_ip:
|
|
||||||
wl_cidr = wl_ip
|
|
||||||
if wl_ip == ip_address or ip_matches_cidr(ip_address, wl_cidr):
|
|
||||||
return (False, "manual_whitelist")
|
|
||||||
|
|
||||||
# Check public whitelist (any source except 'manual') - exact + CIDR
|
|
||||||
cur.execute("""
|
|
||||||
SELECT ip_address, list_id FROM whitelist
|
|
||||||
WHERE active = true
|
|
||||||
AND source != 'manual'
|
|
||||||
""")
|
|
||||||
for row in cur.fetchall():
|
|
||||||
wl_ip, wl_cidr = row[0], None
|
|
||||||
if '/' in wl_ip:
|
|
||||||
wl_cidr = wl_ip
|
|
||||||
if wl_ip == ip_address or ip_matches_cidr(ip_address, wl_cidr):
|
|
||||||
return (False, "public_whitelist")
|
|
||||||
|
|
||||||
# Check public blacklist - exact + CIDR matching
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, ip_address, cidr_range FROM public_blacklist_ips
|
|
||||||
WHERE is_active = true
|
|
||||||
""")
|
|
||||||
for row in cur.fetchall():
|
|
||||||
bl_id, bl_ip, bl_cidr = row
|
|
||||||
# Match exact IP or check if IP is in CIDR range
|
|
||||||
if bl_ip == ip_address or ip_matches_cidr(ip_address, bl_cidr):
|
|
||||||
return (True, f"public_blacklist:{bl_id}")
|
|
||||||
|
|
||||||
# Not in any list
|
|
||||||
return (False, "not_listed")
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def create_detection_from_blacklist(
|
|
||||||
self,
|
|
||||||
ip_address: str,
|
|
||||||
blacklist_id: str,
|
|
||||||
risk_score: int = 75
|
|
||||||
) -> Optional[str]:
|
|
||||||
"""
|
|
||||||
Create detection record for public blacklist IP
|
|
||||||
Only if not whitelisted (priority check)
|
|
||||||
"""
|
|
||||||
should_block, reason = self.should_block_ip(ip_address)
|
|
||||||
|
|
||||||
if not should_block:
|
|
||||||
logger.info(f"IP {ip_address} not blocked - reason: {reason}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Check if detection already exists
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id FROM detections
|
|
||||||
WHERE source_ip = %s
|
|
||||||
AND detection_source = 'public_blacklist'
|
|
||||||
LIMIT 1
|
|
||||||
""", (ip_address,))
|
|
||||||
|
|
||||||
existing = cur.fetchone()
|
|
||||||
if existing:
|
|
||||||
logger.info(f"Detection already exists for {ip_address}")
|
|
||||||
return existing[0]
|
|
||||||
|
|
||||||
# Create new detection
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO detections (
|
|
||||||
source_ip,
|
|
||||||
risk_score,
|
|
||||||
confidence,
|
|
||||||
anomaly_type,
|
|
||||||
reason,
|
|
||||||
log_count,
|
|
||||||
first_seen,
|
|
||||||
last_seen,
|
|
||||||
detection_source,
|
|
||||||
blacklist_id,
|
|
||||||
detected_at,
|
|
||||||
blocked
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
ip_address,
|
|
||||||
risk_score, # numeric, not string
|
|
||||||
100.0, # confidence
|
|
||||||
'public_blacklist',
|
|
||||||
'IP in public blacklist',
|
|
||||||
1, # log_count
|
|
||||||
datetime.utcnow(), # first_seen
|
|
||||||
datetime.utcnow(), # last_seen
|
|
||||||
'public_blacklist',
|
|
||||||
blacklist_id,
|
|
||||||
datetime.utcnow(),
|
|
||||||
False # Will be blocked by auto-block service if risk_score >= 80
|
|
||||||
))
|
|
||||||
|
|
||||||
result = cur.fetchone()
|
|
||||||
if not result:
|
|
||||||
logger.error(f"Failed to get detection ID after insert for {ip_address}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
detection_id = result[0]
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
logger.info(f"Created detection {detection_id} for blacklisted IP {ip_address}")
|
|
||||||
return detection_id
|
|
||||||
except Exception as e:
|
|
||||||
conn.rollback()
|
|
||||||
logger.error(f"Failed to create detection for {ip_address}: {e}")
|
|
||||||
return None
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def cleanup_invalid_detections(self) -> int:
|
|
||||||
"""
|
|
||||||
Remove detections for IPs that are now whitelisted
|
|
||||||
CIDR-aware: checks both exact match and network containment
|
|
||||||
Respects priority: manual/public whitelist overrides blacklist
|
|
||||||
"""
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Delete detections for IPs in whitelist ranges (CIDR-aware)
|
|
||||||
# Cast both sides to inet explicitly for type safety
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM detections d
|
|
||||||
WHERE d.detection_source = 'public_blacklist'
|
|
||||||
AND EXISTS (
|
|
||||||
SELECT 1 FROM whitelist wl
|
|
||||||
WHERE wl.active = true
|
|
||||||
AND wl.ip_inet IS NOT NULL
|
|
||||||
AND (
|
|
||||||
d.source_ip::inet = wl.ip_inet::inet
|
|
||||||
OR d.source_ip::inet <<= wl.ip_inet::inet
|
|
||||||
)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
deleted = cur.rowcount
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
if deleted > 0:
|
|
||||||
logger.info(f"Cleaned up {deleted} detections for whitelisted IPs (CIDR-aware)")
|
|
||||||
|
|
||||||
return deleted
|
|
||||||
except Exception as e:
|
|
||||||
conn.rollback()
|
|
||||||
logger.error(f"Failed to cleanup detections: {e}")
|
|
||||||
return 0
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def sync_public_blacklist_detections(self) -> Dict[str, int]:
|
|
||||||
"""
|
|
||||||
Sync detections with current public blacklist state using BULK operations
|
|
||||||
Creates detections for blacklisted IPs (if not whitelisted)
|
|
||||||
Removes detections for IPs no longer blacklisted or now whitelisted
|
|
||||||
"""
|
|
||||||
stats = {
|
|
||||||
'created': 0,
|
|
||||||
'cleaned': 0,
|
|
||||||
'skipped_whitelisted': 0
|
|
||||||
}
|
|
||||||
|
|
||||||
conn = self.get_db_connection()
|
|
||||||
try:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
# Cleanup whitelisted IPs first (priority)
|
|
||||||
stats['cleaned'] = self.cleanup_invalid_detections()
|
|
||||||
|
|
||||||
# Bulk create detections with CIDR-aware matching
|
|
||||||
# Uses PostgreSQL INET operators for network containment
|
|
||||||
# Priority: Manual whitelist > Public whitelist > Blacklist
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO detections (
|
|
||||||
source_ip,
|
|
||||||
risk_score,
|
|
||||||
confidence,
|
|
||||||
anomaly_type,
|
|
||||||
reason,
|
|
||||||
log_count,
|
|
||||||
first_seen,
|
|
||||||
last_seen,
|
|
||||||
detection_source,
|
|
||||||
blacklist_id,
|
|
||||||
detected_at,
|
|
||||||
blocked
|
|
||||||
)
|
|
||||||
SELECT DISTINCT
|
|
||||||
bl.ip_address,
|
|
||||||
75::numeric,
|
|
||||||
100::numeric,
|
|
||||||
'public_blacklist',
|
|
||||||
'IP in public blacklist',
|
|
||||||
1,
|
|
||||||
NOW(),
|
|
||||||
NOW(),
|
|
||||||
'public_blacklist',
|
|
||||||
bl.id,
|
|
||||||
NOW(),
|
|
||||||
false
|
|
||||||
FROM public_blacklist_ips bl
|
|
||||||
WHERE bl.is_active = true
|
|
||||||
AND bl.ip_inet IS NOT NULL
|
|
||||||
-- Priority 1: Exclude if in manual whitelist (highest priority)
|
|
||||||
-- Cast to inet explicitly for type safety
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM whitelist wl
|
|
||||||
WHERE wl.active = true
|
|
||||||
AND wl.source = 'manual'
|
|
||||||
AND wl.ip_inet IS NOT NULL
|
|
||||||
AND (
|
|
||||||
bl.ip_inet::inet = wl.ip_inet::inet
|
|
||||||
OR bl.ip_inet::inet <<= wl.ip_inet::inet
|
|
||||||
)
|
|
||||||
)
|
|
||||||
-- Priority 2: Exclude if in public whitelist
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM whitelist wl
|
|
||||||
WHERE wl.active = true
|
|
||||||
AND wl.source != 'manual'
|
|
||||||
AND wl.ip_inet IS NOT NULL
|
|
||||||
AND (
|
|
||||||
bl.ip_inet::inet = wl.ip_inet::inet
|
|
||||||
OR bl.ip_inet::inet <<= wl.ip_inet::inet
|
|
||||||
)
|
|
||||||
)
|
|
||||||
-- Avoid duplicate detections
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM detections d
|
|
||||||
WHERE d.source_ip = bl.ip_address
|
|
||||||
AND d.detection_source = 'public_blacklist'
|
|
||||||
)
|
|
||||||
RETURNING id
|
|
||||||
""")
|
|
||||||
|
|
||||||
created_ids = cur.fetchall()
|
|
||||||
stats['created'] = len(created_ids)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
logger.info(f"Bulk sync complete: {stats}")
|
|
||||||
return stats
|
|
||||||
except Exception as e:
|
|
||||||
conn.rollback()
|
|
||||||
logger.error(f"Failed to sync detections: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return stats
|
|
||||||
finally:
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
"""Run merge logic sync"""
|
|
||||||
database_url = os.environ.get('DATABASE_URL')
|
|
||||||
if not database_url:
|
|
||||||
logger.error("DATABASE_URL environment variable not set")
|
|
||||||
return 1
|
|
||||||
|
|
||||||
merge = MergeLogic(database_url)
|
|
||||||
stats = merge.sync_public_blacklist_detections()
|
|
||||||
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print("MERGE LOGIC SYNC COMPLETED")
|
|
||||||
print(f"{'='*60}")
|
|
||||||
print(f"Created detections: {stats['created']}")
|
|
||||||
print(f"Cleaned invalid detections: {stats['cleaned']}")
|
|
||||||
print(f"Skipped (whitelisted): {stats['skipped_whitelisted']}")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
exit(main())
|
|
||||||
@ -5,7 +5,6 @@ Più veloce e affidabile di SSH per 10+ router
|
|||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
import asyncio
|
import asyncio
|
||||||
import ssl
|
|
||||||
from typing import List, Dict, Optional
|
from typing import List, Dict, Optional
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import hashlib
|
import hashlib
|
||||||
@ -22,55 +21,33 @@ class MikroTikManager:
|
|||||||
self.timeout = timeout
|
self.timeout = timeout
|
||||||
self.clients = {} # Cache di client HTTP per router
|
self.clients = {} # Cache di client HTTP per router
|
||||||
|
|
||||||
def _get_client(self, router_ip: str, username: str, password: str, port: int = 8728, use_ssl: bool = False) -> httpx.AsyncClient:
|
def _get_client(self, router_ip: str, username: str, password: str, port: int = 8728) -> httpx.AsyncClient:
|
||||||
"""Ottiene o crea client HTTP per un router"""
|
"""Ottiene o crea client HTTP per un router"""
|
||||||
key = f"{router_ip}:{port}:{use_ssl}"
|
key = f"{router_ip}:{port}"
|
||||||
if key not in self.clients:
|
if key not in self.clients:
|
||||||
# API REST MikroTik:
|
# API REST MikroTik usa porta HTTP/HTTPS (default 80/443)
|
||||||
# - Porta 8728: HTTP (default)
|
# Per semplicità useremo richieste HTTP dirette
|
||||||
# - Porta 8729: HTTPS (SSL)
|
|
||||||
protocol = "https" if use_ssl or port == 8729 else "http"
|
|
||||||
auth = base64.b64encode(f"{username}:{password}".encode()).decode()
|
auth = base64.b64encode(f"{username}:{password}".encode()).decode()
|
||||||
headers = {
|
headers = {
|
||||||
"Authorization": f"Basic {auth}",
|
"Authorization": f"Basic {auth}",
|
||||||
"Content-Type": "application/json"
|
"Content-Type": "application/json"
|
||||||
}
|
}
|
||||||
|
|
||||||
# SSL context per MikroTik (supporta protocolli TLS legacy)
|
|
||||||
ssl_context = None
|
|
||||||
if protocol == "https":
|
|
||||||
ssl_context = ssl.create_default_context()
|
|
||||||
ssl_context.check_hostname = False
|
|
||||||
ssl_context.verify_mode = ssl.CERT_NONE
|
|
||||||
# Abilita protocolli TLS legacy per MikroTik (TLS 1.0+)
|
|
||||||
try:
|
|
||||||
ssl_context.minimum_version = ssl.TLSVersion.TLSv1
|
|
||||||
except AttributeError:
|
|
||||||
# Python < 3.7 fallback
|
|
||||||
pass
|
|
||||||
# Abilita cipher suite legacy per compatibilità
|
|
||||||
ssl_context.set_ciphers('DEFAULT@SECLEVEL=1')
|
|
||||||
|
|
||||||
self.clients[key] = httpx.AsyncClient(
|
self.clients[key] = httpx.AsyncClient(
|
||||||
base_url=f"{protocol}://{router_ip}:{port}",
|
base_url=f"http://{router_ip}",
|
||||||
headers=headers,
|
headers=headers,
|
||||||
timeout=self.timeout,
|
timeout=self.timeout
|
||||||
verify=ssl_context if ssl_context else True
|
|
||||||
)
|
)
|
||||||
return self.clients[key]
|
return self.clients[key]
|
||||||
|
|
||||||
async def test_connection(self, router_ip: str, username: str, password: str, port: int = 8728, use_ssl: bool = False) -> bool:
|
async def test_connection(self, router_ip: str, username: str, password: str, port: int = 8728) -> bool:
|
||||||
"""Testa connessione a un router"""
|
"""Testa connessione a un router"""
|
||||||
try:
|
try:
|
||||||
# Auto-detect SSL: porta 8729 = SSL
|
client = self._get_client(router_ip, username, password, port)
|
||||||
if port == 8729:
|
|
||||||
use_ssl = True
|
|
||||||
client = self._get_client(router_ip, username, password, port, use_ssl)
|
|
||||||
# Prova a leggere system identity
|
# Prova a leggere system identity
|
||||||
response = await client.get("/rest/system/identity")
|
response = await client.get("/rest/system/identity")
|
||||||
return response.status_code == 200
|
return response.status_code == 200
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"[ERROR] Connessione a {router_ip}:{port} fallita: {e}")
|
print(f"[ERROR] Connessione a {router_ip} fallita: {e}")
|
||||||
return False
|
return False
|
||||||
|
|
||||||
async def add_address_list(
|
async def add_address_list(
|
||||||
@ -82,18 +59,14 @@ class MikroTikManager:
|
|||||||
list_name: str = "ddos_blocked",
|
list_name: str = "ddos_blocked",
|
||||||
comment: str = "",
|
comment: str = "",
|
||||||
timeout_duration: str = "1h",
|
timeout_duration: str = "1h",
|
||||||
port: int = 8728,
|
port: int = 8728
|
||||||
use_ssl: bool = False
|
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""
|
"""
|
||||||
Aggiunge IP alla address-list del router
|
Aggiunge IP alla address-list del router
|
||||||
timeout_duration: es. "1h", "30m", "1d"
|
timeout_duration: es. "1h", "30m", "1d"
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
# Auto-detect SSL: porta 8729 = SSL
|
client = self._get_client(router_ip, username, password, port)
|
||||||
if port == 8729:
|
|
||||||
use_ssl = True
|
|
||||||
client = self._get_client(router_ip, username, password, port, use_ssl)
|
|
||||||
|
|
||||||
# Controlla se IP già esiste
|
# Controlla se IP già esiste
|
||||||
response = await client.get("/rest/ip/firewall/address-list")
|
response = await client.get("/rest/ip/firewall/address-list")
|
||||||
@ -132,15 +105,11 @@ class MikroTikManager:
|
|||||||
password: str,
|
password: str,
|
||||||
ip_address: str,
|
ip_address: str,
|
||||||
list_name: str = "ddos_blocked",
|
list_name: str = "ddos_blocked",
|
||||||
port: int = 8728,
|
port: int = 8728
|
||||||
use_ssl: bool = False
|
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""Rimuove IP dalla address-list del router"""
|
"""Rimuove IP dalla address-list del router"""
|
||||||
try:
|
try:
|
||||||
# Auto-detect SSL: porta 8729 = SSL
|
client = self._get_client(router_ip, username, password, port)
|
||||||
if port == 8729:
|
|
||||||
use_ssl = True
|
|
||||||
client = self._get_client(router_ip, username, password, port, use_ssl)
|
|
||||||
|
|
||||||
# Trova ID dell'entry
|
# Trova ID dell'entry
|
||||||
response = await client.get("/rest/ip/firewall/address-list")
|
response = await client.get("/rest/ip/firewall/address-list")
|
||||||
@ -170,15 +139,11 @@ class MikroTikManager:
|
|||||||
username: str,
|
username: str,
|
||||||
password: str,
|
password: str,
|
||||||
list_name: Optional[str] = None,
|
list_name: Optional[str] = None,
|
||||||
port: int = 8728,
|
port: int = 8728
|
||||||
use_ssl: bool = False
|
|
||||||
) -> List[Dict]:
|
) -> List[Dict]:
|
||||||
"""Ottiene address-list da router"""
|
"""Ottiene address-list da router"""
|
||||||
try:
|
try:
|
||||||
# Auto-detect SSL: porta 8729 = SSL
|
client = self._get_client(router_ip, username, password, port)
|
||||||
if port == 8729:
|
|
||||||
use_ssl = True
|
|
||||||
client = self._get_client(router_ip, username, password, port, use_ssl)
|
|
||||||
response = await client.get("/rest/ip/firewall/address-list")
|
response = await client.get("/rest/ip/firewall/address-list")
|
||||||
|
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
|
|||||||
@ -1,240 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Script di test connessione MikroTik API
|
|
||||||
Verifica connessione a tutti i router configurati nel database
|
|
||||||
"""
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
import psycopg2
|
|
||||||
from mikrotik_manager import MikroTikManager
|
|
||||||
|
|
||||||
# Load environment variables
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
def get_routers_from_db():
|
|
||||||
"""Recupera router configurati dal database"""
|
|
||||||
try:
|
|
||||||
conn = psycopg2.connect(
|
|
||||||
host=os.getenv("PGHOST"),
|
|
||||||
port=os.getenv("PGPORT"),
|
|
||||||
database=os.getenv("PGDATABASE"),
|
|
||||||
user=os.getenv("PGUSER"),
|
|
||||||
password=os.getenv("PGPASSWORD")
|
|
||||||
)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT
|
|
||||||
id, name, ip_address, api_port,
|
|
||||||
username, password, enabled
|
|
||||||
FROM routers
|
|
||||||
ORDER BY name
|
|
||||||
""")
|
|
||||||
|
|
||||||
routers = []
|
|
||||||
for row in cursor.fetchall():
|
|
||||||
routers.append({
|
|
||||||
'id': row[0],
|
|
||||||
'name': row[1],
|
|
||||||
'ip_address': row[2],
|
|
||||||
'api_port': row[3],
|
|
||||||
'username': row[4],
|
|
||||||
'password': row[5],
|
|
||||||
'enabled': row[6]
|
|
||||||
})
|
|
||||||
|
|
||||||
cursor.close()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
return routers
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f"❌ Errore connessione database: {e}")
|
|
||||||
return []
|
|
||||||
|
|
||||||
|
|
||||||
async def test_router_connection(manager, router):
|
|
||||||
"""Testa connessione a un singolo router"""
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print(f"🔍 Test Router: {router['name']}")
|
|
||||||
print(f"{'='*60}")
|
|
||||||
print(f" IP: {router['ip_address']}")
|
|
||||||
print(f" Porta: {router['api_port']}")
|
|
||||||
print(f" Username: {router['username']}")
|
|
||||||
print(f" Enabled: {'✅ Sì' if router['enabled'] else '❌ No'}")
|
|
||||||
|
|
||||||
if not router['enabled']:
|
|
||||||
print(f" ⚠️ Router disabilitato - skip test")
|
|
||||||
return False
|
|
||||||
|
|
||||||
# Test connessione
|
|
||||||
print(f"\n 📡 Test connessione...")
|
|
||||||
try:
|
|
||||||
connected = await manager.test_connection(
|
|
||||||
router_ip=router['ip_address'],
|
|
||||||
username=router['username'],
|
|
||||||
password=router['password'],
|
|
||||||
port=router['api_port']
|
|
||||||
)
|
|
||||||
|
|
||||||
if connected:
|
|
||||||
print(f" ✅ Connessione OK!")
|
|
||||||
|
|
||||||
# Test lettura address-list
|
|
||||||
print(f" 📋 Lettura address-list...")
|
|
||||||
entries = await manager.get_address_list(
|
|
||||||
router_ip=router['ip_address'],
|
|
||||||
username=router['username'],
|
|
||||||
password=router['password'],
|
|
||||||
list_name="ddos_blocked",
|
|
||||||
port=router['api_port']
|
|
||||||
)
|
|
||||||
print(f" ✅ Trovati {len(entries)} IP in lista 'ddos_blocked'")
|
|
||||||
|
|
||||||
# Mostra primi 5 IP
|
|
||||||
if entries:
|
|
||||||
print(f"\n 📌 Primi 5 IP bloccati:")
|
|
||||||
for entry in entries[:5]:
|
|
||||||
ip = entry.get('address', 'N/A')
|
|
||||||
comment = entry.get('comment', 'N/A')
|
|
||||||
timeout = entry.get('timeout', 'N/A')
|
|
||||||
print(f" - {ip} | {comment} | timeout: {timeout}")
|
|
||||||
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print(f" ❌ Connessione FALLITA")
|
|
||||||
print(f"\n 🔧 Suggerimenti:")
|
|
||||||
print(f" 1. Verifica che il router sia raggiungibile:")
|
|
||||||
print(f" ping {router['ip_address']}")
|
|
||||||
print(f" 2. Verifica che il servizio API sia abilitato sul router:")
|
|
||||||
print(f" /ip service print (deve mostrare 'api' o 'api-ssl' enabled)")
|
|
||||||
print(f" 3. Verifica firewall non blocchi porta {router['api_port']}")
|
|
||||||
print(f" 4. Verifica credenziali (username/password)")
|
|
||||||
return False
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ❌ Errore durante test: {e}")
|
|
||||||
print(f" 📋 Tipo errore: {type(e).__name__}")
|
|
||||||
import traceback
|
|
||||||
print(f" 📋 Stack trace:")
|
|
||||||
traceback.print_exc()
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
async def test_block_unblock(manager, router, test_ip="1.2.3.4"):
|
|
||||||
"""Testa blocco/sblocco IP"""
|
|
||||||
print(f"\n 🧪 Test blocco/sblocco IP {test_ip}...")
|
|
||||||
|
|
||||||
# Test blocco
|
|
||||||
print(f" Blocco IP...")
|
|
||||||
blocked = await manager.add_address_list(
|
|
||||||
router_ip=router['ip_address'],
|
|
||||||
username=router['username'],
|
|
||||||
password=router['password'],
|
|
||||||
ip_address=test_ip,
|
|
||||||
list_name="ids_test",
|
|
||||||
comment="Test IDS API Fix",
|
|
||||||
timeout_duration="5m",
|
|
||||||
port=router['api_port']
|
|
||||||
)
|
|
||||||
|
|
||||||
if blocked:
|
|
||||||
print(f" ✅ IP bloccato con successo!")
|
|
||||||
|
|
||||||
# Aspetta 2 secondi
|
|
||||||
await asyncio.sleep(2)
|
|
||||||
|
|
||||||
# Test sblocco
|
|
||||||
print(f" Sblocco IP...")
|
|
||||||
unblocked = await manager.remove_address_list(
|
|
||||||
router_ip=router['ip_address'],
|
|
||||||
username=router['username'],
|
|
||||||
password=router['password'],
|
|
||||||
ip_address=test_ip,
|
|
||||||
list_name="ids_test",
|
|
||||||
port=router['api_port']
|
|
||||||
)
|
|
||||||
|
|
||||||
if unblocked:
|
|
||||||
print(f" ✅ IP sbloccato con successo!")
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print(f" ⚠️ Sblocco fallito (ma blocco OK)")
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
print(f" ❌ Blocco IP fallito")
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
|
||||||
"""Test principale"""
|
|
||||||
print("╔════════════════════════════════════════════════════════════╗")
|
|
||||||
print("║ TEST CONNESSIONE MIKROTIK API REST ║")
|
|
||||||
print("║ IDS v2.0.0 - Hybrid Detector ║")
|
|
||||||
print("╚════════════════════════════════════════════════════════════╝")
|
|
||||||
|
|
||||||
# Recupera router dal database
|
|
||||||
print("\n📊 Caricamento router dal database...")
|
|
||||||
routers = get_routers_from_db()
|
|
||||||
|
|
||||||
if not routers:
|
|
||||||
print("❌ Nessun router trovato nel database!")
|
|
||||||
print("\n💡 Aggiungi router da: https://ids.alfacom.it/routers")
|
|
||||||
return
|
|
||||||
|
|
||||||
print(f"✅ Trovati {len(routers)} router configurati\n")
|
|
||||||
|
|
||||||
# Crea manager
|
|
||||||
manager = MikroTikManager(timeout=10)
|
|
||||||
|
|
||||||
# Test ogni router
|
|
||||||
results = []
|
|
||||||
for router in routers:
|
|
||||||
result = await test_router_connection(manager, router)
|
|
||||||
results.append({
|
|
||||||
'name': router['name'],
|
|
||||||
'ip': router['ip_address'],
|
|
||||||
'connected': result
|
|
||||||
})
|
|
||||||
|
|
||||||
# Se connesso, testa blocco/sblocco
|
|
||||||
if result and router['enabled']:
|
|
||||||
test_ok = await test_block_unblock(manager, router)
|
|
||||||
results[-1]['block_test'] = test_ok
|
|
||||||
|
|
||||||
# Riepilogo
|
|
||||||
print(f"\n{'='*60}")
|
|
||||||
print("📊 RIEPILOGO TEST")
|
|
||||||
print(f"{'='*60}\n")
|
|
||||||
|
|
||||||
for r in results:
|
|
||||||
conn_status = "✅ OK" if r['connected'] else "❌ FAIL"
|
|
||||||
block_status = ""
|
|
||||||
if 'block_test' in r:
|
|
||||||
block_status = " | Blocco: " + ("✅ OK" if r['block_test'] else "❌ FAIL")
|
|
||||||
print(f" {r['name']:20s} ({r['ip']:15s}): {conn_status}{block_status}")
|
|
||||||
|
|
||||||
success_count = sum(1 for r in results if r['connected'])
|
|
||||||
print(f"\n Totale: {success_count}/{len(results)} router connessi\n")
|
|
||||||
|
|
||||||
# Cleanup
|
|
||||||
await manager.close_all()
|
|
||||||
|
|
||||||
# Exit code
|
|
||||||
sys.exit(0 if success_count == len(results) else 1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
try:
|
|
||||||
asyncio.run(main())
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("\n\n⚠️ Test interrotto dall'utente")
|
|
||||||
sys.exit(1)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"\n\n❌ Errore critico: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
sys.exit(1)
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""Test semplice connessione MikroTik - Debug"""
|
|
||||||
|
|
||||||
import httpx
|
|
||||||
import base64
|
|
||||||
import asyncio
|
|
||||||
|
|
||||||
async def test_simple():
|
|
||||||
print("🔍 Test Connessione MikroTik Semplificato\n")
|
|
||||||
|
|
||||||
# Configurazione
|
|
||||||
router_ip = "185.203.24.2"
|
|
||||||
port = 8728
|
|
||||||
username = "admin"
|
|
||||||
password = input(f"Password per {username}@{router_ip}: ")
|
|
||||||
|
|
||||||
# Test 1: Connessione TCP base
|
|
||||||
print(f"\n1️⃣ Test TCP porta {port}...")
|
|
||||||
try:
|
|
||||||
client = httpx.AsyncClient(timeout=5)
|
|
||||||
response = await client.get(f"http://{router_ip}:{port}")
|
|
||||||
print(f" ✅ Porta {port} aperta e risponde")
|
|
||||||
await client.aclose()
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ❌ Porta {port} non raggiungibile: {e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
# Test 2: Endpoint REST /rest/system/identity
|
|
||||||
print(f"\n2️⃣ Test endpoint REST /rest/system/identity...")
|
|
||||||
try:
|
|
||||||
auth = base64.b64encode(f"{username}:{password}".encode()).decode()
|
|
||||||
headers = {
|
|
||||||
"Authorization": f"Basic {auth}",
|
|
||||||
"Content-Type": "application/json"
|
|
||||||
}
|
|
||||||
|
|
||||||
client = httpx.AsyncClient(timeout=10)
|
|
||||||
url = f"http://{router_ip}:{port}/rest/system/identity"
|
|
||||||
print(f" URL: {url}")
|
|
||||||
|
|
||||||
response = await client.get(url, headers=headers)
|
|
||||||
print(f" Status Code: {response.status_code}")
|
|
||||||
print(f" Headers: {dict(response.headers)}")
|
|
||||||
|
|
||||||
if response.status_code == 200:
|
|
||||||
print(f" ✅ Autenticazione OK!")
|
|
||||||
print(f" Risposta: {response.text}")
|
|
||||||
elif response.status_code == 401:
|
|
||||||
print(f" ❌ Credenziali errate (401 Unauthorized)")
|
|
||||||
elif response.status_code == 404:
|
|
||||||
print(f" ❌ Endpoint non trovato (404) - API REST non abilitata?")
|
|
||||||
else:
|
|
||||||
print(f" ⚠️ Status inaspettato: {response.status_code}")
|
|
||||||
print(f" Risposta: {response.text}")
|
|
||||||
|
|
||||||
await client.aclose()
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ❌ Errore richiesta REST: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return
|
|
||||||
|
|
||||||
# Test 3: Endpoint /rest/ip/firewall/address-list
|
|
||||||
print(f"\n3️⃣ Test endpoint address-list...")
|
|
||||||
try:
|
|
||||||
client = httpx.AsyncClient(timeout=10)
|
|
||||||
url = f"http://{router_ip}:{port}/rest/ip/firewall/address-list"
|
|
||||||
|
|
||||||
response = await client.get(url, headers=headers)
|
|
||||||
print(f" Status Code: {response.status_code}")
|
|
||||||
|
|
||||||
if response.status_code == 200:
|
|
||||||
data = response.json()
|
|
||||||
print(f" ✅ Address-list leggibile!")
|
|
||||||
print(f" Totale entries: {len(data)}")
|
|
||||||
if data:
|
|
||||||
print(f" Primo entry: {data[0]}")
|
|
||||||
else:
|
|
||||||
print(f" ⚠️ Status: {response.status_code}")
|
|
||||||
print(f" Risposta: {response.text}")
|
|
||||||
|
|
||||||
await client.aclose()
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ❌ Errore lettura address-list: {e}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
print("="*60)
|
|
||||||
asyncio.run(test_simple())
|
|
||||||
print("\n" + "="*60)
|
|
||||||
148
replit.md
148
replit.md
@ -20,19 +20,17 @@ This project is a full-stack web application for an Intrusion Detection System (
|
|||||||
- Commit message: italiano
|
- Commit message: italiano
|
||||||
|
|
||||||
## System Architecture
|
## System Architecture
|
||||||
The IDS employs a React-based frontend for real-time monitoring, detection visualization, and whitelist management, built with ShadCN UI and TanStack Query. The backend consists of a Python FastAPI service dedicated to ML analysis and a Node.js (Express) backend handling API requests, PostgreSQL database management, and service coordination.
|
The IDS employs a React-based frontend for real-time monitoring, detection visualization, and whitelist management, built with ShadCN UI and TanStack Query. The backend consists of a Python FastAPI service dedicated to ML analysis (Isolation Forest with 25 targeted features), MikroTik API management, and a detection engine that scores anomalies from 0-100 across five risk levels. A Node.js (Express) backend handles API requests from the frontend, manages the PostgreSQL database, and coordinates service operations.
|
||||||
|
|
||||||
**Key Architectural Decisions & Features:**
|
**Key Architectural Decisions & Features:**
|
||||||
- **Log Collection & Processing**: MikroTik syslog data (UDP:514) is parsed by `syslog_parser.py` and stored in PostgreSQL with a 3-day retention policy. The parser includes auto-reconnect and error recovery mechanisms.
|
- **Log Collection & Processing**: MikroTik syslog data (UDP:514) is sent to RSyslog, parsed by `syslog_parser.py`, and stored in PostgreSQL. The parser includes auto-cleanup with a 3-day retention policy.
|
||||||
- **Machine Learning**: An Isolation Forest model (sklearn.IsolectionForest) trained on 25 network log features performs real-time anomaly detection, assigning a risk score (0-100 across five risk levels). A hybrid ML detector (Isolation Forest + Ensemble Classifier with weighted voting) reduces false positives. The system supports weekly automatic retraining of models.
|
- **Machine Learning**: An Isolation Forest model trained on 25 network log features performs real-time anomaly detection, assigning a risk score.
|
||||||
- **Automated Blocking**: Critical IPs (score >= 80) are automatically blocked in parallel across configured MikroTik routers via their REST API. **Auto-unblock on whitelist**: When an IP is added to the whitelist, it is automatically removed from all router blocklists. Manual unblock button available in Detections page.
|
- **Automated Blocking**: Critical IPs (score >= 80) are automatically blocked in parallel across all configured MikroTik routers via their REST API.
|
||||||
- **Public Lists Integration (v2.0.0 - CIDR Complete)**: Automatic fetcher syncs blacklist/whitelist feeds every 10 minutes (Spamhaus, Talos, AWS, GCP, Cloudflare, IANA, NTP Pool). **Full CIDR support** using PostgreSQL INET/CIDR types with `<<=` containment operators for network range matching. Priority-based merge logic: Manual whitelist > Public whitelist > Blacklist (CIDR-aware). Detections created for blacklisted IPs/ranges (excluding whitelisted ranges). CRUD API + UI for list management. See `deployment/docs/PUBLIC_LISTS_V2_CIDR.md` for implementation details.
|
- **Service Monitoring & Management**: A dashboard provides real-time status (green/red indicators) for the ML Backend, Database, and Syslog Parser. Service management (start/stop/restart) for Python services is available via API endpoints, secured with API key authentication and Systemd integration for production-grade control and auto-restart capabilities.
|
||||||
- **Automatic Cleanup**: An hourly systemd timer (`cleanup_detections.py`) removes old detections (48h) and auto-unblocks IPs (2h).
|
- **IP Geolocation**: Integrated `ip-api.com` for enriching detection data with geographical and Autonomous System (AS) information, including intelligent caching.
|
||||||
- **Service Monitoring & Management**: A dashboard provides real-time status (ML Backend, Database, Syslog Parser). API endpoints, secured with API key authentication and Systemd integration, allow for service management (start/stop/restart) of Python services.
|
- **Database Management**: PostgreSQL is used for all persistent data. An intelligent database versioning system ensures efficient SQL migrations, applying only new scripts. Dual-mode database drivers (`@neondatabase/serverless` for Replit, `pg` for AlmaLinux) ensure environment compatibility.
|
||||||
- **IP Geolocation**: Integration with `ip-api.com` enriches detection data with geographical and AS information, utilizing intelligent caching.
|
|
||||||
- **Database Management**: PostgreSQL is used for all persistent data. An intelligent database versioning system ensures efficient SQL migrations (v8 with forced INET/CIDR column types for network range matching). Migration 008 unconditionally recreates INET columns to fix type mismatches. Dual-mode database drivers (`@neondatabase/serverless` for Replit, `pg` for AlmaLinux) ensure environment compatibility.
|
|
||||||
- **Microservices**: Clear separation of concerns between the Python ML backend and the Node.js API backend.
|
- **Microservices**: Clear separation of concerns between the Python ML backend and the Node.js API backend.
|
||||||
- **UI/UX**: Utilizes ShadCN UI for a modern component library and `react-hook-form` with Zod for robust form validation. Analytics dashboards provide visualizations of normal and attack traffic, including real-time and historical data.
|
- **UI/UX**: Utilizes ShadCN UI for a modern component library and `react-hook-form` with Zod for robust form validation.
|
||||||
|
|
||||||
## External Dependencies
|
## External Dependencies
|
||||||
- **React**: Frontend framework.
|
- **React**: Frontend framework.
|
||||||
@ -41,8 +39,7 @@ The IDS employs a React-based frontend for real-time monitoring, detection visua
|
|||||||
- **MikroTik API REST**: For router communication and IP blocking.
|
- **MikroTik API REST**: For router communication and IP blocking.
|
||||||
- **ShadCN UI**: Frontend component library.
|
- **ShadCN UI**: Frontend component library.
|
||||||
- **TanStack Query**: Data fetching for the frontend.
|
- **TanStack Query**: Data fetching for the frontend.
|
||||||
- **Isolation Forest (scikit-learn)**: Machine Learning algorithm for anomaly detection.
|
- **Isolation Forest**: Machine Learning algorithm for anomaly detection.
|
||||||
- **xgboost, joblib**: ML libraries used in the hybrid detector.
|
|
||||||
- **RSyslog**: Log collection daemon.
|
- **RSyslog**: Log collection daemon.
|
||||||
- **Drizzle ORM**: For database schema definition in Node.js.
|
- **Drizzle ORM**: For database schema definition in Node.js.
|
||||||
- **Neon Database**: Cloud-native PostgreSQL service (used in Replit).
|
- **Neon Database**: Cloud-native PostgreSQL service (used in Replit).
|
||||||
@ -50,3 +47,130 @@ The IDS employs a React-based frontend for real-time monitoring, detection visua
|
|||||||
- **psycopg2**: PostgreSQL adapter for Python.
|
- **psycopg2**: PostgreSQL adapter for Python.
|
||||||
- **ip-api.com**: External API for IP geolocation data.
|
- **ip-api.com**: External API for IP geolocation data.
|
||||||
- **Recharts**: Charting library for analytics visualization.
|
- **Recharts**: Charting library for analytics visualization.
|
||||||
|
|
||||||
|
## Recent Updates (Novembre 2025)
|
||||||
|
|
||||||
|
### 🛡️ Syslog Parser Resilience & Monitoring (25 Nov 2025 - 11:00)
|
||||||
|
- **Feature**: Parser resiliente con auto-recovery e monitoring automatico
|
||||||
|
- **Problema Risolto**: Parser si bloccava periodicamente (ultimo: 24 Nov mattina)
|
||||||
|
- **Root Cause**: Database connection timeout, eccezioni non gestite, cleanup bloccante
|
||||||
|
- **Soluzioni Implementate**:
|
||||||
|
1. **Auto-Reconnect**: Riconnessione automatica su DB timeout
|
||||||
|
2. **Error Recovery**: Continue processing dopo eccezioni (non crashare!)
|
||||||
|
3. **Health Check**: Log ogni 5 minuti `[HEALTH] Parser alive: X righe, Y salvate, Z errori`
|
||||||
|
4. **Monitoring Script**: `deployment/check_parser_health.sh` (cron ogni 5 min)
|
||||||
|
5. **Auto-Restart**: Se ultimo log > 5 min fa → restart automatico
|
||||||
|
- **Files Modificati**:
|
||||||
|
- `python_ml/syslog_parser.py` - metodo `reconnect_db()` + try/catch nidificati
|
||||||
|
- `deployment/check_parser_health.sh` - health check con auto-restart
|
||||||
|
- `deployment/setup_parser_monitoring.sh` - setup cron job
|
||||||
|
- `deployment/TROUBLESHOOTING_SYSLOG_PARSER.md` - guida completa
|
||||||
|
- **Timestamp Detection Chiariti**:
|
||||||
|
- `first_seen/last_seen`: timestamp dei log network_logs (es. 18:46:21)
|
||||||
|
- `detected_at`: quando ML backend rileva anomalia (es. 19:45 - 1 ora dopo!)
|
||||||
|
- Il delay è normale: ML backend esegue analisi batch ogni ora
|
||||||
|
- **Deploy**: `./update_from_git.sh` → `sudo systemctl restart ids-syslog-parser` → `sudo ./deployment/setup_parser_monitoring.sh`
|
||||||
|
- **Monitoring**: `tail -f /var/log/ids/parser-health.log`
|
||||||
|
|
||||||
|
### 🔧 Analytics Aggregator Fix - Data Consistency (24 Nov 2025 - 17:00)
|
||||||
|
- **BUG FIX CRITICO**: Risolto mismatch dati Dashboard Live
|
||||||
|
- **Problema**: Distribuzione traffico mostrava 262k attacchi ma breakdown solo 19
|
||||||
|
- **ROOT CAUSE**: Aggregatore contava **occorrenze** invece di **pacchetti** in `attacks_by_type` e `attacks_by_country`
|
||||||
|
- **Soluzione**:
|
||||||
|
1. Spostato conteggio da loop detections → loop pacchetti
|
||||||
|
2. `attacks_by_type[tipo] += packets` (non +1!)
|
||||||
|
3. `attacks_by_country[paese] += packets` (non +1!)
|
||||||
|
4. Fallback "unknown"/"Unknown" per dati mancanti (tipo/geo)
|
||||||
|
5. Logging validazione: verifica breakdown_total == attack_packets
|
||||||
|
- **Invariante matematica**: `Σ(attacks_by_type) == Σ(attacks_by_country) == attack_packets`
|
||||||
|
- **Files modificati**: `python_ml/analytics_aggregator.py`
|
||||||
|
- **Deploy**: Restart ML backend + aggregator run manuale per testare
|
||||||
|
- **Validazione**: Log mostra `match: True` e nessun warning mismatch
|
||||||
|
|
||||||
|
### 📊 Network Analytics & Dashboard System (24 Nov 2025 - 11:30)
|
||||||
|
- **Feature Completa**: Sistema analytics con traffico normale + attacchi, visualizzazioni grafiche avanzate, dati permanenti
|
||||||
|
- **Componenti**:
|
||||||
|
1. **Database**: `network_analytics` table con aggregazioni orarie/giornaliere permanenti
|
||||||
|
2. **Aggregatore Python**: `analytics_aggregator.py` classifica traffico ogni ora
|
||||||
|
3. **Systemd Timer**: Esecuzione automatica ogni ora (:05 minuti)
|
||||||
|
4. **API**: `/api/analytics/recent` e `/api/analytics/range`
|
||||||
|
5. **Frontend**: Dashboard Live (real-time 3 giorni) + Analytics Storici (permanente)
|
||||||
|
- **Grafici**: Area Chart, Pie Chart, Bar Chart, Line Chart, Real-time Stream
|
||||||
|
- **Flag Emoji**: 🇮🇹🇺🇸🇷🇺🇨🇳 per identificazione immediata paese origine
|
||||||
|
- **Deploy**: Migration 005 + `./deployment/setup_analytics_timer.sh`
|
||||||
|
- **Security Fix**: Rimosso hardcoded path, implementato wrapper script sicuro `run_analytics.sh` per esecuzioni manuali
|
||||||
|
- **Production-grade**: Credenziali gestite via systemd EnvironmentFile (automatico) o wrapper script (manuale)
|
||||||
|
- **Frontend Fix**: Analytics History ora usa dati orari (`hourly: true`) finché aggregazione daily non è schedulata
|
||||||
|
|
||||||
|
### 🌍 IP Geolocation Integration (22 Nov 2025 - 13:00)
|
||||||
|
- **Feature**: Informazioni geografiche complete (paese, città, organizzazione, AS) per ogni IP
|
||||||
|
- **API**: ip-api.com con batch async lookup (100 IP in ~1.5s invece di 150s!)
|
||||||
|
- **Performance**: Caching intelligente + fallback robusto
|
||||||
|
- **Display**: Globe/Building/MapPin icons nella pagina Detections
|
||||||
|
- **Deploy**: Migration 004 + restart ML backend
|
||||||
|
|
||||||
|
### 🤖 Hybrid ML Detector - False Positive Reduction System (24 Nov 2025)
|
||||||
|
- **Obiettivo**: Riduzione falsi positivi 80-90% mantenendo alta detection accuracy
|
||||||
|
- **Architettura**:
|
||||||
|
1. **Isolation Forest (sklearn)**: n_estimators=250, contamination=0.03 (tuning scientifico)
|
||||||
|
2. **Feature Selection**: Chi-Square test riduce 25→18 feature più rilevanti
|
||||||
|
3. **Ensemble Classifier**: DT + RF + XGBoost con voting ponderato (1:2:2)
|
||||||
|
4. **Confidence Scoring**: 3-tier system (High≥95%, Medium≥70%, Low<70%)
|
||||||
|
5. **Validation Framework**: CICIDS2017 dataset con Precision/Recall/F1/FPR metrics
|
||||||
|
- **Componenti**:
|
||||||
|
- `python_ml/ml_hybrid_detector.py` - Core detector con IF + ensemble + feature selection
|
||||||
|
- `python_ml/dataset_loader.py` - CICIDS2017 loader con mappatura 80→25 features
|
||||||
|
- `python_ml/validation_metrics.py` - Production-grade metrics calculator
|
||||||
|
- `python_ml/train_hybrid.py` - CLI training script (test/train/validate)
|
||||||
|
- **Dipendenze ML**: xgboost==2.0.3, joblib==1.3.2, scikit-learn==1.3.2
|
||||||
|
- **Backward Compatibility**: USE_HYBRID_DETECTOR env var (default=true)
|
||||||
|
- **Target Metrics**: Precision≥90%, Recall≥80%, FPR≤5%, F1≥85%
|
||||||
|
- **Deploy**: Vedere `deployment/CHECKLIST_ML_HYBRID.md`
|
||||||
|
|
||||||
|
#### 🎯 Decisione Architetturale - sklearn.IsolationForest (24 Nov 2025 - 22:00)
|
||||||
|
- **Problema Deploy**: eif==2.0.2 incompatibile con Python 3.11 (richiede distutils rimosso, API Cython obsolete, fermo dal 2021)
|
||||||
|
- **Tentativi falliti** (1+ ora bloccati): Build isolation flags, Cython pre-install, PIP_NO_BUILD_ISOLATION, Python downgrade consideration
|
||||||
|
- **Analisi Architect**:
|
||||||
|
- Extended IF (eif) NON supporta Python ≥3.11 (incompatibilità fondamentale C++/Cython)
|
||||||
|
- Downgrade Python 3.10 = ricreare venv + 50 dipendenze (rischio regressioni, EOL 2026)
|
||||||
|
- PyOD NON ha Extended IF (solo standard IF wrapper sklearn - fonte verificata)
|
||||||
|
- **Codice aveva GIÀ fallback funzionante** a `sklearn.ensemble.IsolationForest`!
|
||||||
|
- **DECISIONE FINALE**: Usare sklearn.IsolationForest (fallback pre-esistente)
|
||||||
|
- ✅ Compatibile Python 3.11+ (wheels pre-compilati, zero compilazione)
|
||||||
|
- ✅ **ZERO modifica codice** (fallback già implementato con flag EIF_AVAILABLE)
|
||||||
|
- ✅ Target metrics raggiungibili con IF standard + ensemble + feature selection
|
||||||
|
- ✅ Production-grade, libreria scikit-learn mantenuta e stabile
|
||||||
|
- ✅ Installazione semplificata: `pip install xgboost joblib` (2 step invece di 4!)
|
||||||
|
- **Files modificati**:
|
||||||
|
- `requirements.txt`: Rimosso `eif==2.0.2` e `Cython==3.0.5` (non più necessari)
|
||||||
|
- `deployment/install_ml_deps.sh`: Semplificato da 4 a 2 step, nessuna compilazione
|
||||||
|
- `deployment/CHECKLIST_ML_HYBRID.md`: Aggiornato con nuove istruzioni semplificate
|
||||||
|
|
||||||
|
### 🔄 Database Schema Adaptation & Auto-Training (24 Nov 2025 - 23:30)
|
||||||
|
- **Database Schema Fix**: Adattato ML detector allo schema reale `network_logs`
|
||||||
|
- Query SQL corretta: `destination_ip` (non `dest_ip`), `destination_port` (non `dest_port`)
|
||||||
|
- Feature extraction: supporto `packet_length` invece di `packets`/`bytes` separati
|
||||||
|
- Backward compatible: funziona sia con schema MikroTik che dataset CICIDS2017
|
||||||
|
- **Training Automatico Settimanale**:
|
||||||
|
- Script wrapper: `deployment/run_ml_training.sh` (carica credenziali da .env)
|
||||||
|
- Systemd service: `ids-ml-training.service`
|
||||||
|
- Systemd timer: `ids-ml-training.timer` (ogni Lunedì 03:00 AM)
|
||||||
|
- Setup automatico: `./deployment/setup_ml_training_timer.sh`
|
||||||
|
- Log persistenti: `/var/log/ids/ml-training.log`
|
||||||
|
- **Workflow Completo**:
|
||||||
|
1. Timer systemd esegue training settimanale automatico
|
||||||
|
2. Script carica ultimi 7 giorni di traffico dal database (234M+ records)
|
||||||
|
3. Training Hybrid ML (IF + Ensemble + Feature Selection)
|
||||||
|
4. Modelli salvati in `python_ml/models/`
|
||||||
|
5. ML backend li carica automaticamente al prossimo riavvio
|
||||||
|
- **Files creati**:
|
||||||
|
- `deployment/run_ml_training.sh` - Wrapper sicuro per training
|
||||||
|
- `deployment/train_hybrid_production.sh` - Script training manuale completo
|
||||||
|
- `deployment/systemd/ids-ml-training.service` - Service systemd
|
||||||
|
- `deployment/systemd/ids-ml-training.timer` - Timer settimanale
|
||||||
|
- `deployment/setup_ml_training_timer.sh` - Setup automatico
|
||||||
|
- **Files modificati**:
|
||||||
|
- `python_ml/train_hybrid.py` - Query SQL adattata allo schema DB reale
|
||||||
|
- `python_ml/ml_hybrid_detector.py` - Supporto `packet_length`, backward compatible
|
||||||
|
- `python_ml/dataset_loader.py` - Fix timestamp mancante in dataset sintetico
|
||||||
|
- **Impatto**: Sistema userà automaticamente sklearn IF tramite fallback, tutti gli 8 checkpoint fail-fast funzionano identicamente
|
||||||
318
server/routes.ts
318
server/routes.ts
@ -1,9 +1,9 @@
|
|||||||
import type { Express } from "express";
|
import type { Express } from "express";
|
||||||
import { createServer, type Server } from "http";
|
import { createServer, type Server } from "http";
|
||||||
import { storage } from "./storage";
|
import { storage } from "./storage";
|
||||||
import { insertRouterSchema, insertDetectionSchema, insertWhitelistSchema, insertPublicListSchema, networkAnalytics, routers } from "@shared/schema";
|
import { insertRouterSchema, insertDetectionSchema, insertWhitelistSchema, networkAnalytics } from "@shared/schema";
|
||||||
import { db } from "./db";
|
import { db } from "./db";
|
||||||
import { desc, eq } from "drizzle-orm";
|
import { desc } from "drizzle-orm";
|
||||||
|
|
||||||
export async function registerRoutes(app: Express): Promise<Server> {
|
export async function registerRoutes(app: Express): Promise<Server> {
|
||||||
// Routers
|
// Routers
|
||||||
@ -27,20 +27,6 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
app.put("/api/routers/:id", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const validatedData = insertRouterSchema.parse(req.body);
|
|
||||||
const router = await storage.updateRouter(req.params.id, validatedData);
|
|
||||||
if (!router) {
|
|
||||||
return res.status(404).json({ error: "Router not found" });
|
|
||||||
}
|
|
||||||
res.json(router);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Router UPDATE] Error:', error);
|
|
||||||
res.status(400).json({ error: "Invalid router data" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.delete("/api/routers/:id", async (req, res) => {
|
app.delete("/api/routers/:id", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const success = await storage.deleteRouter(req.params.id);
|
const success = await storage.deleteRouter(req.params.id);
|
||||||
@ -77,22 +63,9 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
// Detections
|
// Detections
|
||||||
app.get("/api/detections", async (req, res) => {
|
app.get("/api/detections", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const limit = req.query.limit ? parseInt(req.query.limit as string) : 50;
|
const limit = parseInt(req.query.limit as string) || 100;
|
||||||
const offset = req.query.offset ? parseInt(req.query.offset as string) : 0;
|
const detections = await storage.getAllDetections(limit);
|
||||||
const anomalyType = req.query.anomalyType as string | undefined;
|
res.json(detections);
|
||||||
const minScore = req.query.minScore ? parseFloat(req.query.minScore as string) : undefined;
|
|
||||||
const maxScore = req.query.maxScore ? parseFloat(req.query.maxScore as string) : undefined;
|
|
||||||
const search = req.query.search as string | undefined;
|
|
||||||
|
|
||||||
const result = await storage.getAllDetections({
|
|
||||||
limit,
|
|
||||||
offset,
|
|
||||||
anomalyType,
|
|
||||||
minScore,
|
|
||||||
maxScore,
|
|
||||||
search
|
|
||||||
});
|
|
||||||
res.json(result);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('[DB ERROR] Failed to fetch detections:', error);
|
console.error('[DB ERROR] Failed to fetch detections:', error);
|
||||||
res.status(500).json({ error: "Failed to fetch detections" });
|
res.status(500).json({ error: "Failed to fetch detections" });
|
||||||
@ -134,74 +107,12 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
try {
|
try {
|
||||||
const validatedData = insertWhitelistSchema.parse(req.body);
|
const validatedData = insertWhitelistSchema.parse(req.body);
|
||||||
const item = await storage.createWhitelist(validatedData);
|
const item = await storage.createWhitelist(validatedData);
|
||||||
|
|
||||||
// Auto-unblock from routers when adding to whitelist
|
|
||||||
const mlBackendUrl = process.env.ML_BACKEND_URL || 'http://localhost:8000';
|
|
||||||
const mlApiKey = process.env.IDS_API_KEY;
|
|
||||||
try {
|
|
||||||
const headers: Record<string, string> = { 'Content-Type': 'application/json' };
|
|
||||||
if (mlApiKey) {
|
|
||||||
headers['X-API-Key'] = mlApiKey;
|
|
||||||
}
|
|
||||||
const unblockResponse = await fetch(`${mlBackendUrl}/unblock-ip`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers,
|
|
||||||
body: JSON.stringify({ ip_address: validatedData.ipAddress })
|
|
||||||
});
|
|
||||||
if (unblockResponse.ok) {
|
|
||||||
const result = await unblockResponse.json();
|
|
||||||
console.log(`[WHITELIST] Auto-unblocked ${validatedData.ipAddress} from ${result.unblocked_from} routers`);
|
|
||||||
} else {
|
|
||||||
console.warn(`[WHITELIST] Failed to auto-unblock ${validatedData.ipAddress}: ${unblockResponse.status}`);
|
|
||||||
}
|
|
||||||
} catch (unblockError) {
|
|
||||||
// Don't fail if ML backend is unavailable
|
|
||||||
console.warn(`[WHITELIST] ML backend unavailable for auto-unblock: ${unblockError}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
res.json(item);
|
res.json(item);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
res.status(400).json({ error: "Invalid whitelist data" });
|
res.status(400).json({ error: "Invalid whitelist data" });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Unblock IP from all routers (proxy to ML backend)
|
|
||||||
app.post("/api/unblock-ip", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const { ipAddress, listName = "ddos_blocked" } = req.body;
|
|
||||||
|
|
||||||
if (!ipAddress) {
|
|
||||||
return res.status(400).json({ error: "IP address is required" });
|
|
||||||
}
|
|
||||||
|
|
||||||
const mlBackendUrl = process.env.ML_BACKEND_URL || 'http://localhost:8000';
|
|
||||||
const mlApiKey = process.env.IDS_API_KEY;
|
|
||||||
const headers: Record<string, string> = { 'Content-Type': 'application/json' };
|
|
||||||
if (mlApiKey) {
|
|
||||||
headers['X-API-Key'] = mlApiKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = await fetch(`${mlBackendUrl}/unblock-ip`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers,
|
|
||||||
body: JSON.stringify({ ip_address: ipAddress, list_name: listName })
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
const errorText = await response.text();
|
|
||||||
console.error(`[UNBLOCK] ML backend error for ${ipAddress}: ${response.status} - ${errorText}`);
|
|
||||||
return res.status(response.status).json({ error: errorText || "Failed to unblock IP" });
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await response.json();
|
|
||||||
console.log(`[UNBLOCK] Successfully unblocked ${ipAddress} from ${result.unblocked_from || 0} routers`);
|
|
||||||
res.json(result);
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error('[UNBLOCK] Error:', error);
|
|
||||||
res.status(500).json({ error: error.message || "Failed to unblock IP from routers" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.delete("/api/whitelist/:id", async (req, res) => {
|
app.delete("/api/whitelist/:id", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const success = await storage.deleteWhitelist(req.params.id);
|
const success = await storage.deleteWhitelist(req.params.id);
|
||||||
@ -214,214 +125,6 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Public Lists
|
|
||||||
app.get("/api/public-lists", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const lists = await storage.getAllPublicLists();
|
|
||||||
res.json(lists);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[DB ERROR] Failed to fetch public lists:', error);
|
|
||||||
res.status(500).json({ error: "Failed to fetch public lists" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get("/api/public-lists/:id", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const list = await storage.getPublicListById(req.params.id);
|
|
||||||
if (!list) {
|
|
||||||
return res.status(404).json({ error: "List not found" });
|
|
||||||
}
|
|
||||||
res.json(list);
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ error: "Failed to fetch list" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.post("/api/public-lists", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const validatedData = insertPublicListSchema.parse(req.body);
|
|
||||||
const list = await storage.createPublicList(validatedData);
|
|
||||||
res.json(list);
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error('[API ERROR] Failed to create public list:', error);
|
|
||||||
if (error.name === 'ZodError') {
|
|
||||||
return res.status(400).json({ error: "Invalid list data", details: error.errors });
|
|
||||||
}
|
|
||||||
res.status(400).json({ error: "Invalid list data" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.patch("/api/public-lists/:id", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const validatedData = insertPublicListSchema.partial().parse(req.body);
|
|
||||||
const list = await storage.updatePublicList(req.params.id, validatedData);
|
|
||||||
if (!list) {
|
|
||||||
return res.status(404).json({ error: "List not found" });
|
|
||||||
}
|
|
||||||
res.json(list);
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error('[API ERROR] Failed to update public list:', error);
|
|
||||||
if (error.name === 'ZodError') {
|
|
||||||
return res.status(400).json({ error: "Invalid list data", details: error.errors });
|
|
||||||
}
|
|
||||||
res.status(400).json({ error: "Invalid list data" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.delete("/api/public-lists/:id", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const success = await storage.deletePublicList(req.params.id);
|
|
||||||
if (!success) {
|
|
||||||
return res.status(404).json({ error: "List not found" });
|
|
||||||
}
|
|
||||||
res.json({ success: true });
|
|
||||||
} catch (error) {
|
|
||||||
res.status(500).json({ error: "Failed to delete list" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.post("/api/public-lists/:id/sync", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const list = await storage.getPublicListById(req.params.id);
|
|
||||||
if (!list) {
|
|
||||||
return res.status(404).json({ error: "List not found" });
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`[SYNC] Starting sync for list: ${list.name} (${list.url})`);
|
|
||||||
|
|
||||||
// Fetch the list from URL
|
|
||||||
const response = await fetch(list.url, {
|
|
||||||
headers: {
|
|
||||||
'User-Agent': 'IDS-MikroTik-PublicListFetcher/2.0',
|
|
||||||
'Accept': 'application/json, text/plain, */*',
|
|
||||||
},
|
|
||||||
signal: AbortSignal.timeout(30000),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const contentType = response.headers.get('content-type') || '';
|
|
||||||
const text = await response.text();
|
|
||||||
|
|
||||||
// Parse IPs based on content type
|
|
||||||
let ips: Array<{ip: string, cidr?: string}> = [];
|
|
||||||
|
|
||||||
if (contentType.includes('json') || list.url.endsWith('.json')) {
|
|
||||||
// JSON format (Spamhaus DROP v4 JSON)
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(text);
|
|
||||||
if (Array.isArray(data)) {
|
|
||||||
for (const entry of data) {
|
|
||||||
if (entry.cidr) {
|
|
||||||
const [ip] = entry.cidr.split('/');
|
|
||||||
ips.push({ ip, cidr: entry.cidr });
|
|
||||||
} else if (entry.ip) {
|
|
||||||
ips.push({ ip: entry.ip, cidr: null as any });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error('[SYNC] Failed to parse JSON:', e);
|
|
||||||
throw new Error('Invalid JSON format');
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Plain text format (one IP/CIDR per line)
|
|
||||||
const lines = text.split('\n');
|
|
||||||
for (const line of lines) {
|
|
||||||
const trimmed = line.trim();
|
|
||||||
if (!trimmed || trimmed.startsWith('#') || trimmed.startsWith(';')) continue;
|
|
||||||
|
|
||||||
// Extract IP/CIDR from line
|
|
||||||
const match = trimmed.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/\d{1,2})?/);
|
|
||||||
if (match) {
|
|
||||||
const ip = match[1];
|
|
||||||
const cidr = match[2] ? `${match[1]}${match[2]}` : null;
|
|
||||||
ips.push({ ip, cidr: cidr as any });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`[SYNC] Parsed ${ips.length} IPs from ${list.name}`);
|
|
||||||
|
|
||||||
// Save IPs to database
|
|
||||||
let added = 0;
|
|
||||||
let updated = 0;
|
|
||||||
|
|
||||||
for (const { ip, cidr } of ips) {
|
|
||||||
const result = await storage.upsertBlacklistIp(list.id, ip, cidr);
|
|
||||||
if (result.created) added++;
|
|
||||||
else updated++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update list stats
|
|
||||||
await storage.updatePublicList(list.id, {
|
|
||||||
lastFetch: new Date(),
|
|
||||||
lastSuccess: new Date(),
|
|
||||||
totalIps: ips.length,
|
|
||||||
activeIps: ips.length,
|
|
||||||
errorCount: 0,
|
|
||||||
lastError: null,
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(`[SYNC] Completed: ${added} added, ${updated} updated for ${list.name}`);
|
|
||||||
|
|
||||||
res.json({
|
|
||||||
success: true,
|
|
||||||
message: `Sync completed: ${ips.length} IPs processed`,
|
|
||||||
added,
|
|
||||||
updated,
|
|
||||||
total: ips.length,
|
|
||||||
});
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error('[API ERROR] Failed to sync:', error);
|
|
||||||
|
|
||||||
// Update error count
|
|
||||||
const list = await storage.getPublicListById(req.params.id);
|
|
||||||
if (list) {
|
|
||||||
await storage.updatePublicList(req.params.id, {
|
|
||||||
errorCount: (list.errorCount || 0) + 1,
|
|
||||||
lastError: error.message,
|
|
||||||
lastFetch: new Date(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
res.status(500).json({ error: `Sync failed: ${error.message}` });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Public Blacklist IPs
|
|
||||||
app.get("/api/public-blacklist", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const limit = parseInt(req.query.limit as string) || 1000;
|
|
||||||
const listId = req.query.listId as string | undefined;
|
|
||||||
const ipAddress = req.query.ipAddress as string | undefined;
|
|
||||||
const isActive = req.query.isActive === 'true';
|
|
||||||
|
|
||||||
const ips = await storage.getPublicBlacklistIps({
|
|
||||||
limit,
|
|
||||||
listId,
|
|
||||||
ipAddress,
|
|
||||||
isActive: req.query.isActive !== undefined ? isActive : undefined,
|
|
||||||
});
|
|
||||||
res.json(ips);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[DB ERROR] Failed to fetch blacklist IPs:', error);
|
|
||||||
res.status(500).json({ error: "Failed to fetch blacklist IPs" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get("/api/public-blacklist/stats", async (req, res) => {
|
|
||||||
try {
|
|
||||||
const stats = await storage.getPublicBlacklistStats();
|
|
||||||
res.json(stats);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[DB ERROR] Failed to fetch blacklist stats:', error);
|
|
||||||
res.status(500).json({ error: "Failed to fetch stats" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Training History
|
// Training History
|
||||||
app.get("/api/training-history", async (req, res) => {
|
app.get("/api/training-history", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
@ -478,15 +181,14 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
app.get("/api/stats", async (req, res) => {
|
app.get("/api/stats", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const routers = await storage.getAllRouters();
|
const routers = await storage.getAllRouters();
|
||||||
const detectionsResult = await storage.getAllDetections({ limit: 1000 });
|
const detections = await storage.getAllDetections(1000);
|
||||||
const recentLogs = await storage.getRecentLogs(1000);
|
const recentLogs = await storage.getRecentLogs(1000);
|
||||||
const whitelist = await storage.getAllWhitelist();
|
const whitelist = await storage.getAllWhitelist();
|
||||||
const latestTraining = await storage.getLatestTraining();
|
const latestTraining = await storage.getLatestTraining();
|
||||||
|
|
||||||
const detectionsList = detectionsResult.detections;
|
const blockedCount = detections.filter(d => d.blocked).length;
|
||||||
const blockedCount = detectionsList.filter(d => d.blocked).length;
|
const criticalCount = detections.filter(d => parseFloat(d.riskScore) >= 85).length;
|
||||||
const criticalCount = detectionsList.filter(d => parseFloat(d.riskScore) >= 85).length;
|
const highCount = detections.filter(d => parseFloat(d.riskScore) >= 70 && parseFloat(d.riskScore) < 85).length;
|
||||||
const highCount = detectionsList.filter(d => parseFloat(d.riskScore) >= 70 && parseFloat(d.riskScore) < 85).length;
|
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
routers: {
|
routers: {
|
||||||
@ -494,7 +196,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
|||||||
enabled: routers.filter(r => r.enabled).length
|
enabled: routers.filter(r => r.enabled).length
|
||||||
},
|
},
|
||||||
detections: {
|
detections: {
|
||||||
total: detectionsResult.total,
|
total: detections.length,
|
||||||
blocked: blockedCount,
|
blocked: blockedCount,
|
||||||
critical: criticalCount,
|
critical: criticalCount,
|
||||||
high: highCount
|
high: highCount
|
||||||
|
|||||||
@ -5,8 +5,6 @@ import {
|
|||||||
whitelist,
|
whitelist,
|
||||||
trainingHistory,
|
trainingHistory,
|
||||||
networkAnalytics,
|
networkAnalytics,
|
||||||
publicLists,
|
|
||||||
publicBlacklistIps,
|
|
||||||
type Router,
|
type Router,
|
||||||
type InsertRouter,
|
type InsertRouter,
|
||||||
type NetworkLog,
|
type NetworkLog,
|
||||||
@ -18,10 +16,6 @@ import {
|
|||||||
type TrainingHistory,
|
type TrainingHistory,
|
||||||
type InsertTrainingHistory,
|
type InsertTrainingHistory,
|
||||||
type NetworkAnalytics,
|
type NetworkAnalytics,
|
||||||
type PublicList,
|
|
||||||
type InsertPublicList,
|
|
||||||
type PublicBlacklistIp,
|
|
||||||
type InsertPublicBlacklistIp,
|
|
||||||
} from "@shared/schema";
|
} from "@shared/schema";
|
||||||
import { db } from "./db";
|
import { db } from "./db";
|
||||||
import { eq, desc, and, gte, sql, inArray } from "drizzle-orm";
|
import { eq, desc, and, gte, sql, inArray } from "drizzle-orm";
|
||||||
@ -41,14 +35,7 @@ export interface IStorage {
|
|||||||
getLogsForTraining(limit: number, minTimestamp?: Date): Promise<NetworkLog[]>;
|
getLogsForTraining(limit: number, minTimestamp?: Date): Promise<NetworkLog[]>;
|
||||||
|
|
||||||
// Detections
|
// Detections
|
||||||
getAllDetections(options: {
|
getAllDetections(limit: number): Promise<Detection[]>;
|
||||||
limit?: number;
|
|
||||||
offset?: number;
|
|
||||||
anomalyType?: string;
|
|
||||||
minScore?: number;
|
|
||||||
maxScore?: number;
|
|
||||||
search?: string;
|
|
||||||
}): Promise<{ detections: Detection[]; total: number }>;
|
|
||||||
getDetectionByIp(sourceIp: string): Promise<Detection | undefined>;
|
getDetectionByIp(sourceIp: string): Promise<Detection | undefined>;
|
||||||
createDetection(detection: InsertDetection): Promise<Detection>;
|
createDetection(detection: InsertDetection): Promise<Detection>;
|
||||||
updateDetection(id: string, detection: Partial<InsertDetection>): Promise<Detection | undefined>;
|
updateDetection(id: string, detection: Partial<InsertDetection>): Promise<Detection | undefined>;
|
||||||
@ -82,27 +69,6 @@ export interface IStorage {
|
|||||||
recentDetections: Detection[];
|
recentDetections: Detection[];
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
// Public Lists
|
|
||||||
getAllPublicLists(): Promise<PublicList[]>;
|
|
||||||
getPublicListById(id: string): Promise<PublicList | undefined>;
|
|
||||||
createPublicList(list: InsertPublicList): Promise<PublicList>;
|
|
||||||
updatePublicList(id: string, list: Partial<InsertPublicList>): Promise<PublicList | undefined>;
|
|
||||||
deletePublicList(id: string): Promise<boolean>;
|
|
||||||
|
|
||||||
// Public Blacklist IPs
|
|
||||||
getPublicBlacklistIps(options: {
|
|
||||||
limit?: number;
|
|
||||||
listId?: string;
|
|
||||||
ipAddress?: string;
|
|
||||||
isActive?: boolean;
|
|
||||||
}): Promise<PublicBlacklistIp[]>;
|
|
||||||
getPublicBlacklistStats(): Promise<{
|
|
||||||
totalLists: number;
|
|
||||||
totalIps: number;
|
|
||||||
overlapWithDetections: number;
|
|
||||||
}>;
|
|
||||||
upsertBlacklistIp(listId: string, ipAddress: string, cidrRange: string | null): Promise<{created: boolean}>;
|
|
||||||
|
|
||||||
// System
|
// System
|
||||||
testConnection(): Promise<boolean>;
|
testConnection(): Promise<boolean>;
|
||||||
}
|
}
|
||||||
@ -174,62 +140,12 @@ export class DatabaseStorage implements IStorage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Detections
|
// Detections
|
||||||
async getAllDetections(options: {
|
async getAllDetections(limit: number): Promise<Detection[]> {
|
||||||
limit?: number;
|
return await db
|
||||||
offset?: number;
|
|
||||||
anomalyType?: string;
|
|
||||||
minScore?: number;
|
|
||||||
maxScore?: number;
|
|
||||||
search?: string;
|
|
||||||
}): Promise<{ detections: Detection[]; total: number }> {
|
|
||||||
const { limit = 50, offset = 0, anomalyType, minScore, maxScore, search } = options;
|
|
||||||
|
|
||||||
// Build WHERE conditions
|
|
||||||
const conditions = [];
|
|
||||||
|
|
||||||
if (anomalyType) {
|
|
||||||
conditions.push(eq(detections.anomalyType, anomalyType));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cast riskScore to numeric for proper comparison (stored as text in DB)
|
|
||||||
if (minScore !== undefined) {
|
|
||||||
conditions.push(sql`${detections.riskScore}::numeric >= ${minScore}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (maxScore !== undefined) {
|
|
||||||
conditions.push(sql`${detections.riskScore}::numeric <= ${maxScore}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Search by IP or anomaly type (case-insensitive)
|
|
||||||
if (search && search.trim()) {
|
|
||||||
const searchLower = search.trim().toLowerCase();
|
|
||||||
conditions.push(sql`(
|
|
||||||
LOWER(${detections.sourceIp}) LIKE ${'%' + searchLower + '%'} OR
|
|
||||||
LOWER(${detections.anomalyType}) LIKE ${'%' + searchLower + '%'} OR
|
|
||||||
LOWER(COALESCE(${detections.country}, '')) LIKE ${'%' + searchLower + '%'} OR
|
|
||||||
LOWER(COALESCE(${detections.organization}, '')) LIKE ${'%' + searchLower + '%'}
|
|
||||||
)`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const whereClause = conditions.length > 0 ? and(...conditions) : undefined;
|
|
||||||
|
|
||||||
// Get total count for pagination
|
|
||||||
const countResult = await db
|
|
||||||
.select({ count: sql<number>`count(*)::int` })
|
|
||||||
.from(detections)
|
|
||||||
.where(whereClause);
|
|
||||||
const total = countResult[0]?.count || 0;
|
|
||||||
|
|
||||||
// Get paginated results
|
|
||||||
const results = await db
|
|
||||||
.select()
|
.select()
|
||||||
.from(detections)
|
.from(detections)
|
||||||
.where(whereClause)
|
|
||||||
.orderBy(desc(detections.detectedAt))
|
.orderBy(desc(detections.detectedAt))
|
||||||
.limit(limit)
|
.limit(limit);
|
||||||
.offset(offset);
|
|
||||||
|
|
||||||
return { detections: results, total };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getDetectionByIp(sourceIp: string): Promise<Detection | undefined> {
|
async getDetectionByIp(sourceIp: string): Promise<Detection | undefined> {
|
||||||
@ -437,150 +353,6 @@ export class DatabaseStorage implements IStorage {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Public Lists
|
|
||||||
async getAllPublicLists(): Promise<PublicList[]> {
|
|
||||||
return await db.select().from(publicLists).orderBy(desc(publicLists.createdAt));
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPublicListById(id: string): Promise<PublicList | undefined> {
|
|
||||||
const [list] = await db.select().from(publicLists).where(eq(publicLists.id, id));
|
|
||||||
return list || undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
async createPublicList(insertList: InsertPublicList): Promise<PublicList> {
|
|
||||||
const [list] = await db.insert(publicLists).values(insertList).returning();
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
async updatePublicList(id: string, updateData: Partial<InsertPublicList>): Promise<PublicList | undefined> {
|
|
||||||
const [list] = await db
|
|
||||||
.update(publicLists)
|
|
||||||
.set(updateData)
|
|
||||||
.where(eq(publicLists.id, id))
|
|
||||||
.returning();
|
|
||||||
return list || undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
async deletePublicList(id: string): Promise<boolean> {
|
|
||||||
const result = await db.delete(publicLists).where(eq(publicLists.id, id));
|
|
||||||
return result.rowCount !== null && result.rowCount > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Public Blacklist IPs
|
|
||||||
async getPublicBlacklistIps(options: {
|
|
||||||
limit?: number;
|
|
||||||
listId?: string;
|
|
||||||
ipAddress?: string;
|
|
||||||
isActive?: boolean;
|
|
||||||
}): Promise<PublicBlacklistIp[]> {
|
|
||||||
const { limit = 1000, listId, ipAddress, isActive } = options;
|
|
||||||
|
|
||||||
const conditions = [];
|
|
||||||
|
|
||||||
if (listId) {
|
|
||||||
conditions.push(eq(publicBlacklistIps.listId, listId));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ipAddress) {
|
|
||||||
conditions.push(eq(publicBlacklistIps.ipAddress, ipAddress));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isActive !== undefined) {
|
|
||||||
conditions.push(eq(publicBlacklistIps.isActive, isActive));
|
|
||||||
}
|
|
||||||
|
|
||||||
const query = db
|
|
||||||
.select()
|
|
||||||
.from(publicBlacklistIps)
|
|
||||||
.orderBy(desc(publicBlacklistIps.lastSeen))
|
|
||||||
.limit(limit);
|
|
||||||
|
|
||||||
if (conditions.length > 0) {
|
|
||||||
return await query.where(and(...conditions));
|
|
||||||
}
|
|
||||||
|
|
||||||
return await query;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPublicBlacklistStats(): Promise<{
|
|
||||||
totalLists: number;
|
|
||||||
totalIps: number;
|
|
||||||
overlapWithDetections: number;
|
|
||||||
}> {
|
|
||||||
const lists = await db.select().from(publicLists).where(eq(publicLists.type, 'blacklist'));
|
|
||||||
const totalLists = lists.length;
|
|
||||||
|
|
||||||
const [{ count: totalIps }] = await db
|
|
||||||
.select({ count: sql<number>`count(*)::int` })
|
|
||||||
.from(publicBlacklistIps)
|
|
||||||
.where(eq(publicBlacklistIps.isActive, true));
|
|
||||||
|
|
||||||
const [{ count: overlapWithDetections }] = await db
|
|
||||||
.select({ count: sql<number>`count(distinct ${detections.sourceIp})::int` })
|
|
||||||
.from(detections)
|
|
||||||
.innerJoin(publicBlacklistIps, eq(detections.sourceIp, publicBlacklistIps.ipAddress))
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(publicBlacklistIps.isActive, true),
|
|
||||||
eq(detections.detectionSource, 'public_blacklist'),
|
|
||||||
sql`NOT EXISTS (
|
|
||||||
SELECT 1 FROM ${whitelist}
|
|
||||||
WHERE ${whitelist.ipAddress} = ${detections.sourceIp}
|
|
||||||
AND ${whitelist.active} = true
|
|
||||||
)`
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
totalLists,
|
|
||||||
totalIps: totalIps || 0,
|
|
||||||
overlapWithDetections: overlapWithDetections || 0,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async upsertBlacklistIp(listId: string, ipAddress: string, cidrRange: string | null): Promise<{created: boolean}> {
|
|
||||||
try {
|
|
||||||
const existing = await db
|
|
||||||
.select()
|
|
||||||
.from(publicBlacklistIps)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(publicBlacklistIps.listId, listId),
|
|
||||||
eq(publicBlacklistIps.ipAddress, ipAddress)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
if (existing.length > 0) {
|
|
||||||
await db
|
|
||||||
.update(publicBlacklistIps)
|
|
||||||
.set({
|
|
||||||
lastSeen: new Date(),
|
|
||||||
isActive: true,
|
|
||||||
cidrRange: cidrRange,
|
|
||||||
ipInet: ipAddress,
|
|
||||||
cidrInet: cidrRange || `${ipAddress}/32`,
|
|
||||||
})
|
|
||||||
.where(eq(publicBlacklistIps.id, existing[0].id));
|
|
||||||
return { created: false };
|
|
||||||
} else {
|
|
||||||
await db.insert(publicBlacklistIps).values({
|
|
||||||
listId,
|
|
||||||
ipAddress,
|
|
||||||
cidrRange,
|
|
||||||
ipInet: ipAddress,
|
|
||||||
cidrInet: cidrRange || `${ipAddress}/32`,
|
|
||||||
isActive: true,
|
|
||||||
firstSeen: new Date(),
|
|
||||||
lastSeen: new Date(),
|
|
||||||
});
|
|
||||||
return { created: true };
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[DB ERROR] Failed to upsert blacklist IP:', error);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async testConnection(): Promise<boolean> {
|
async testConnection(): Promise<boolean> {
|
||||||
try {
|
try {
|
||||||
await db.execute(sql`SELECT 1`);
|
await db.execute(sql`SELECT 1`);
|
||||||
|
|||||||
100
shared/schema.ts
100
shared/schema.ts
@ -8,7 +8,7 @@ export const routers = pgTable("routers", {
|
|||||||
id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
|
id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
|
||||||
name: text("name").notNull(),
|
name: text("name").notNull(),
|
||||||
ipAddress: text("ip_address").notNull().unique(),
|
ipAddress: text("ip_address").notNull().unique(),
|
||||||
apiPort: integer("api_port").notNull().default(8729),
|
apiPort: integer("api_port").notNull().default(8728),
|
||||||
username: text("username").notNull(),
|
username: text("username").notNull(),
|
||||||
password: text("password").notNull(),
|
password: text("password").notNull(),
|
||||||
enabled: boolean("enabled").notNull().default(true),
|
enabled: boolean("enabled").notNull().default(true),
|
||||||
@ -58,35 +58,23 @@ export const detections = pgTable("detections", {
|
|||||||
asNumber: text("as_number"),
|
asNumber: text("as_number"),
|
||||||
asName: text("as_name"),
|
asName: text("as_name"),
|
||||||
isp: text("isp"),
|
isp: text("isp"),
|
||||||
// Public lists integration
|
|
||||||
detectionSource: text("detection_source").notNull().default("ml_model"),
|
|
||||||
blacklistId: varchar("blacklist_id").references(() => publicBlacklistIps.id, { onDelete: 'set null' }),
|
|
||||||
}, (table) => ({
|
}, (table) => ({
|
||||||
sourceIpIdx: index("detection_source_ip_idx").on(table.sourceIp),
|
sourceIpIdx: index("detection_source_ip_idx").on(table.sourceIp),
|
||||||
riskScoreIdx: index("risk_score_idx").on(table.riskScore),
|
riskScoreIdx: index("risk_score_idx").on(table.riskScore),
|
||||||
detectedAtIdx: index("detected_at_idx").on(table.detectedAt),
|
detectedAtIdx: index("detected_at_idx").on(table.detectedAt),
|
||||||
countryIdx: index("country_idx").on(table.country),
|
countryIdx: index("country_idx").on(table.country),
|
||||||
detectionSourceIdx: index("detection_source_idx").on(table.detectionSource),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Whitelist per IP fidati
|
// Whitelist per IP fidati
|
||||||
// NOTE: ip_inet is INET type in production (managed by SQL migrations)
|
|
||||||
// Drizzle lacks native INET support, so we use text() here
|
|
||||||
export const whitelist = pgTable("whitelist", {
|
export const whitelist = pgTable("whitelist", {
|
||||||
id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
|
id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
|
||||||
ipAddress: text("ip_address").notNull().unique(),
|
ipAddress: text("ip_address").notNull().unique(),
|
||||||
ipInet: text("ip_inet"), // Actually INET in production - see migration 008
|
|
||||||
comment: text("comment"),
|
comment: text("comment"),
|
||||||
reason: text("reason"),
|
reason: text("reason"),
|
||||||
createdBy: text("created_by"),
|
createdBy: text("created_by"),
|
||||||
active: boolean("active").notNull().default(true),
|
active: boolean("active").notNull().default(true),
|
||||||
createdAt: timestamp("created_at").defaultNow().notNull(),
|
createdAt: timestamp("created_at").defaultNow().notNull(),
|
||||||
// Public lists integration
|
});
|
||||||
source: text("source").notNull().default("manual"),
|
|
||||||
listId: varchar("list_id").references(() => publicLists.id, { onDelete: 'set null' }),
|
|
||||||
}, (table) => ({
|
|
||||||
sourceIdx: index("whitelist_source_idx").on(table.source),
|
|
||||||
}));
|
|
||||||
|
|
||||||
// ML Training history
|
// ML Training history
|
||||||
export const trainingHistory = pgTable("training_history", {
|
export const trainingHistory = pgTable("training_history", {
|
||||||
@ -137,46 +125,6 @@ export const networkAnalytics = pgTable("network_analytics", {
|
|||||||
dateHourUnique: unique("network_analytics_date_hour_key").on(table.date, table.hour),
|
dateHourUnique: unique("network_analytics_date_hour_key").on(table.date, table.hour),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Public threat/whitelist sources
|
|
||||||
export const publicLists = pgTable("public_lists", {
|
|
||||||
id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
|
|
||||||
name: text("name").notNull(),
|
|
||||||
type: text("type").notNull(),
|
|
||||||
url: text("url").notNull(),
|
|
||||||
enabled: boolean("enabled").notNull().default(true),
|
|
||||||
fetchIntervalMinutes: integer("fetch_interval_minutes").notNull().default(10),
|
|
||||||
lastFetch: timestamp("last_fetch"),
|
|
||||||
lastSuccess: timestamp("last_success"),
|
|
||||||
totalIps: integer("total_ips").notNull().default(0),
|
|
||||||
activeIps: integer("active_ips").notNull().default(0),
|
|
||||||
errorCount: integer("error_count").notNull().default(0),
|
|
||||||
lastError: text("last_error"),
|
|
||||||
createdAt: timestamp("created_at").defaultNow().notNull(),
|
|
||||||
}, (table) => ({
|
|
||||||
typeIdx: index("public_lists_type_idx").on(table.type),
|
|
||||||
enabledIdx: index("public_lists_enabled_idx").on(table.enabled),
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Public blacklist IPs from external sources
|
|
||||||
// NOTE: ip_inet/cidr_inet are INET/CIDR types in production (managed by SQL migrations)
|
|
||||||
// Drizzle lacks native INET/CIDR support, so we use text() here
|
|
||||||
export const publicBlacklistIps = pgTable("public_blacklist_ips", {
|
|
||||||
id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
|
|
||||||
ipAddress: text("ip_address").notNull(),
|
|
||||||
cidrRange: text("cidr_range"),
|
|
||||||
ipInet: text("ip_inet"), // Actually INET in production - see migration 008
|
|
||||||
cidrInet: text("cidr_inet"), // Actually CIDR in production - see migration 008
|
|
||||||
listId: varchar("list_id").notNull().references(() => publicLists.id, { onDelete: 'cascade' }),
|
|
||||||
firstSeen: timestamp("first_seen").defaultNow().notNull(),
|
|
||||||
lastSeen: timestamp("last_seen").defaultNow().notNull(),
|
|
||||||
isActive: boolean("is_active").notNull().default(true),
|
|
||||||
}, (table) => ({
|
|
||||||
ipAddressIdx: index("public_blacklist_ip_idx").on(table.ipAddress),
|
|
||||||
listIdIdx: index("public_blacklist_list_idx").on(table.listId),
|
|
||||||
isActiveIdx: index("public_blacklist_active_idx").on(table.isActive),
|
|
||||||
ipListUnique: unique("public_blacklist_ip_list_key").on(table.ipAddress, table.listId),
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Schema version tracking for database migrations
|
// Schema version tracking for database migrations
|
||||||
export const schemaVersion = pgTable("schema_version", {
|
export const schemaVersion = pgTable("schema_version", {
|
||||||
id: integer("id").primaryKey().default(1),
|
id: integer("id").primaryKey().default(1),
|
||||||
@ -190,30 +138,7 @@ export const routersRelations = relations(routers, ({ many }) => ({
|
|||||||
logs: many(networkLogs),
|
logs: many(networkLogs),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const publicListsRelations = relations(publicLists, ({ many }) => ({
|
// Rimossa relazione router (non più FK)
|
||||||
blacklistIps: many(publicBlacklistIps),
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const publicBlacklistIpsRelations = relations(publicBlacklistIps, ({ one }) => ({
|
|
||||||
list: one(publicLists, {
|
|
||||||
fields: [publicBlacklistIps.listId],
|
|
||||||
references: [publicLists.id],
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const whitelistRelations = relations(whitelist, ({ one }) => ({
|
|
||||||
list: one(publicLists, {
|
|
||||||
fields: [whitelist.listId],
|
|
||||||
references: [publicLists.id],
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const detectionsRelations = relations(detections, ({ one }) => ({
|
|
||||||
blacklist: one(publicBlacklistIps, {
|
|
||||||
fields: [detections.blacklistId],
|
|
||||||
references: [publicBlacklistIps.id],
|
|
||||||
}),
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Insert schemas
|
// Insert schemas
|
||||||
export const insertRouterSchema = createInsertSchema(routers).omit({
|
export const insertRouterSchema = createInsertSchema(routers).omit({
|
||||||
@ -251,19 +176,6 @@ export const insertNetworkAnalyticsSchema = createInsertSchema(networkAnalytics)
|
|||||||
createdAt: true,
|
createdAt: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const insertPublicListSchema = createInsertSchema(publicLists).omit({
|
|
||||||
id: true,
|
|
||||||
createdAt: true,
|
|
||||||
lastFetch: true,
|
|
||||||
lastSuccess: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
export const insertPublicBlacklistIpSchema = createInsertSchema(publicBlacklistIps).omit({
|
|
||||||
id: true,
|
|
||||||
firstSeen: true,
|
|
||||||
lastSeen: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Types
|
// Types
|
||||||
export type Router = typeof routers.$inferSelect;
|
export type Router = typeof routers.$inferSelect;
|
||||||
export type InsertRouter = z.infer<typeof insertRouterSchema>;
|
export type InsertRouter = z.infer<typeof insertRouterSchema>;
|
||||||
@ -285,9 +197,3 @@ export type InsertSchemaVersion = z.infer<typeof insertSchemaVersionSchema>;
|
|||||||
|
|
||||||
export type NetworkAnalytics = typeof networkAnalytics.$inferSelect;
|
export type NetworkAnalytics = typeof networkAnalytics.$inferSelect;
|
||||||
export type InsertNetworkAnalytics = z.infer<typeof insertNetworkAnalyticsSchema>;
|
export type InsertNetworkAnalytics = z.infer<typeof insertNetworkAnalyticsSchema>;
|
||||||
|
|
||||||
export type PublicList = typeof publicLists.$inferSelect;
|
|
||||||
export type InsertPublicList = z.infer<typeof insertPublicListSchema>;
|
|
||||||
|
|
||||||
export type PublicBlacklistIp = typeof publicBlacklistIps.$inferSelect;
|
|
||||||
export type InsertPublicBlacklistIp = z.infer<typeof insertPublicBlacklistIpSchema>;
|
|
||||||
|
|||||||
101
uv.lock
101
uv.lock
@ -1,101 +0,0 @@
|
|||||||
version = 1
|
|
||||||
revision = 3
|
|
||||||
requires-python = ">=3.11"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "anyio"
|
|
||||||
version = "4.11.0"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
dependencies = [
|
|
||||||
{ name = "idna" },
|
|
||||||
{ name = "sniffio" },
|
|
||||||
{ name = "typing-extensions", marker = "python_full_version < '3.13'" },
|
|
||||||
]
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/c6/78/7d432127c41b50bccba979505f272c16cbcadcc33645d5fa3a738110ae75/anyio-4.11.0.tar.gz", hash = "sha256:82a8d0b81e318cc5ce71a5f1f8b5c4e63619620b63141ef8c995fa0db95a57c4", size = 219094, upload-time = "2025-09-23T09:19:12.58Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/15/b3/9b1a8074496371342ec1e796a96f99c82c945a339cd81a8e73de28b4cf9e/anyio-4.11.0-py3-none-any.whl", hash = "sha256:0287e96f4d26d4149305414d4e3bc32f0dcd0862365a4bddea19d7a1ec38c4fc", size = 109097, upload-time = "2025-09-23T09:19:10.601Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "certifi"
|
|
||||||
version = "2025.11.12"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/a2/8c/58f469717fa48465e4a50c014a0400602d3c437d7c0c468e17ada824da3a/certifi-2025.11.12.tar.gz", hash = "sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316", size = 160538, upload-time = "2025-11-12T02:54:51.517Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/70/7d/9bc192684cea499815ff478dfcdc13835ddf401365057044fb721ec6bddb/certifi-2025.11.12-py3-none-any.whl", hash = "sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b", size = 159438, upload-time = "2025-11-12T02:54:49.735Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "h11"
|
|
||||||
version = "0.16.0"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "httpcore"
|
|
||||||
version = "1.0.9"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
dependencies = [
|
|
||||||
{ name = "certifi" },
|
|
||||||
{ name = "h11" },
|
|
||||||
]
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "httpx"
|
|
||||||
version = "0.28.1"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
dependencies = [
|
|
||||||
{ name = "anyio" },
|
|
||||||
{ name = "certifi" },
|
|
||||||
{ name = "httpcore" },
|
|
||||||
{ name = "idna" },
|
|
||||||
]
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "idna"
|
|
||||||
version = "3.11"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "repl-nix-workspace"
|
|
||||||
version = "0.1.0"
|
|
||||||
source = { virtual = "." }
|
|
||||||
dependencies = [
|
|
||||||
{ name = "httpx" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[package.metadata]
|
|
||||||
requires-dist = [{ name = "httpx", specifier = ">=0.28.1" }]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sniffio"
|
|
||||||
version = "1.3.1"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372, upload-time = "2024-02-25T23:20:04.057Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235, upload-time = "2024-02-25T23:20:01.196Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "typing-extensions"
|
|
||||||
version = "4.15.0"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" },
|
|
||||||
]
|
|
||||||
316
version.json
316
version.json
@ -1,163 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": "1.0.103",
|
"version": "1.0.77",
|
||||||
"lastUpdate": "2026-01-02T16:33:13.545Z",
|
"lastUpdate": "2025-11-25T09:19:17.340Z",
|
||||||
"changelog": [
|
"changelog": [
|
||||||
{
|
|
||||||
"version": "1.0.103",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.103"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.102",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.102"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.101",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.101"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.100",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.100"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.99",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.99"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.98",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.98"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.97",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.97"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.96",
|
|
||||||
"date": "2026-01-02",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.96"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.95",
|
|
||||||
"date": "2025-11-27",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.95"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.94",
|
|
||||||
"date": "2025-11-27",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.94"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.93",
|
|
||||||
"date": "2025-11-27",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.93"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.92",
|
|
||||||
"date": "2025-11-27",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.92"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.91",
|
|
||||||
"date": "2025-11-26",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.91"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.90",
|
|
||||||
"date": "2025-11-26",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.90"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.89",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.89"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.88",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.88"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.87",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.87"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.86",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.86"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.85",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.85"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.84",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.84"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.83",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.83"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.82",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.82"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.81",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.81"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.80",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.80"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.79",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.79"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "1.0.78",
|
|
||||||
"date": "2025-11-25",
|
|
||||||
"type": "patch",
|
|
||||||
"description": "Deployment automatico v1.0.78"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"version": "1.0.77",
|
"version": "1.0.77",
|
||||||
"date": "2025-11-25",
|
"date": "2025-11-25",
|
||||||
@ -301,6 +145,162 @@
|
|||||||
"date": "2025-11-24",
|
"date": "2025-11-24",
|
||||||
"type": "patch",
|
"type": "patch",
|
||||||
"description": "Deployment automatico v1.0.54"
|
"description": "Deployment automatico v1.0.54"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.53",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.53"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.52",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.52"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.51",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.51"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.50",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.50"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.49",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.49"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.48",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.48"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.47",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.47"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.46",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.46"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.45",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.45"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.44",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.44"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.43",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.43"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.42",
|
||||||
|
"date": "2025-11-24",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.42"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.41",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.41"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.40",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.40"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.39",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.39"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.38",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.38"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.37",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.37"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.36",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.36"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.35",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.35"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.34",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.34"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.33",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.33"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.32",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.32"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.31",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.31"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.30",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.30"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.29",
|
||||||
|
"date": "2025-11-22",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.29"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "1.0.28",
|
||||||
|
"date": "2025-11-21",
|
||||||
|
"type": "patch",
|
||||||
|
"description": "Deployment automatico v1.0.28"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user