diff --git a/.gitignore b/.gitignore
index 5801d95..7b30cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,7 @@ go.work.sum
*.db-wal
# Temporary files
-*.tmp
\ No newline at end of file
+*.tmp
+
+# Raw AS data (we only commit the gzipped version)
+pkg/asinfo/asdata.json
\ No newline at end of file
diff --git a/Makefile b/Makefile
index beb0287..f84d9b8 100644
--- a/Makefile
+++ b/Makefile
@@ -25,5 +25,5 @@ run: build
asupdate:
@echo "Updating AS info data..."
- @go run cmd/asinfo-gen/main.go > pkg/asinfo/asdata.json.tmp && \
- mv pkg/asinfo/asdata.json.tmp pkg/asinfo/asdata.json
+ @go run cmd/asinfo-gen/main.go | gzip > pkg/asinfo/asdata.json.gz.tmp && \
+ mv pkg/asinfo/asdata.json.gz.tmp pkg/asinfo/asdata.json.gz
diff --git a/cmd/asinfo-gen/main.go b/cmd/asinfo-gen/main.go
index 8fe0a59..1d895b9 100644
--- a/cmd/asinfo-gen/main.go
+++ b/cmd/asinfo-gen/main.go
@@ -24,14 +24,16 @@ type ASInfo struct {
func main() {
// Configure logger to write to stderr
log.SetOutput(os.Stderr)
-
+
// Fetch the CSV data
log.Println("Fetching AS CSV data...")
resp, err := http.Get(asCsvURL)
if err != nil {
log.Fatalf("Failed to fetch CSV: %v", err)
}
- defer resp.Body.Close()
+ defer func() {
+ _ = resp.Body.Close()
+ }()
if resp.StatusCode != http.StatusOK {
log.Fatalf("Failed to fetch CSV: HTTP %d", resp.StatusCode)
@@ -39,13 +41,13 @@ func main() {
// Parse CSV
reader := csv.NewReader(resp.Body)
-
+
// Read header
header, err := reader.Read()
if err != nil {
log.Fatalf("Failed to read CSV header: %v", err)
}
-
+
if len(header) != 3 || header[0] != "asn" || header[1] != "handle" || header[2] != "description" {
log.Fatalf("Unexpected CSV header: %v", header)
}
@@ -59,17 +61,21 @@ func main() {
}
if err != nil {
log.Printf("Error reading CSV record: %v", err)
+
continue
}
- if len(record) != 3 {
+ const expectedFields = 3
+ if len(record) != expectedFields {
log.Printf("Skipping invalid record: %v", record)
+
continue
}
asn, err := strconv.Atoi(record[0])
if err != nil {
log.Printf("Invalid ASN %q: %v", record[0], err)
+
continue
}
@@ -88,4 +94,4 @@ func main() {
if err := encoder.Encode(asInfos); err != nil {
log.Fatalf("Failed to encode JSON: %v", err)
}
-}
\ No newline at end of file
+}
diff --git a/internal/database/database.go b/internal/database/database.go
index 286e1cc..393f676 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -57,6 +57,16 @@ CREATE TABLE IF NOT EXISTS asn_peerings (
UNIQUE(from_asn_id, to_asn_id)
);
+-- BGP peers that send us messages
+CREATE TABLE IF NOT EXISTS bgp_peers (
+ id TEXT PRIMARY KEY,
+ peer_ip TEXT UNIQUE NOT NULL,
+ peer_asn INTEGER NOT NULL,
+ first_seen DATETIME NOT NULL,
+ last_seen DATETIME NOT NULL,
+ last_message_type TEXT
+);
+
-- Live routing table: current state of announced routes
CREATE TABLE IF NOT EXISTS live_routes (
id TEXT PRIMARY KEY,
@@ -91,6 +101,10 @@ CREATE INDEX IF NOT EXISTS idx_live_routes_origin
CREATE INDEX IF NOT EXISTS idx_live_routes_prefix
ON live_routes(prefix_id)
WHERE withdrawn_at IS NULL;
+
+-- Indexes for bgp_peers table
+CREATE INDEX IF NOT EXISTS idx_bgp_peers_asn ON bgp_peers(peer_asn);
+CREATE INDEX IF NOT EXISTS idx_bgp_peers_last_seen ON bgp_peers(last_seen);
`
)
@@ -468,6 +482,52 @@ func (d *Database) GetActiveLiveRoutes() ([]LiveRoute, error) {
return routes, rows.Err()
}
+// UpdatePeer updates or creates a BGP peer record
+func (d *Database) UpdatePeer(peerIP string, peerASN int, messageType string, timestamp time.Time) error {
+ tx, err := d.db.Begin()
+ if err != nil {
+ return err
+ }
+ defer func() {
+ if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
+ d.logger.Error("Failed to rollback transaction", "error", err)
+ }
+ }()
+
+ var exists bool
+ err = tx.QueryRow("SELECT EXISTS(SELECT 1 FROM bgp_peers WHERE peer_ip = ?)", peerIP).Scan(&exists)
+ if err != nil {
+ return err
+ }
+
+ if exists {
+ _, err = tx.Exec(
+ "UPDATE bgp_peers SET peer_asn = ?, last_seen = ?, last_message_type = ? WHERE peer_ip = ?",
+ peerASN, timestamp, messageType, peerIP,
+ )
+ } else {
+ _, err = tx.Exec(
+ "INSERT INTO bgp_peers (id, peer_ip, peer_asn, first_seen, last_seen, last_message_type) VALUES (?, ?, ?, ?, ?, ?)",
+ generateUUID().String(), peerIP, peerASN, timestamp, timestamp, messageType,
+ )
+ }
+ if err != nil {
+ return err
+ }
+
+ if err = tx.Commit(); err != nil {
+ d.logger.Error("Failed to commit transaction for peer update",
+ "peer_ip", peerIP,
+ "peer_asn", peerASN,
+ "error", err,
+ )
+
+ return err
+ }
+
+ return nil
+}
+
// GetStats returns database statistics
func (d *Database) GetStats() (Stats, error) {
var stats Stats
diff --git a/internal/database/interface.go b/internal/database/interface.go
index fe05af5..ef933de 100644
--- a/internal/database/interface.go
+++ b/internal/database/interface.go
@@ -38,6 +38,9 @@ type Store interface {
// Statistics
GetStats() (Stats, error)
+ // Peer operations
+ UpdatePeer(peerIP string, peerASN int, messageType string, timestamp time.Time) error
+
// Lifecycle
Close() error
}
diff --git a/internal/routewatch/app.go b/internal/routewatch/app.go
index 6434a78..0d3bae1 100644
--- a/internal/routewatch/app.go
+++ b/internal/routewatch/app.go
@@ -76,6 +76,10 @@ func (rw *RouteWatch) Run(ctx context.Context) error {
dbHandler := NewDatabaseHandler(rw.db, rw.logger)
rw.streamer.RegisterHandler(dbHandler)
+ // Register peer tracking handler to track all peers
+ peerHandler := NewPeerHandler(rw.db, rw.logger)
+ rw.streamer.RegisterHandler(peerHandler)
+
// Start streaming
if err := rw.streamer.Start(); err != nil {
return err
diff --git a/internal/routewatch/app_integration_test.go b/internal/routewatch/app_integration_test.go
index c088438..59b79e3 100644
--- a/internal/routewatch/app_integration_test.go
+++ b/internal/routewatch/app_integration_test.go
@@ -158,6 +158,12 @@ func (m *mockStore) GetActiveLiveRoutes() ([]database.LiveRoute, error) {
return []database.LiveRoute{}, nil
}
+// UpdatePeer mock implementation
+func (m *mockStore) UpdatePeer(peerIP string, peerASN int, messageType string, timestamp time.Time) error {
+ // Simple mock - just return nil
+ return nil
+}
+
// Close mock implementation
func (m *mockStore) Close() error {
return nil
diff --git a/internal/routewatch/peerhandler.go b/internal/routewatch/peerhandler.go
new file mode 100644
index 0000000..1f7e7b8
--- /dev/null
+++ b/internal/routewatch/peerhandler.go
@@ -0,0 +1,49 @@
+package routewatch
+
+import (
+ "log/slog"
+ "strconv"
+
+ "git.eeqj.de/sneak/routewatch/internal/database"
+ "git.eeqj.de/sneak/routewatch/internal/ristypes"
+)
+
+// PeerHandler tracks BGP peers from all message types
+type PeerHandler struct {
+ db database.Store
+ logger *slog.Logger
+}
+
+// NewPeerHandler creates a new peer tracking handler
+func NewPeerHandler(db database.Store, logger *slog.Logger) *PeerHandler {
+ return &PeerHandler{
+ db: db,
+ logger: logger,
+ }
+}
+
+// WantsMessage returns true for all message types since we track peers from all messages
+func (h *PeerHandler) WantsMessage(_ string) bool {
+ return true
+}
+
+// HandleMessage processes a message to track peer information
+func (h *PeerHandler) HandleMessage(msg *ristypes.RISMessage) {
+ // Parse peer ASN from string
+ peerASN := 0
+ if msg.PeerASN != "" {
+ if asn, err := strconv.Atoi(msg.PeerASN); err == nil {
+ peerASN = asn
+ }
+ }
+
+ // Update peer in database
+ if err := h.db.UpdatePeer(msg.Peer, peerASN, msg.Type, msg.ParsedTimestamp); err != nil {
+ h.logger.Error("Failed to update peer",
+ "peer", msg.Peer,
+ "peer_asn", peerASN,
+ "message_type", msg.Type,
+ "error", err,
+ )
+ }
+}
diff --git a/internal/server/server.go b/internal/server/server.go
index d76ac5a..303565f 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -4,7 +4,6 @@ package server
import (
"context"
"encoding/json"
- "fmt"
"log/slog"
"net/http"
"os"
@@ -12,6 +11,7 @@ import (
"git.eeqj.de/sneak/routewatch/internal/database"
"git.eeqj.de/sneak/routewatch/internal/streamer"
+ "git.eeqj.de/sneak/routewatch/internal/templates"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
)
@@ -226,191 +226,11 @@ func (s *Server) handleStats() http.HandlerFunc {
func (s *Server) handleStatusHTML() http.HandlerFunc {
return func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
- if _, err := fmt.Fprint(w, statusHTML); err != nil {
- s.logger.Error("Failed to write HTML", "error", err)
+
+ tmpl := templates.StatusTemplate()
+ if err := tmpl.Execute(w, nil); err != nil {
+ s.logger.Error("Failed to render template", "error", err)
+ http.Error(w, "Internal Server Error", http.StatusInternalServerError)
}
}
}
-
-const statusHTML = `
-
-
-
-
- RouteWatch Status
-
-
-
- RouteWatch Status
-
-
-
-
Connection Status
-
- Status
- -
-
-
- Uptime
- -
-
-
-
-
-
Stream Statistics
-
- Total Messages
- -
-
-
- Messages/sec
- -
-
-
- Total Data
- -
-
-
- Throughput
- -
-
-
-
-
-
Database Statistics
-
- ASNs
- -
-
-
- Total Prefixes
- -
-
-
- IPv4 Prefixes
- -
-
-
- IPv6 Prefixes
- -
-
-
- Peerings
- -
-
-
- Live Routes
- -
-
-
-
RouteWatch Status
+
+
+
+
Connection Status
+
+ Status
+ -
+
+
+ Uptime
+ -
+
+
+
+
+
Stream Statistics
+
+ Total Messages
+ -
+
+
+ Messages/sec
+ -
+
+
+ Total Data
+ -
+
+
+ Throughput
+ -
+
+
+
+
+
Database Statistics
+
+ ASNs
+ -
+
+
+ Total Prefixes
+ -
+
+
+ IPv4 Prefixes
+ -
+
+
+ IPv6 Prefixes
+ -
+
+
+ Peerings
+ -
+
+
+ Live Routes
+ -
+
+
+