merge: phase 17 wave 3 CLI wiring
This commit is contained in:
salvacybersec
@@ -2,110 +2,163 @@ package storage
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
// ScheduledJob represents a cron-based scheduled scan job.
|
||||
// ScheduledJob represents a cron-based recurring scan job.
|
||||
type ScheduledJob struct {
|
||||
ID int64
|
||||
Name string
|
||||
CronExpr string
|
||||
ScanCommand string
|
||||
NotifyTelegram bool
|
||||
Enabled bool
|
||||
LastRun *time.Time
|
||||
NextRun *time.Time
|
||||
CreatedAt time.Time
|
||||
ID int64
|
||||
Name string
|
||||
CronExpr string
|
||||
ScanPath string
|
||||
Enabled bool
|
||||
Notify bool
|
||||
LastRunAt *time.Time
|
||||
NextRunAt *time.Time
|
||||
CreatedAt time.Time
|
||||
}
|
||||
|
||||
// SaveScheduledJob inserts a new scheduled job. Returns the new row ID.
|
||||
func (db *DB) SaveScheduledJob(j ScheduledJob) (int64, error) {
|
||||
// SaveScheduledJob inserts a new scheduled job and returns its ID.
|
||||
func (db *DB) SaveScheduledJob(job ScheduledJob) (int64, error) {
|
||||
enabledInt := 0
|
||||
if job.Enabled {
|
||||
enabledInt = 1
|
||||
}
|
||||
notifyInt := 0
|
||||
if job.Notify {
|
||||
notifyInt = 1
|
||||
}
|
||||
|
||||
res, err := db.sql.Exec(
|
||||
`INSERT INTO scheduled_jobs (name, cron_expr, scan_command, notify_telegram, enabled)
|
||||
`INSERT INTO scheduled_jobs (name, cron_expr, scan_path, enabled, notify)
|
||||
VALUES (?, ?, ?, ?, ?)`,
|
||||
j.Name, j.CronExpr, j.ScanCommand, j.NotifyTelegram, j.Enabled,
|
||||
job.Name, job.CronExpr, job.ScanPath, enabledInt, notifyInt,
|
||||
)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return 0, fmt.Errorf("inserting scheduled job: %w", err)
|
||||
}
|
||||
return res.LastInsertId()
|
||||
}
|
||||
|
||||
// ListScheduledJobs returns all scheduled jobs.
|
||||
// ListScheduledJobs returns all scheduled jobs ordered by creation time.
|
||||
func (db *DB) ListScheduledJobs() ([]ScheduledJob, error) {
|
||||
rows, err := db.sql.Query(
|
||||
`SELECT id, name, cron_expr, scan_command, notify_telegram, enabled, last_run, next_run, created_at
|
||||
FROM scheduled_jobs ORDER BY id`,
|
||||
`SELECT id, name, cron_expr, scan_path, enabled, notify, last_run_at, next_run_at, created_at
|
||||
FROM scheduled_jobs ORDER BY created_at ASC`,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, fmt.Errorf("querying scheduled jobs: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var jobs []ScheduledJob
|
||||
for rows.Next() {
|
||||
var j ScheduledJob
|
||||
var lastRun, nextRun sql.NullTime
|
||||
if err := rows.Scan(&j.ID, &j.Name, &j.CronExpr, &j.ScanCommand,
|
||||
&j.NotifyTelegram, &j.Enabled, &lastRun, &nextRun, &j.CreatedAt); err != nil {
|
||||
j, err := scanJobRow(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if lastRun.Valid {
|
||||
j.LastRun = &lastRun.Time
|
||||
}
|
||||
if nextRun.Valid {
|
||||
j.NextRun = &nextRun.Time
|
||||
}
|
||||
jobs = append(jobs, j)
|
||||
}
|
||||
return jobs, rows.Err()
|
||||
}
|
||||
|
||||
// GetScheduledJob returns a single scheduled job by name.
|
||||
func (db *DB) GetScheduledJob(name string) (*ScheduledJob, error) {
|
||||
// GetScheduledJob returns a single job by ID.
|
||||
func (db *DB) GetScheduledJob(id int64) (*ScheduledJob, error) {
|
||||
row := db.sql.QueryRow(
|
||||
`SELECT id, name, cron_expr, scan_path, enabled, notify, last_run_at, next_run_at, created_at
|
||||
FROM scheduled_jobs WHERE id = ?`, id,
|
||||
)
|
||||
var j ScheduledJob
|
||||
var lastRun, nextRun sql.NullTime
|
||||
err := db.sql.QueryRow(
|
||||
`SELECT id, name, cron_expr, scan_command, notify_telegram, enabled, last_run, next_run, created_at
|
||||
FROM scheduled_jobs WHERE name = ?`, name,
|
||||
).Scan(&j.ID, &j.Name, &j.CronExpr, &j.ScanCommand,
|
||||
&j.NotifyTelegram, &j.Enabled, &lastRun, &nextRun, &j.CreatedAt)
|
||||
if err != nil {
|
||||
var enabledInt, notifyInt int
|
||||
var lastRun, nextRun, createdAt sql.NullString
|
||||
if err := row.Scan(&j.ID, &j.Name, &j.CronExpr, &j.ScanPath,
|
||||
&enabledInt, ¬ifyInt, &lastRun, &nextRun, &createdAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if lastRun.Valid {
|
||||
j.LastRun = &lastRun.Time
|
||||
}
|
||||
if nextRun.Valid {
|
||||
j.NextRun = &nextRun.Time
|
||||
j.Enabled = enabledInt != 0
|
||||
j.Notify = notifyInt != 0
|
||||
j.LastRunAt = parseNullTime(lastRun)
|
||||
j.NextRunAt = parseNullTime(nextRun)
|
||||
if createdAt.Valid {
|
||||
t, _ := time.Parse("2006-01-02 15:04:05", createdAt.String)
|
||||
j.CreatedAt = t
|
||||
}
|
||||
return &j, nil
|
||||
}
|
||||
|
||||
// DeleteScheduledJob removes a scheduled job by name. Returns rows affected.
|
||||
func (db *DB) DeleteScheduledJob(name string) (int64, error) {
|
||||
res, err := db.sql.Exec(`DELETE FROM scheduled_jobs WHERE name = ?`, name)
|
||||
// DeleteScheduledJob removes a job by ID and returns rows affected.
|
||||
func (db *DB) DeleteScheduledJob(id int64) (int64, error) {
|
||||
res, err := db.sql.Exec(`DELETE FROM scheduled_jobs WHERE id = ?`, id)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return 0, fmt.Errorf("deleting scheduled job %d: %w", id, err)
|
||||
}
|
||||
return res.RowsAffected()
|
||||
}
|
||||
|
||||
// UpdateJobLastRun updates the last_run and next_run timestamps for a job.
|
||||
func (db *DB) UpdateJobLastRun(name string, lastRun time.Time, nextRun *time.Time) error {
|
||||
var nr sql.NullTime
|
||||
if nextRun != nil {
|
||||
nr = sql.NullTime{Time: *nextRun, Valid: true}
|
||||
}
|
||||
// UpdateJobLastRun updates the last_run_at timestamp for a job.
|
||||
func (db *DB) UpdateJobLastRun(id int64, t time.Time) error {
|
||||
_, err := db.sql.Exec(
|
||||
`UPDATE scheduled_jobs SET last_run = ?, next_run = ? WHERE name = ?`,
|
||||
lastRun, nr, name,
|
||||
`UPDATE scheduled_jobs SET last_run_at = ? WHERE id = ?`,
|
||||
t.Format("2006-01-02 15:04:05"), id,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// SetJobEnabled updates the enabled flag for a scheduled job.
|
||||
func (db *DB) SetJobEnabled(name string, enabled bool) error {
|
||||
_, err := db.sql.Exec(`UPDATE scheduled_jobs SET enabled = ? WHERE name = ?`, enabled, name)
|
||||
return err
|
||||
// ListEnabledScheduledJobs returns only enabled jobs.
|
||||
func (db *DB) ListEnabledScheduledJobs() ([]ScheduledJob, error) {
|
||||
rows, err := db.sql.Query(
|
||||
`SELECT id, name, cron_expr, scan_path, enabled, notify, last_run_at, next_run_at, created_at
|
||||
FROM scheduled_jobs WHERE enabled = 1 ORDER BY created_at ASC`,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("querying enabled scheduled jobs: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var jobs []ScheduledJob
|
||||
for rows.Next() {
|
||||
j, err := scanJobRow(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
jobs = append(jobs, j)
|
||||
}
|
||||
return jobs, rows.Err()
|
||||
}
|
||||
|
||||
func scanJobRow(rows *sql.Rows) (ScheduledJob, error) {
|
||||
var j ScheduledJob
|
||||
var enabledInt, notifyInt int
|
||||
var lastRun, nextRun, createdAt sql.NullString
|
||||
if err := rows.Scan(&j.ID, &j.Name, &j.CronExpr, &j.ScanPath,
|
||||
&enabledInt, ¬ifyInt, &lastRun, &nextRun, &createdAt); err != nil {
|
||||
return j, fmt.Errorf("scanning scheduled job row: %w", err)
|
||||
}
|
||||
j.Enabled = enabledInt != 0
|
||||
j.Notify = notifyInt != 0
|
||||
j.LastRunAt = parseNullTime(lastRun)
|
||||
j.NextRunAt = parseNullTime(nextRun)
|
||||
if createdAt.Valid {
|
||||
t, _ := time.Parse("2006-01-02 15:04:05", createdAt.String)
|
||||
j.CreatedAt = t
|
||||
}
|
||||
return j, nil
|
||||
}
|
||||
|
||||
func parseNullTime(ns sql.NullString) *time.Time {
|
||||
if !ns.Valid || ns.String == "" {
|
||||
return nil
|
||||
}
|
||||
// Try multiple formats SQLite may return.
|
||||
for _, layout := range []string{
|
||||
"2006-01-02 15:04:05",
|
||||
"2006-01-02T15:04:05Z",
|
||||
time.RFC3339,
|
||||
} {
|
||||
if t, err := time.Parse(layout, ns.String); err == nil {
|
||||
return &t
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
104
pkg/storage/scheduled_jobs_test.go
Normal file
104
pkg/storage/scheduled_jobs_test.go
Normal file
@@ -0,0 +1,104 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestScheduledJobCRUD(t *testing.T) {
|
||||
db, err := Open(":memory:")
|
||||
require.NoError(t, err)
|
||||
defer db.Close()
|
||||
|
||||
// Add a job.
|
||||
job := ScheduledJob{
|
||||
Name: "nightly-scan",
|
||||
CronExpr: "0 0 * * *",
|
||||
ScanPath: "/tmp/repo",
|
||||
Enabled: true,
|
||||
Notify: true,
|
||||
}
|
||||
id, err := db.SaveScheduledJob(job)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, id > 0)
|
||||
|
||||
// Get the job by ID.
|
||||
got, err := db.GetScheduledJob(id)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "nightly-scan", got.Name)
|
||||
assert.Equal(t, "0 0 * * *", got.CronExpr)
|
||||
assert.Equal(t, "/tmp/repo", got.ScanPath)
|
||||
assert.True(t, got.Enabled)
|
||||
assert.True(t, got.Notify)
|
||||
assert.Nil(t, got.LastRunAt)
|
||||
|
||||
// List all jobs.
|
||||
jobs, err := db.ListScheduledJobs()
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, jobs, 1)
|
||||
assert.Equal(t, "nightly-scan", jobs[0].Name)
|
||||
|
||||
// Add a second job (disabled).
|
||||
job2 := ScheduledJob{
|
||||
Name: "weekly-scan",
|
||||
CronExpr: "0 0 * * 0",
|
||||
ScanPath: "/tmp/other",
|
||||
Enabled: false,
|
||||
Notify: false,
|
||||
}
|
||||
id2, err := db.SaveScheduledJob(job2)
|
||||
require.NoError(t, err)
|
||||
|
||||
// List enabled only.
|
||||
enabled, err := db.ListEnabledScheduledJobs()
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, enabled, 1)
|
||||
assert.Equal(t, id, enabled[0].ID)
|
||||
|
||||
// Delete the first job.
|
||||
affected, err := db.DeleteScheduledJob(id)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(1), affected)
|
||||
|
||||
// Only the second job should remain.
|
||||
jobs, err = db.ListScheduledJobs()
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, jobs, 1)
|
||||
assert.Equal(t, id2, jobs[0].ID)
|
||||
|
||||
// Delete non-existent returns 0 affected.
|
||||
affected, err = db.DeleteScheduledJob(999)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(0), affected)
|
||||
}
|
||||
|
||||
func TestUpdateJobLastRun(t *testing.T) {
|
||||
db, err := Open(":memory:")
|
||||
require.NoError(t, err)
|
||||
defer db.Close()
|
||||
|
||||
id, err := db.SaveScheduledJob(ScheduledJob{
|
||||
Name: "test",
|
||||
CronExpr: "*/5 * * * *",
|
||||
ScanPath: "/tmp/test",
|
||||
Enabled: true,
|
||||
Notify: true,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
job, err := db.GetScheduledJob(id)
|
||||
require.NoError(t, err)
|
||||
assert.Nil(t, job.LastRunAt)
|
||||
|
||||
// Update last run.
|
||||
now := time.Now().Truncate(time.Second)
|
||||
require.NoError(t, db.UpdateJobLastRun(id, now))
|
||||
|
||||
job, err = db.GetScheduledJob(id)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, job.LastRunAt, "LastRunAt should be set after UpdateJobLastRun")
|
||||
assert.Equal(t, now.Format("2006-01-02 15:04:05"), job.LastRunAt.Format("2006-01-02 15:04:05"))
|
||||
}
|
||||
@@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS custom_dorks (
|
||||
CREATE INDEX IF NOT EXISTS idx_custom_dorks_source ON custom_dorks(source);
|
||||
CREATE INDEX IF NOT EXISTS idx_custom_dorks_category ON custom_dorks(category);
|
||||
|
||||
<<<<<<< HEAD
|
||||
-- Phase 17: Telegram bot subscribers for auto-notifications.
|
||||
CREATE TABLE IF NOT EXISTS subscribers (
|
||||
chat_id INTEGER PRIMARY KEY,
|
||||
@@ -75,3 +76,19 @@ CREATE TABLE IF NOT EXISTS scheduled_jobs (
|
||||
next_run DATETIME,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
=======
|
||||
-- Phase 17: scheduled scan jobs for cron-based recurring scans.
|
||||
CREATE TABLE IF NOT EXISTS scheduled_jobs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL,
|
||||
cron_expr TEXT NOT NULL,
|
||||
scan_path TEXT NOT NULL,
|
||||
enabled INTEGER NOT NULL DEFAULT 1,
|
||||
notify INTEGER NOT NULL DEFAULT 1,
|
||||
last_run_at DATETIME,
|
||||
next_run_at DATETIME,
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_scheduled_jobs_enabled ON scheduled_jobs(enabled);
|
||||
>>>>>>> worktree-agent-a39573e4
|
||||
|
||||
Reference in New Issue
Block a user