appview: handle non-unique publicKey records #999

+17 -7

appview/db/pubkeys.go

··· 5 5 "time" 6 6 ) 7 7 8 8 - func AddPublicKey(e Execer, did, name, key, rkey string) error { 8 8 + func UpsertPublicKey(e Execer, pubKey models.PublicKey) error { 9 9 _, err := e.Exec( 10 10 - `insert or ignore into public_keys (did, name, key, rkey) 11 11 - values (?, ?, ?, ?)`, 12 12 - did, name, key, rkey) 10 10 + `insert into public_keys (did, rkey, name, key, created) 11 11 + values (?, ?, ?, ?, ?) 12 12 + on conflict(did, rkey) do update set 13 13 + name = excluded.name, 14 14 + key = excluded.key, 15 15 + created = excluded.created`, 16 16 + pubKey.Did, 17 17 + pubKey.Rkey, 18 18 + pubKey.Name, 19 19 + pubKey.Key, 20 20 + pubKey.Created.Format(time.RFC3339), 21 21 + ) 13 22 return err 14 23 } 15 24 16 16 - func DeletePublicKey(e Execer, did, name, key string) error { 25 25 + // for public_keys with empty rkey 26 26 + func DeletePublicKeyLegacy(e Execer, did, name string) error { 17 27 _, err := e.Exec(` 18 28 delete from public_keys 19 19 - where did = ? and name = ? and key = ?`, 20 20 - did, name, key) 29 29 + where did = ? and name = ? and rkey = ''`, 30 30 + did, name) 21 31 return err 22 32 } 23 33

+13 -3

appview/ingester.go

··· 131 131 if err != nil { 132 132 return fmt.Errorf("failed to %s star record: %w", e.Commit.Operation, err) 133 133 } 134 134 + l.Info("processed star", "operation", e.Commit.Operation, "rkey", e.Commit.RKey) 134 135 135 136 return nil 136 137 } ··· 164 165 if err != nil { 165 166 return fmt.Errorf("failed to %s follow record: %w", e.Commit.Operation, err) 166 167 } 168 168 + l.Info("processed follow", "operation", e.Commit.Operation, "rkey", e.Commit.RKey) 167 169 168 170 return nil 169 171 } ··· 185 187 l.Error("invalid record", "err", err) 186 188 return err 187 189 } 190 190 + pubKey, err := models.PublicKeyFromRecord(syntax.DID(did), syntax.RecordKey(e.Commit.RKey), record) 191 191 + if err != nil { 192 192 + l.Error("invalid record", "err", err) 193 193 + return err 194 194 + } 195 195 + if err := pubKey.Validate(); err != nil { 196 196 + l.Error("invalid record", "err", err) 197 197 + return err 198 198 + } 188 199 189 189 - name := record.Name 190 190 - key := record.Key 191 191 - err = db.AddPublicKey(i.Db, did, name, key, e.Commit.RKey) 200 200 + err = db.UpsertPublicKey(i.Db, pubKey) 192 201 case jmodels.CommitOperationDelete: 193 202 l.Debug("processing delete of pubkey") 194 203 err = db.DeletePublicKeyByRkey(i.Db, did, e.Commit.RKey) ··· 197 206 if err != nil { 198 207 return fmt.Errorf("failed to %s pubkey record: %w", e.Commit.Operation, err) 199 208 } 209 209 + l.Info("processed pubkey", "operation", e.Commit.Operation, "rkey", e.Commit.RKey) 200 210 201 211 return nil 202 212 }

+38

appview/models/pubkey.go

··· 2 2 3 3 import ( 4 4 "encoding/json" 5 5 + "fmt" 5 6 "time" 7 7 + 8 8 + "github.com/bluesky-social/indigo/atproto/syntax" 9 9 + "github.com/gliderlabs/ssh" 10 10 + "tangled.org/core/api/tangled" 6 11 ) 7 12 8 13 type PublicKey struct { ··· 23 28 Alias: (*Alias)(&p), 24 29 }) 25 30 } 31 31 + 32 32 + func (p *PublicKey) AsRecord() tangled.PublicKey { 33 33 + return tangled.PublicKey{ 34 34 + Name: p.Name, 35 35 + Key: p.Key, 36 36 + CreatedAt: p.Created.Format(time.RFC3339), 37 37 + } 38 38 + } 39 39 + 40 40 + var _ Validator = new(PublicKey) 41 41 + 42 42 + func (p *PublicKey) Validate() error { 43 43 + if _, _, _, _, err := ssh.ParseAuthorizedKey([]byte(p.Key)); err != nil { 44 44 + return fmt.Errorf("invalid ssh key format: %w", err) 45 45 + } 46 46 + 47 47 + return nil 48 48 + } 49 49 + 50 50 + func PublicKeyFromRecord(did syntax.DID, rkey syntax.RecordKey, record tangled.PublicKey) (PublicKey, error) { 51 51 + created, err := time.Parse(time.RFC3339, record.CreatedAt) 52 52 + if err != nil { 53 53 + return PublicKey{}, fmt.Errorf("invalid time format '%s'", record.CreatedAt) 54 54 + } 55 55 + 56 56 + return PublicKey{ 57 57 + Did: did.String(), 58 58 + Rkey: rkey.String(), 59 59 + Name: record.Name, 60 60 + Key: record.Key, 61 61 + Created: &created, 62 62 + }, nil 63 63 + }

+1 -1

appview/pages/templates/user/settings/fragments/keyListing.html

