dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache works better when we put stuff in it

This commit is contained in:
Ted Unangst 2019-04-14 13:20:56 -04:00
parent 1acb85d047
commit a80a156718
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fun.go
View File

@ -219,12 +219,13 @@ func oneofakind(a []string) []string {
} }
var ziggies = make(map[string]*rsa.PrivateKey) var ziggies = make(map[string]*rsa.PrivateKey)
var zaggies = make(map[string]*rsa.PublicKey)
var ziggylock sync.Mutex var ziggylock sync.Mutex
func ziggy(username string) (keyname string, key *rsa.PrivateKey) { func ziggy(username string) (keyname string, key *rsa.PrivateKey) {
ziggylock.Lock() ziggylock.Lock()
defer ziggylock.Unlock()
key = ziggies[username] key = ziggies[username]
ziggylock.Unlock()
if key == nil { if key == nil {
db := opendatabase() db := opendatabase()
row := db.QueryRow("select seckey from users where username = ?", username) row := db.QueryRow("select seckey from users where username = ?", username)
@ -233,22 +234,31 @@ func ziggy(username string) (keyname string, key *rsa.PrivateKey) {
var err error var err error
key, _, err = pez(data) key, _, err = pez(data)
if err != nil { if err != nil {
log.Printf("error loading %s seckey: %s", username, err) log.Printf("error decoding %s seckey: %s", username, err)
return return
} }
ziggylock.Lock()
ziggies[username] = key
ziggylock.Unlock()
} }
keyname = fmt.Sprintf("https://%s/u/%s#key", serverName, username) keyname = fmt.Sprintf("https://%s/u/%s#key", serverName, username)
return return
} }
func zaggy(keyname string) (key *rsa.PublicKey) { func zaggy(keyname string) (key *rsa.PublicKey) {
ziggylock.Lock()
key = zaggies[keyname]
ziggylock.Unlock()
if key != nil {
return
}
db := opendatabase() db := opendatabase()
row := db.QueryRow("select pubkey from honkers where flavor = 'key' and xid = ?", keyname) row := db.QueryRow("select pubkey from honkers where flavor = 'key' and xid = ?", keyname)
var data string var data string
err := row.Scan(&data) err := row.Scan(&data)
savekey := false savekey := false
if err != nil { if err != nil {
savekey = true log.Printf("hitting the webs for missing pubkey: %s", keyname)
j, err := GetJunk(keyname) j, err := GetJunk(keyname)
if err != nil { if err != nil {
log.Printf("error getting %s pubkey: %s", keyname, err) log.Printf("error getting %s pubkey: %s", keyname, err)
@ -265,12 +275,16 @@ func zaggy(keyname string) (key *rsa.PublicKey) {
log.Printf("error getting %s pubkey owner", keyname) log.Printf("error getting %s pubkey owner", keyname)
return return
} }
savekey = true
} }
_, key, err = pez(data) _, key, err = pez(data)
if err != nil { if err != nil {
log.Printf("error getting %s pubkey: %s", keyname, err) log.Printf("error decoding %s pubkey: %s", keyname, err)
return return
} }
ziggylock.Lock()
zaggies[keyname] = key
ziggylock.Unlock()
if savekey { if savekey {
db.Exec("insert into honkers (name, xid, flavor, pubkey) values (?, ?, ?, ?)", db.Exec("insert into honkers (name, xid, flavor, pubkey) values (?, ?, ?, ?)",
"", keyname, "key", data) "", keyname, "key", data)