From 12ca40538ed93892c108650f97e9aedda4580d3c Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Tue, 25 Jun 2019 20:49:25 -0400 Subject: [PATCH] fix stale pubkey deletion --- fun.go | 3 +-- honk.go | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fun.go b/fun.go index 117bf91..b0c280a 100644 --- a/fun.go +++ b/fun.go @@ -455,8 +455,7 @@ func zaggy(keyname string) (key *rsa.PublicKey) { } func makeitworksomehowwithoutregardforkeycontinuity(keyname string, r *http.Request, payload []byte) (string, error) { - db := opendatabase() - _, err := db.Exec("delete from xonkers where xid = ?", keyname) + _, err := stmtDeleteXonker.Exec(keyname, "pubkey") if err != nil { log.Printf("error deleting key: %s", err) } diff --git a/honk.go b/honk.go index b14a36e..a60e5e1 100644 --- a/honk.go +++ b/honk.go @@ -1485,7 +1485,7 @@ var stmtHonksByHonker, stmtSaveHonk, stmtFileData, stmtWhatAbout *sql.Stmt var stmtFindZonk, stmtFindXonk, stmtSaveDonk, stmtFindFile, stmtSaveFile *sql.Stmt var stmtAddDoover, stmtGetDoovers, stmtLoadDoover, stmtZapDoover *sql.Stmt var stmtHasHonker, stmtThumbBiters, stmtZonkIt, stmtZonkDonks, stmtSaveZonker *sql.Stmt -var stmtGetZonkers, stmtRecentHonkers, stmtGetXonker, stmtSaveXonker *sql.Stmt +var stmtGetZonkers, stmtRecentHonkers, stmtGetXonker, stmtSaveXonker, stmtDeleteXonker *sql.Stmt func preparetodie(db *sql.DB, s string) *sql.Stmt { stmt, err := db.Prepare(s) @@ -1536,6 +1536,7 @@ func prepareStatements(db *sql.DB) { stmtSaveZonker = preparetodie(db, "insert into zonkers (userid, name, wherefore) values (?, ?, ?)") stmtGetXonker = preparetodie(db, "select info from xonkers where name = ? and flavor = ?") stmtSaveXonker = preparetodie(db, "insert into xonkers (name, info, flavor) values (?, ?, ?)") + stmtDeleteXonker = preparetodie(db, "delete from xonkers where name = ? and flavor = ?") stmtRecentHonkers = preparetodie(db, "select distinct(honker) from honks where userid = ? order by honkid desc limit 100") }