Merge branch 'fix/s3-region-full-url'

Author: h0tak88r

internal/app/app.go

@@ -73,11 +73,12 @@ func StartAPI() error {
 	// the persisted state is truthful and monitoring continues after a Docker restart.
 	resumeMonitorsOnStartup()
 
-	// One-shot cleanup: a previous build mis-parsed Intigriti program handles as the
-	// literal "detail" path segment, collapsing every IT program into a single
-	// program_assets bucket and producing a Discord alert flood. Wipe that row so the
-	// monitor re-baselines under the now-correct keys.
-	cleanupCorruptedProgramAssets()
+	// One-shot total reset of the program-scope monitor state. A prior build mis-parsed
+	// Intigriti program handles as the literal "/detail" segment, collapsing every IT
+	// program into a single bucket and flooding Discord with false "new asset" alerts.
+	// This wipes all baselines AND the historical false alerts from monitor_changes.
+	// Gated by a settings marker so it runs exactly once across deployments.
+	resetProgramMonitorOnce()
 
 	// Bug-bounty scope-change monitor: slow rolling sweep of all programs that alerts
 	// to MONITOR_WEBHOOK_URL (Discord) whenever a new in-scope asset appears. No-op when
@@ -139,19 +140,35 @@ func reconcileStaleScansOnStartup() {
 	}
 }
 
