diff --git a/auth.go b/auth.go index b50670d..e594b73 100644 --- a/auth.go +++ b/auth.go @@ -76,7 +76,7 @@ func whitelistListHandler(cfg Config, db *sql.DB) http.HandlerFunc { http.Error(w, "unauthorized", http.StatusUnauthorized) return } - entries, err := ListTempEntries(db) + entries, err := ListPermEntries(db) if err != nil { http.Error(w, "database error", http.StatusInternalServerError) return diff --git a/db.go b/db.go index 280baf8..64c9da4 100644 --- a/db.go +++ b/db.go @@ -190,20 +190,19 @@ func ListTempEntries(db *sql.DB) ([]map[string]interface{}, error) { } func ListPermEntries(db *sql.DB) ([]map[string]interface{}, error) { - rows, err := db.Query(`SELECT ip FROM perm_whitelist ORDER BY ip`) + rows, err := db.Query(`SELECT entry, created_at FROM perm_whitelist ORDER BY created_at `) if err != nil { return nil, err } defer rows.Close() var list []map[string]interface{} for rows.Next() { - var ip, reason string - var expiresAt time.Time - if err := rows.Scan(&ip, &expiresAt, &reason); err != nil { + var entry string + if err := rows.Scan(&entry); err != nil { continue } list = append(list, map[string]interface{}{ - "ip": ip, + "entry": entry, }) } return list, nil