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

simplify slightly

This commit is contained in:
Ted Unangst 2019-04-20 11:41:20 -04:00
parent 30e1657d7a
commit f5f334ba31
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fun.go
View File

@ -265,7 +265,6 @@ func zaggy(keyname string) (key *rsa.PublicKey) {
row := db.QueryRow("select pubkey from xonkers where xid = ?", keyname)
var data string
err := row.Scan(&data)
savekey := false
if err != nil {
log.Printf("hitting the webs for missing pubkey: %s", keyname)
j, err := GetJunk(keyname)
@ -276,28 +275,31 @@ func zaggy(keyname string) (key *rsa.PublicKey) {
var ok bool
data, ok = jsonfindstring(j, []string{"publicKey", "publicKeyPem"})
if !ok {
log.Printf("error getting %s pubkey", keyname)
log.Printf("error finding %s pubkey", keyname)
return
}
_, ok = jsonfindstring(j, []string{"publicKey", "owner"})
if !ok {
log.Printf("error getting %s pubkey owner", keyname)
log.Printf("error finding %s pubkey owner", keyname)
return
}
_, key, err = pez(data)
if err != nil {
log.Printf("error decoding %s pubkey: %s", keyname, err)
return
}
db.Exec("insert into xonkers (xid, ibox, obox, sbox, pubkey) values (?, ?, ?, ?, ?)",
keyname, "", "", "", data)
} else {
_, key, err = pez(data)
if err != nil {
log.Printf("error decoding %s pubkey: %s", keyname, err)
return
}
savekey = true
}
_, key, err = pez(data)
if err != nil {
log.Printf("error decoding %s pubkey: %s", keyname, err)
return
}
ziggylock.Lock()
zaggies[keyname] = key
ziggylock.Unlock()
if savekey {
db.Exec("insert into xonkers (xid, ibox, obox, sbox, pubkey) values (?, ?, ?, ?, ?)",
keyname, "", "", "", data)
}
return
}