-// cleanupCorruptedProgramAssets drops program_assets rows poisoned by past
-// identifier-collision bugs (currently: every Intigriti program shared the key
-// "it:detail" because the handle parser took "/detail" as the handle). Safe to call
-// every boot — it only deletes the known-bad keys; healthy rows are untouched.
-func cleanupCorruptedProgramAssets() {
+// resetProgramMonitorOnce performs a one-time total reset of the program-scope
+// monitor: wipes every program_assets baseline AND every historical "new_program_asset"
+// row from monitor_changes (the false Discord-flood records). A settings marker
+// prevents it from re-running on subsequent boots — otherwise every container restart
+// would re-wipe the baseline and the monitor could never establish stable state.
+// Bump the marker key (programMonitorResetKey) to trigger a fresh reset in the future.
+func resetProgramMonitorOnce() {
+	const programMonitorResetKey = "program_monitor_reset_v2"
 	if err := db.Init(); err != nil {
 		return
 	}
-	for _, key := range []string{"it:detail"} {
-		if n, err := db.DeleteProgramScopeAssetsByKey(key); err == nil && n > 0 {
-			log.Printf("[INFO] Cleaned %d poisoned program_assets row(s) under key %q.", n, key)
-		}
+	if v, _ := db.GetSetting(programMonitorResetKey); v == "done" {
+		return // already reset on a previous boot
+	}
+	assetsCleared, err := db.TruncateProgramScopeAssets()
+	if err != nil {
+		log.Printf("[WARN] Program monitor reset: failed to truncate program_assets: %v", err)
+		return
+	}
+	alertsCleared, err := db.DeleteMonitorChangesByType("new_program_asset")
+	if err != nil {
+		log.Printf("[WARN] Program monitor reset: failed to clear new_program_asset history: %v", err)
+		// Continue: even if alert wipe failed, the baseline wipe matters more.
+	}
+	if err := db.SetSetting(programMonitorResetKey, "done"); err != nil {
+		log.Printf("[WARN] Program monitor reset: failed to record marker (will retry next boot): %v", err)
 	}
+	log.Printf("[INFO] Program monitor reset: wiped %d baseline asset row(s) and %d false alert(s). Next sweep baselines silently.",
+		assetsCleared, alertsCleared)
 }
 
 // resumeMonitorsOnStartup restarts the monitor daemon goroutines (which don't survive

internal/db/db.go

@@ -172,6 +172,26 @@ func DeleteProgramScopeAssetsByKey(programKey string) (int64, error) {
 	return dbInstance.DeleteProgramScopeAssetsByKey(programKey)
 }
 
+// TruncateProgramScopeAssets wipes every program_assets row.
+func TruncateProgramScopeAssets() (int64, error) {
+	if dbInstance == nil {
+		if err := Init(); err != nil {
+			return 0, err
+		}
+	}
+	return dbInstance.TruncateProgramScopeAssets()
+}
+
+// DeleteMonitorChangesByType clears monitor_changes rows of the given change type.
+func DeleteMonitorChangesByType(changeType string) (int64, error) {
+	if dbInstance == nil {
+		if err := Init(); err != nil {
+			return 0, err
+		}
+	}
+	return dbInstance.DeleteMonitorChangesByType(changeType)
+}
+
 // InsertKeyhackTemplate inserts or updates a KeyHack template
 func InsertKeyhackTemplate(keyname, commandTemplate, method, url, header, body, notes, description string) error {
 	if dbInstance == nil {

internal/db/postgres.go

@@ -727,6 +727,24 @@ func (p *PostgresDB) DeleteProgramScopeAssetsByKey(programKey string) (int64, er
 	return tag.RowsAffected(), nil
 }
 
+// TruncateProgramScopeAssets wipes every program_assets row.
+func (p *PostgresDB) TruncateProgramScopeAssets() (int64, error) {
+	tag, err := p.pool.Exec(p.ctx, `DELETE FROM program_assets;`)
+	if err != nil {
+		return 0, fmt.Errorf("failed to truncate program_assets: %v", err)
+	}
+	return tag.RowsAffected(), nil
+}
+
+// DeleteMonitorChangesByType clears monitor_changes rows of the given change type.
+func (p *PostgresDB) DeleteMonitorChangesByType(changeType string) (int64, error) {
+	tag, err := p.pool.Exec(p.ctx, `DELETE FROM monitor_changes WHERE change_type = $1;`, changeType)
+	if err != nil {
+		return 0, fmt.Errorf("failed to delete monitor_changes by type: %v", err)
+	}
+	return tag.RowsAffected(), nil
+}
+
 // RecordProgramScopeAssets diffs+stores the current asset set, returning newly-seen assets.
 func (p *PostgresDB) RecordProgramScopeAssets(programKey string, assets []string) ([]string, bool, error) {
 	existing, err := p.ListProgramScopeAssets(programKey)

internal/db/sqlite.go

@@ -605,6 +605,26 @@ func (s *SQLiteDB) DeleteProgramScopeAssetsByKey(programKey string) (int64, erro
 	return n, nil
 }
 
+// TruncateProgramScopeAssets wipes every program_assets row.
+func (s *SQLiteDB) TruncateProgramScopeAssets() (int64, error) {
+	res, err := s.db.Exec(`DELETE FROM program_assets;`)
+	if err != nil {
+		return 0, fmt.Errorf("failed to truncate program_assets: %v", err)
+	}
+	n, _ := res.RowsAffected()
+	return n, nil
+}
+
+// DeleteMonitorChangesByType clears monitor_changes rows of the given change type.
+func (s *SQLiteDB) DeleteMonitorChangesByType(changeType string) (int64, error) {
+	res, err := s.db.Exec(`DELETE FROM monitor_changes WHERE change_type = ?;`, changeType)
+	if err != nil {
+		return 0, fmt.Errorf("failed to delete monitor_changes by type: %v", err)
+	}
+	n, _ := res.RowsAffected()
+	return n, nil
+}
+
 // RecordProgramScopeAssets diffs+stores the current asset set, returning newly-seen assets.
 func (s *SQLiteDB) RecordProgramScopeAssets(programKey string, assets []string) ([]string, bool, error) {
 	existing, err := s.ListProgramScopeAssets(programKey)

internal/db/types.go

@@ -125,6 +125,12 @@ type DB interface {
 	// Used at boot to clean rows poisoned by past identifier-collision bugs (e.g. all
 	// Intigriti programs ending up under "it:detail").
 	DeleteProgramScopeAssetsByKey(programKey string) (int64, error)
+	// TruncateProgramScopeAssets wipes every program_assets row. Used by the one-shot
+	// program-monitor reset so all programs re-baseline silently after a known-bad build.
+	TruncateProgramScopeAssets() (int64, error)
+	// DeleteMonitorChangesByType clears monitor_changes rows of the given change type.
+	// Used to scrub the historical flood of false "new_program_asset" entries.
+	DeleteMonitorChangesByType(changeType string) (int64, error)
 
 	// DNS Takeover Providers
 	ListVulnerableDNSProviders() (map[string]string, error)