mirror of
https://github.com/anotherhadi/spilltea.git
synced 2026-07-06 20:42:33 +02:00
feat: add "flag" toggle in replay & findings
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
This commit is contained in:
+3
-1
@@ -79,7 +79,8 @@ CREATE TABLE IF NOT EXISTS replay_entries (
|
||||
request_raw TEXT NOT NULL,
|
||||
response_raw TEXT NOT NULL,
|
||||
status_code INTEGER NOT NULL,
|
||||
error_msg TEXT NOT NULL
|
||||
error_msg TEXT NOT NULL,
|
||||
flagged INTEGER NOT NULL DEFAULT 0
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS findings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
@@ -89,6 +90,7 @@ CREATE TABLE IF NOT EXISTS findings (
|
||||
description TEXT NOT NULL DEFAULT '',
|
||||
severity TEXT NOT NULL DEFAULT 'info',
|
||||
dismissed INTEGER NOT NULL DEFAULT 0,
|
||||
flagged INTEGER NOT NULL DEFAULT 0,
|
||||
created_at DATETIME NOT NULL,
|
||||
UNIQUE(plugin_name, dedup_key)
|
||||
);
|
||||
|
||||
+25
-2
@@ -11,6 +11,7 @@ type Finding struct {
|
||||
Title string
|
||||
Description string
|
||||
Severity string
|
||||
Flagged bool
|
||||
CreatedAt time.Time
|
||||
}
|
||||
|
||||
@@ -34,7 +35,7 @@ func (d *DB) UpsertFinding(f Finding) (bool, error) {
|
||||
|
||||
func (d *DB) LoadFindings() ([]Finding, error) {
|
||||
rows, err := d.conn.Query(
|
||||
`SELECT id, plugin_name, dedup_key, title, description, severity, created_at
|
||||
`SELECT id, plugin_name, dedup_key, title, description, severity, flagged, created_at
|
||||
FROM findings WHERE dismissed = 0 ORDER BY id ASC`,
|
||||
)
|
||||
if err != nil {
|
||||
@@ -45,9 +46,11 @@ func (d *DB) LoadFindings() ([]Finding, error) {
|
||||
for rows.Next() {
|
||||
var f Finding
|
||||
var ts string
|
||||
if err := rows.Scan(&f.ID, &f.PluginName, &f.DedupKey, &f.Title, &f.Description, &f.Severity, &ts); err != nil {
|
||||
var flagged int
|
||||
if err := rows.Scan(&f.ID, &f.PluginName, &f.DedupKey, &f.Title, &f.Description, &f.Severity, &flagged, &ts); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
f.Flagged = flagged != 0
|
||||
for _, layout := range findingTimeFormats {
|
||||
if t, err := time.Parse(layout, ts); err == nil {
|
||||
f.CreatedAt = t.Local()
|
||||
@@ -63,3 +66,23 @@ func (d *DB) DismissFinding(id int64) error {
|
||||
_, err := d.conn.Exec(`UPDATE findings SET dismissed = 1 WHERE id = ?`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
func (d *DB) ToggleFindingFlag(id int64) error {
|
||||
_, err := d.conn.Exec(`UPDATE findings SET flagged = NOT flagged WHERE id = ?`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
// DismissAllFindings dismisses unflagged findings first. If none are unflagged
|
||||
// (only flagged ones remain), it dismisses everything.
|
||||
func (d *DB) DismissAllFindings() error {
|
||||
var count int
|
||||
if err := d.conn.QueryRow(`SELECT COUNT(*) FROM findings WHERE dismissed = 0 AND flagged = 0`).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count > 0 {
|
||||
_, err := d.conn.Exec(`UPDATE findings SET dismissed = 1 WHERE flagged = 0`)
|
||||
return err
|
||||
}
|
||||
_, err := d.conn.Exec(`UPDATE findings SET dismissed = 1`)
|
||||
return err
|
||||
}
|
||||
|
||||
+30
-7
@@ -17,16 +17,17 @@ type ReplayEntry struct {
|
||||
ResponseRaw string
|
||||
StatusCode int
|
||||
ErrorMsg string
|
||||
Flagged bool
|
||||
}
|
||||
|
||||
func (d *DB) InsertReplayEntry(e ReplayEntry) (int64, error) {
|
||||
res, err := d.conn.Exec(
|
||||
`INSERT INTO replay_entries (timestamp, scheme, host, path, method, original_raw, request_raw, response_raw, status_code, error_msg)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
`INSERT INTO replay_entries (timestamp, scheme, host, path, method, original_raw, request_raw, response_raw, status_code, error_msg, flagged)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
e.Timestamp.UTC().Format(time.RFC3339),
|
||||
e.Scheme, e.Host, e.Path, e.Method,
|
||||
e.OriginalRaw, e.RequestRaw, e.ResponseRaw,
|
||||
e.StatusCode, e.ErrorMsg,
|
||||
e.StatusCode, e.ErrorMsg, e.Flagged,
|
||||
)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
@@ -36,15 +37,15 @@ func (d *DB) InsertReplayEntry(e ReplayEntry) (int64, error) {
|
||||
|
||||
func (d *DB) UpdateReplayEntry(e ReplayEntry) error {
|
||||
_, err := d.conn.Exec(
|
||||
`UPDATE replay_entries SET request_raw=?, response_raw=?, status_code=?, error_msg=? WHERE id=?`,
|
||||
e.RequestRaw, e.ResponseRaw, e.StatusCode, e.ErrorMsg, e.ID,
|
||||
`UPDATE replay_entries SET request_raw=?, response_raw=?, status_code=?, error_msg=?, flagged=? WHERE id=?`,
|
||||
e.RequestRaw, e.ResponseRaw, e.StatusCode, e.ErrorMsg, e.Flagged, e.ID,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
func (d *DB) ListReplayEntries() ([]ReplayEntry, error) {
|
||||
rows, err := d.conn.Query(
|
||||
`SELECT id, timestamp, scheme, host, path, method, original_raw, request_raw, response_raw, status_code, error_msg
|
||||
`SELECT id, timestamp, scheme, host, path, method, original_raw, request_raw, response_raw, status_code, error_msg, flagged
|
||||
FROM replay_entries ORDER BY id ASC`,
|
||||
)
|
||||
if err != nil {
|
||||
@@ -56,8 +57,9 @@ func (d *DB) ListReplayEntries() ([]ReplayEntry, error) {
|
||||
for rows.Next() {
|
||||
var e ReplayEntry
|
||||
var ts string
|
||||
var flagged int
|
||||
if err := rows.Scan(&e.ID, &ts, &e.Scheme, &e.Host, &e.Path, &e.Method,
|
||||
&e.OriginalRaw, &e.RequestRaw, &e.ResponseRaw, &e.StatusCode, &e.ErrorMsg); err != nil {
|
||||
&e.OriginalRaw, &e.RequestRaw, &e.ResponseRaw, &e.StatusCode, &e.ErrorMsg, &flagged); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var tsErr error
|
||||
@@ -65,11 +67,17 @@ func (d *DB) ListReplayEntries() ([]ReplayEntry, error) {
|
||||
if tsErr != nil {
|
||||
log.Printf("db: parse replay timestamp %q: %v", ts, tsErr)
|
||||
}
|
||||
e.Flagged = flagged != 0
|
||||
entries = append(entries, e)
|
||||
}
|
||||
return entries, rows.Err()
|
||||
}
|
||||
|
||||
func (d *DB) ToggleReplayFlag(id int64) error {
|
||||
_, err := d.conn.Exec(`UPDATE replay_entries SET flagged = NOT flagged WHERE id = ?`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
func (d *DB) DeleteReplayEntry(id int64) error {
|
||||
_, err := d.conn.Exec(`DELETE FROM replay_entries WHERE id = ?`, id)
|
||||
return err
|
||||
@@ -79,3 +87,18 @@ func (d *DB) DeleteAllReplayEntries() error {
|
||||
_, err := d.conn.Exec(`DELETE FROM replay_entries`)
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteAllReplayEntriesExceptFlagged deletes all unflagged replay entries. If
|
||||
// none are unflagged (only flagged ones remain), it deletes everything.
|
||||
func (d *DB) DeleteAllReplayEntriesExceptFlagged() error {
|
||||
var count int
|
||||
if err := d.conn.QueryRow(`SELECT COUNT(*) FROM replay_entries WHERE flagged = 0`).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count > 0 {
|
||||
_, err := d.conn.Exec(`DELETE FROM replay_entries WHERE flagged = 0`)
|
||||
return err
|
||||
}
|
||||
_, err := d.conn.Exec(`DELETE FROM replay_entries`)
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user