Persist per-host scan results and expose hosts endpoint.

Store checked hosts for each scan and add API to fetch host-level up/down probe results.

Made-with: Cursor
This commit is contained in:
Andrey Lutsenko
2026-04-09 21:51:35 +10:00
parent 43cb339605
commit 9afbbbb762
6 changed files with 127 additions and 3 deletions
+7
View File
@@ -8,6 +8,7 @@
- `POST /api/scans` - создание задания скана. - `POST /api/scans` - создание задания скана.
- `GET /api/scans` - список сканов. - `GET /api/scans` - список сканов.
- `GET /api/scans/{id}` - просмотр созданного задания. - `GET /api/scans/{id}` - просмотр созданного задания.
- `GET /api/scans/{id}/hosts` - результаты проверки хостов по скану.
- Валидация CIDR и exclude IP. - Валидация CIDR и exclude IP.
- Два backend-хранилища: in-memory и PostgreSQL. - Два backend-хранилища: in-memory и PostgreSQL.
- После создания scan запускается фоновый discovery с обновлением статуса и прогресса. - После создания scan запускается фоновый discovery с обновлением статуса и прогресса.
@@ -130,6 +131,12 @@ curl -s http://localhost:8080/api/scans?limit=20
- `progress`: 0..100 - `progress`: 0..100
- `stats.hosts_total`, `stats.hosts_up` - `stats.hosts_total`, `stats.hosts_up`
Получить результаты по хостам:
```bash
curl -s http://localhost:8080/api/scans/<scan_id>/hosts?limit=200
```
## Запуск как сервис на Linux (systemd) ## Запуск как сервис на Linux (systemd)
1. Собрать бинарник: 1. Собрать бинарник:
+27
View File
@@ -25,6 +25,7 @@ func (h *Handler) Routes() http.Handler {
mux.HandleFunc("POST /api/scans", h.createScan) mux.HandleFunc("POST /api/scans", h.createScan)
mux.HandleFunc("GET /api/scans", h.listScans) mux.HandleFunc("GET /api/scans", h.listScans)
mux.HandleFunc("GET /api/scans/{id}", h.getScan) mux.HandleFunc("GET /api/scans/{id}", h.getScan)
mux.HandleFunc("GET /api/scans/{id}/hosts", h.getScanHosts)
return withJSON(mux) return withJSON(mux)
} }
@@ -94,6 +95,32 @@ func (h *Handler) getScan(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusOK, job) writeJSON(w, http.StatusOK, job)
} }
func (h *Handler) getScanHosts(w http.ResponseWriter, r *http.Request) {
id := r.PathValue("id")
if id == "" {
writeError(w, http.StatusBadRequest, "scan id is required")
return
}
if _, ok := h.store.GetScan(id); !ok {
writeError(w, http.StatusNotFound, "scan not found")
return
}
limit := 500
if raw := r.URL.Query().Get("limit"); raw != "" {
n, err := strconv.Atoi(raw)
if err != nil || n <= 0 || n > 5000 {
writeError(w, http.StatusBadRequest, "limit must be between 1 and 5000")
return
}
limit = n
}
writeJSON(w, http.StatusOK, map[string]any{
"items": h.store.ListHostResults(id, limit),
})
}
func withJSON(next http.Handler) http.Handler { func withJSON(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
+35
View File
@@ -280,3 +280,38 @@ where id = $1`
return current, true return current, true
} }
func (s *PostgresStore) SaveHostResult(scanID string, host HostResult) error {
query := `
insert into scan_hosts (scan_id, ip, is_up, checked_at)
values ($1, $2, $3, $4)`
_, err := s.db.ExecContext(context.Background(), query, scanID, host.IP, host.IsUp, host.CheckedAt)
return err
}
func (s *PostgresStore) ListHostResults(scanID string, limit int) []HostResult {
if limit <= 0 {
limit = 500
}
query := `
select ip::text, is_up, checked_at
from scan_hosts
where scan_id = $1
order by checked_at desc
limit $2`
rows, err := s.db.QueryContext(context.Background(), query, scanID, limit)
if err != nil {
return nil
}
defer rows.Close()
out := make([]HostResult, 0, limit)
for rows.Next() {
var h HostResult
if err = rows.Scan(&h.IP, &h.IsUp, &h.CheckedAt); err != nil {
return nil
}
out = append(out, h)
}
return out
}
+5
View File
@@ -70,6 +70,11 @@ func (r *Runner) run(job ScanJob) {
defer wg.Done() defer wg.Done()
for ip := range workCh { for ip := range workCh {
isUp := probeHost(ip, job.Options.PingTimeoutMS) isUp := probeHost(ip, job.Options.PingTimeoutMS)
_ = r.store.SaveHostResult(job.ID, HostResult{
IP: ip,
IsUp: isUp,
CheckedAt: time.Now().UTC(),
})
mu.Lock() mu.Lock()
done++ done++
+39
View File
@@ -59,16 +59,26 @@ type Store interface {
GetScan(id string) (ScanJob, bool) GetScan(id string) (ScanJob, bool)
ListScans(limit int) []ScanJob ListScans(limit int) []ScanJob
UpdateScan(id string, update ScanUpdate) (ScanJob, bool) UpdateScan(id string, update ScanUpdate) (ScanJob, bool)
SaveHostResult(scanID string, host HostResult) error
ListHostResults(scanID string, limit int) []HostResult
}
type HostResult struct {
IP string `json:"ip"`
IsUp bool `json:"is_up"`
CheckedAt time.Time `json:"checked_at"`
} }
type MemoryStore struct { type MemoryStore struct {
mu sync.RWMutex mu sync.RWMutex
jobs map[string]ScanJob jobs map[string]ScanJob
hosts map[string][]HostResult
} }
func NewMemoryStore() *MemoryStore { func NewMemoryStore() *MemoryStore {
return &MemoryStore{ return &MemoryStore{
jobs: make(map[string]ScanJob), jobs: make(map[string]ScanJob),
hosts: make(map[string][]HostResult),
} }
} }
@@ -161,6 +171,35 @@ func (s *MemoryStore) UpdateScan(id string, update ScanUpdate) (ScanJob, bool) {
return job, true return job, true
} }
func (s *MemoryStore) SaveHostResult(scanID string, host HostResult) error {
s.mu.Lock()
defer s.mu.Unlock()
if _, ok := s.jobs[scanID]; !ok {
return errors.New("scan not found")
}
s.hosts[scanID] = append(s.hosts[scanID], host)
return nil
}
func (s *MemoryStore) ListHostResults(scanID string, limit int) []HostResult {
if limit <= 0 {
limit = 500
}
s.mu.RLock()
defer s.mu.RUnlock()
items := s.hosts[scanID]
if len(items) <= limit {
out := make([]HostResult, len(items))
copy(out, items)
return out
}
out := make([]HostResult, limit)
copy(out, items[:limit])
return out
}
func applyDefaultOptions(opts *ScanOptions) { func applyDefaultOptions(opts *ScanOptions) {
if opts.PingTimeoutMS <= 0 { if opts.PingTimeoutMS <= 0 {
opts.PingTimeoutMS = 700 opts.PingTimeoutMS = 700
+11
View File
@@ -17,3 +17,14 @@ create index if not exists idx_scan_jobs_created_at on scan_jobs (created_at des
alter table scan_jobs add column if not exists progress int not null default 0; alter table scan_jobs add column if not exists progress int not null default 0;
alter table scan_jobs add column if not exists stats jsonb not null default '{}'::jsonb; alter table scan_jobs add column if not exists stats jsonb not null default '{}'::jsonb;
create table if not exists scan_hosts (
id bigserial primary key,
scan_id text not null references scan_jobs(id) on delete cascade,
ip inet not null,
is_up boolean not null,
checked_at timestamptz not null
);
create index if not exists idx_scan_hosts_scan_id_checked_at
on scan_hosts (scan_id, checked_at desc);