··· 19 19 <button 20 20 class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 21 21 title="Delete key" 22 22 - hx-delete="/settings/keys?name={{urlquery $key.Name}}&rkey={{urlquery $key.Rkey}}&key={{urlquery $key.Key}}" 22 22 + hx-delete="/settings/keys?name={{urlquery $key.Name}}&rkey={{urlquery $key.Rkey}}" 23 23 hx-swap="none" 24 24 hx-confirm="Are you sure you want to delete the key {{ $key.Name }}?" 25 25 >

+39 -36

appview/settings/settings.go

··· 24 24 comatproto "github.com/bluesky-social/indigo/api/atproto" 25 25 "github.com/bluesky-social/indigo/atproto/syntax" 26 26 lexutil "github.com/bluesky-social/indigo/lex/util" 27 27 - "github.com/gliderlabs/ssh" 28 27 "github.com/google/uuid" 29 28 ) 30 29 ··· 440 439 log.Println("unimplemented") 441 440 return 442 441 case http.MethodPut: 443 443 - did := s.OAuth.GetDid(r) 444 444 - key := r.FormValue("key") 445 445 - key = strings.TrimSpace(key) 446 446 - name := r.FormValue("name") 447 447 - client, err := s.OAuth.AuthorizedClient(r) 448 448 - if err != nil { 449 449 - s.Pages.Notice(w, "settings-keys", "Failed to authorize. Try again later.") 450 450 - return 442 442 + created := time.Now() 443 443 + pubKey := models.PublicKey{ 444 444 + Did: s.OAuth.GetDid(r), 445 445 + Rkey: tid.TID(), 446 446 + Name: r.FormValue("name"), 447 447 + Key: strings.TrimSpace(r.FormValue("key")), 448 448 + Created: &created, 451 449 } 452 450 453 453 - _, _, _, _, err = ssh.ParseAuthorizedKey([]byte(key)) 454 454 - if err != nil { 451 451 + if err := pubKey.Validate(); err != nil { 455 452 log.Printf("parsing public key: %s", err) 456 453 s.Pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.") 457 454 return 458 455 } 459 456 460 460 - rkey := tid.TID() 461 461 - 462 457 tx, err := s.Db.Begin() 463 458 if err != nil { 464 459 log.Printf("failed to start tx; adding public key: %s", err) ··· 467 462 } 468 463 defer tx.Rollback() 469 464 470 470 - if err := db.AddPublicKey(tx, did, name, key, rkey); err != nil { 465 465 + if err = db.UpsertPublicKey(s.Db, pubKey); err != nil { 471 466 log.Printf("adding public key: %s", err) 472 467 s.Pages.Notice(w, "settings-keys", "Failed to add public key.") 473 468 return 474 469 } 475 470 471 471 + client, err := s.OAuth.AuthorizedClient(r) 472 472 + if err != nil { 473 473 + s.Pages.Notice(w, "settings-keys", "Failed to authorize. Try again later.") 474 474 + return 475 475 + } 476 476 + 476 477 // store in pds too 478 478 + record := pubKey.AsRecord() 477 479 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 478 480 Collection: tangled.PublicKeyNSID, 479 479 - Repo: did, 480 480 - Rkey: rkey, 481 481 + Repo: pubKey.Did, 482 482 + Rkey: pubKey.Rkey, 481 483 Record: &lexutil.LexiconTypeDecoder{ 482 482 - Val: &tangled.PublicKey{ 483 483 - CreatedAt: time.Now().Format(time.RFC3339), 484 484 - Key: key, 485 485 - Name: name, 486 486 - }}, 484 484 + Val: &record, 485 485 + }, 487 486 }) 488 487 // invalid record 489 488 if err != nil { ··· 510 509 511 510 name := q.Get("name") 512 511 rkey := q.Get("rkey") 513 513 - key := q.Get("key") 514 512 515 513 log.Println(name) 516 514 log.Println(rkey) 517 517 - log.Println(key) 518 515 519 519 - client, err := s.OAuth.AuthorizedClient(r) 520 520 - if err != nil { 521 521 - log.Printf("failed to authorize client: %s", err) 522 522 - s.Pages.Notice(w, "settings-keys", "Failed to authorize client.") 523 523 - return 524 524 - } 516 516 + if rkey == "" { 517 517 + if err := db.DeletePublicKeyLegacy(s.Db, did, name); err != nil { 518 518 + log.Printf("removing public key: %s", err) 519 519 + s.Pages.Notice(w, "settings-keys", "Failed to remove public key.") 520 520 + return 521 521 + } 522 522 + } else { 523 523 + if err := db.DeletePublicKeyByRkey(s.Db, did, rkey); err != nil { 524 524 + log.Printf("removing public key: %s", err) 525 525 + s.Pages.Notice(w, "settings-keys", "Failed to remove public key.") 526 526 + return 527 527 + } 525 528 526 526 - if err := db.DeletePublicKey(s.Db, did, name, key); err != nil { 527 527 - log.Printf("removing public key: %s", err) 528 528 - s.Pages.Notice(w, "settings-keys", "Failed to remove public key.") 529 529 - return 530 530 - } 529 529 + client, err := s.OAuth.AuthorizedClient(r) 530 530 + if err != nil { 531 531 + log.Printf("failed to authorize client: %s", err) 532 532 + s.Pages.Notice(w, "settings-keys", "Failed to authorize client.") 533 533 + return 534 534 + } 531 535 532 532 - if rkey != "" { 533 536 // remove from pds too 534 534 - _, err := comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 537 537 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 535 538 Collection: tangled.PublicKeyNSID, 536 539 Repo: did, 537 540 Rkey: rkey,