tangled.org
Monorepo for Tangled
tangled.org
appview: handle non-unique publicKey records
- upsert public key to handle record update event
- don't delete by pair of name and key. delete by name or rkey instead.
Signed-off-by: Seongmin Lee <git@boltless.me>
boltless.me
+17
-7
appview/db/pubkeys.go
+17
-7
appview/db/pubkeys.go
···
5
"time"
6
)
7
8
-
func AddPublicKey(e Execer, did, name, key, rkey string) error {
9
_, err := e.Exec(
10
-
`insert or ignore into public_keys (did, name, key, rkey)
11
-
values (?, ?, ?, ?)`,
12
-
did, name, key, rkey)
13
return err
14
}
15
16
-
func DeletePublicKey(e Execer, did, name, key string) error {
17
_, err := e.Exec(`
18
delete from public_keys
19
-
where did = ? and name = ? and key = ?`,
20
-
did, name, key)
21
return err
22
}
23
···
5
"time"
6
)
7
8
+
func UpsertPublicKey(e Execer, pubKey models.PublicKey) error {
9
_, err := e.Exec(
10
+
`insert into public_keys (did, rkey, name, key, created)
11
+
values (?, ?, ?, ?, ?)
12
+
on conflict(did, rkey) do update set
13
+
name = excluded.name,
14
+
key = excluded.key,
15
+
created = excluded.created`,
16
+
pubKey.Did,
17
+
pubKey.Rkey,
18
+
pubKey.Name,
19
+
pubKey.Key,
20
+
pubKey.Created.Format(time.RFC3339),
21
+
)
22
return err
23
}
24
25
+
// for public_keys with empty rkey
26
+
func DeletePublicKeyLegacy(e Execer, did, name string) error {
27
_, err := e.Exec(`
28
delete from public_keys
29
+
where did = ? and name = ? and rkey = ''`,
30
+
did, name)
31
return err
32
}
33
+13
-3
appview/ingester.go
+13
-3
appview/ingester.go
···
131
if err != nil {
132
return fmt.Errorf("failed to %s star record: %w", e.Commit.Operation, err)
133
}
134
135
return nil
136
}
···
164
if err != nil {
165
return fmt.Errorf("failed to %s follow record: %w", e.Commit.Operation, err)
166
}
167
168
return nil
169
}
···
185
l.Error("invalid record", "err", err)
186
return err
187
}
188
189
-
name := record.Name
190
-
key := record.Key
191
-
err = db.AddPublicKey(i.Db, did, name, key, e.Commit.RKey)
192
case jmodels.CommitOperationDelete:
193
l.Debug("processing delete of pubkey")
194
err = db.DeletePublicKeyByRkey(i.Db, did, e.Commit.RKey)
···
197
if err != nil {
198
return fmt.Errorf("failed to %s pubkey record: %w", e.Commit.Operation, err)
199
}
200
201
return nil
202
}
···
131
if err != nil {
132
return fmt.Errorf("failed to %s star record: %w", e.Commit.Operation, err)
133
}
134
+
l.Info("processed star", "operation", e.Commit.Operation, "rkey", e.Commit.RKey)
135
136
return nil
137
}
···
165
if err != nil {
166
return fmt.Errorf("failed to %s follow record: %w", e.Commit.Operation, err)
167
}
168
+
l.Info("processed follow", "operation", e.Commit.Operation, "rkey", e.Commit.RKey)
169
170
return nil
171
}
···
187
l.Error("invalid record", "err", err)
188
return err
189
}
190
+
pubKey, err := models.PublicKeyFromRecord(syntax.DID(did), syntax.RecordKey(e.Commit.RKey), record)
191
+
if err != nil {
192
+
l.Error("invalid record", "err", err)
193
+
return err
194
+
}
195
+
if err := pubKey.Validate(); err != nil {
196
+
l.Error("invalid record", "err", err)
197
+
return err
198
+
}
199
200
+
err = db.UpsertPublicKey(i.Db, pubKey)
201
case jmodels.CommitOperationDelete:
202
l.Debug("processing delete of pubkey")
203
err = db.DeletePublicKeyByRkey(i.Db, did, e.Commit.RKey)
···
206
if err != nil {
207
return fmt.Errorf("failed to %s pubkey record: %w", e.Commit.Operation, err)
208
}
209
+
l.Info("processed pubkey", "operation", e.Commit.Operation, "rkey", e.Commit.RKey)
210
211
return nil
212
}
+38
appview/models/pubkey.go
+38
appview/models/pubkey.go
···
2
3
import (
4
"encoding/json"
5
+
"fmt"
6
"time"
7
+
8
+
"github.com/bluesky-social/indigo/atproto/syntax"
9
+
"github.com/gliderlabs/ssh"
10
+
"tangled.org/core/api/tangled"
11
)
12
13
type PublicKey struct {
···
28
Alias: (*Alias)(&p),
29
})
30
}
31
+
32
+
func (p *PublicKey) AsRecord() tangled.PublicKey {
33
+
return tangled.PublicKey{
34
+
Name: p.Name,
35
+
Key: p.Key,
36
+
CreatedAt: p.Created.Format(time.RFC3339),
37
+
}
38
+
}
39
+
40
+
var _ Validator = new(PublicKey)
41
+
42
+
func (p *PublicKey) Validate() error {
43
+
if _, _, _, _, err := ssh.ParseAuthorizedKey([]byte(p.Key)); err != nil {
44
+
return fmt.Errorf("invalid ssh key format: %w", err)
45
+
}
46
+
47
+
return nil
48
+
}
49
+
50
+
func PublicKeyFromRecord(did syntax.DID, rkey syntax.RecordKey, record tangled.PublicKey) (PublicKey, error) {
51
+
created, err := time.Parse(time.RFC3339, record.CreatedAt)
52
+
if err != nil {
53
+
return PublicKey{}, fmt.Errorf("invalid time format '%s'", record.CreatedAt)
54
+
}
55
+
56
+
return PublicKey{
57
+
Did: did.String(),
58
+
Rkey: rkey.String(),
59
+
Name: record.Name,
60
+
Key: record.Key,
61
+
Created: &created,
62
+
}, nil
63
+
}
+1
-1
appview/pages/templates/user/settings/fragments/keyListing.html
+1
-1
appview/pages/templates/user/settings/fragments/keyListing.html
···
19
<button
20
class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"
21
title="Delete key"
22
-
hx-delete="/settings/keys?name={{urlquery $key.Name}}&rkey={{urlquery $key.Rkey}}&key={{urlquery $key.Key}}"
23
hx-swap="none"
24
hx-confirm="Are you sure you want to delete the key {{ $key.Name }}?"
25
>
···
19
<button
20
class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"
21
title="Delete key"
22
+
hx-delete="/settings/keys?name={{urlquery $key.Name}}&rkey={{urlquery $key.Rkey}}"
23
hx-swap="none"
24
hx-confirm="Are you sure you want to delete the key {{ $key.Name }}?"
25
>
+39
-36
appview/settings/settings.go
+39
-36
appview/settings/settings.go
···
24
comatproto "github.com/bluesky-social/indigo/api/atproto"
25
"github.com/bluesky-social/indigo/atproto/syntax"
26
lexutil "github.com/bluesky-social/indigo/lex/util"
27
-
"github.com/gliderlabs/ssh"
28
"github.com/google/uuid"
29
)
30
···
424
log.Println("unimplemented")
425
return
426
case http.MethodPut:
427
-
did := s.OAuth.GetDid(r)
428
-
key := r.FormValue("key")
429
-
key = strings.TrimSpace(key)
430
-
name := r.FormValue("name")
431
-
client, err := s.OAuth.AuthorizedClient(r)
432
-
if err != nil {
433
-
s.Pages.Notice(w, "settings-keys", "Failed to authorize. Try again later.")
434
-
return
435
}
436
437
-
_, _, _, _, err = ssh.ParseAuthorizedKey([]byte(key))
438
-
if err != nil {
439
log.Printf("parsing public key: %s", err)
440
s.Pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.")
441
return
442
}
443
444
-
rkey := tid.TID()
445
-
446
tx, err := s.Db.Begin()
447
if err != nil {
448
log.Printf("failed to start tx; adding public key: %s", err)
···
451
}
452
defer tx.Rollback()
453
454
-
if err := db.AddPublicKey(tx, did, name, key, rkey); err != nil {
455
log.Printf("adding public key: %s", err)
456
s.Pages.Notice(w, "settings-keys", "Failed to add public key.")
457
return
458
}
459
460
// store in pds too
461
resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
462
Collection: tangled.PublicKeyNSID,
463
-
Repo: did,
464
-
Rkey: rkey,
465
Record: &lexutil.LexiconTypeDecoder{
466
-
Val: &tangled.PublicKey{
467
-
CreatedAt: time.Now().Format(time.RFC3339),
468
-
Key: key,
469
-
Name: name,
470
-
}},
471
})
472
// invalid record
473
if err != nil {
···
494
495
name := q.Get("name")
496
rkey := q.Get("rkey")
497
-
key := q.Get("key")
498
499
log.Println(name)
500
log.Println(rkey)
501
-
log.Println(key)
502
503
-
client, err := s.OAuth.AuthorizedClient(r)
504
-
if err != nil {
505
-
log.Printf("failed to authorize client: %s", err)
506
-
s.Pages.Notice(w, "settings-keys", "Failed to authorize client.")
507
-
return
508
-
}
509
510
-
if err := db.DeletePublicKey(s.Db, did, name, key); err != nil {
511
-
log.Printf("removing public key: %s", err)
512
-
s.Pages.Notice(w, "settings-keys", "Failed to remove public key.")
513
-
return
514
-
}
515
516
-
if rkey != "" {
517
// remove from pds too
518
-
_, err := comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{
519
Collection: tangled.PublicKeyNSID,
520
Repo: did,
521
Rkey: rkey,
···
24
comatproto "github.com/bluesky-social/indigo/api/atproto"
25
"github.com/bluesky-social/indigo/atproto/syntax"
26
lexutil "github.com/bluesky-social/indigo/lex/util"
27
"github.com/google/uuid"
28
)
29
···
423
log.Println("unimplemented")
424
return
425
case http.MethodPut:
426
+
created := time.Now()
427
+
pubKey := models.PublicKey{
428
+
Did: s.OAuth.GetDid(r),
429
+
Rkey: tid.TID(),
430
+
Name: r.FormValue("name"),
431
+
Key: strings.TrimSpace(r.FormValue("key")),
432
+
Created: &created,
433
}
434
435
+
if err := pubKey.Validate(); err != nil {
436
log.Printf("parsing public key: %s", err)
437
s.Pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.")
438
return
439
}
440
441
tx, err := s.Db.Begin()
442
if err != nil {
443
log.Printf("failed to start tx; adding public key: %s", err)
···
446
}
447
defer tx.Rollback()
448
449
+
if err = db.UpsertPublicKey(s.Db, pubKey); err != nil {
450
log.Printf("adding public key: %s", err)
451
s.Pages.Notice(w, "settings-keys", "Failed to add public key.")
452
+
return
453
+
}
454
+
455
+
client, err := s.OAuth.AuthorizedClient(r)
456
+
if err != nil {
457
+
s.Pages.Notice(w, "settings-keys", "Failed to authorize. Try again later.")
458
return
459
}
460
461
// store in pds too
462
+
record := pubKey.AsRecord()
463
resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
464
Collection: tangled.PublicKeyNSID,
465
+
Repo: pubKey.Did,
466
+
Rkey: pubKey.Rkey,
467
Record: &lexutil.LexiconTypeDecoder{
468
+
Val: &record,
469
+
},
470
})
471
// invalid record
472
if err != nil {
···
493
494
name := q.Get("name")
495
rkey := q.Get("rkey")
496
497
log.Println(name)
498
log.Println(rkey)
499
500
+
if rkey == "" {
501
+
if err := db.DeletePublicKeyLegacy(s.Db, did, name); err != nil {
502
+
log.Printf("removing public key: %s", err)
503
+
s.Pages.Notice(w, "settings-keys", "Failed to remove public key.")
504
+
return
505
+
}
506
+
} else {
507
+
if err := db.DeletePublicKeyByRkey(s.Db, did, rkey); err != nil {
508
+
log.Printf("removing public key: %s", err)
509
+
s.Pages.Notice(w, "settings-keys", "Failed to remove public key.")
510
+
return
511
+
}
512
513
+
client, err := s.OAuth.AuthorizedClient(r)
514
+
if err != nil {
515
+
log.Printf("failed to authorize client: %s", err)
516
+
s.Pages.Notice(w, "settings-keys", "Failed to authorize client.")
517
+
return
518
+
}
519
520
// remove from pds too
521
+
_, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{
522
Collection: tangled.PublicKeyNSID,
523
Repo: did,
524
Rkey: rkey,