diff --git a/appview/db/db.go b/appview/db/db.go index d003b45d..e2d79ae4 100644 --- a/appview/db/db.go +++ b/appview/db/db.go @@ -140,6 +140,29 @@ func Make(dbPath string) (*DB, error) { return nil }) + runMigration(db, "add-rkey-to-pubkeys", func(tx *sql.Tx) error { + // add unconstrained column + _, err := tx.Exec(` + alter table public_keys + add column rkey text; + `) + if err != nil { + return err + } + + // backfill + _, err = tx.Exec(` + update public_keys + set rkey = '' + where rkey is null; + `) + if err != nil { + return err + } + + return nil + }) + return &DB{db}, nil } diff --git a/appview/db/pubkeys.go b/appview/db/pubkeys.go index 552745cc..3ef499b7 100644 --- a/appview/db/pubkeys.go +++ b/appview/db/pubkeys.go @@ -5,15 +5,19 @@ import ( "time" ) -func AddPublicKey(e Execer, did, name, key string) error { - query := `insert or ignore into public_keys (did, name, key) values (?, ?, ?)` - _, err := e.Exec(query, did, name, key) +func AddPublicKey(e Execer, did, name, key, rkey string) error { + _, err := e.Exec( + `insert or ignore into public_keys (did, name, key, rkey) + values (?, ?, ?, ?)`, + did, name, key, rkey) return err } -func RemovePublicKey(e Execer, did string) error { - query := `delete from public_keys where did = ?` - _, err := e.Exec(query, did) +func RemovePublicKey(e Execer, did, name, key string) error { + _, err := e.Exec(` + delete from public_keys + where did = ? and name = ? and key = ?`, + did, name, key) return err } @@ -21,6 +25,7 @@ type PublicKey struct { Did string `json:"did"` Key string `json:"key"` Name string `json:"name"` + Rkey string `json:"rkey"` Created *time.Time } @@ -38,7 +43,7 @@ func (p PublicKey) MarshalJSON() ([]byte, error) { func GetAllPublicKeys(e Execer) ([]PublicKey, error) { var keys []PublicKey - rows, err := e.Query(`select key, name, did, created from public_keys`) + rows, err := e.Query(`select key, name, did, rkey, created from public_keys`) if err != nil { return nil, err } @@ -47,7 +52,7 @@ func GetAllPublicKeys(e Execer) ([]PublicKey, error) { for rows.Next() { var publicKey PublicKey var createdAt string - if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &createdAt); err != nil { + if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &publicKey.Rkey, &createdAt); err != nil { return nil, err } createdAtTime, _ := time.Parse(time.RFC3339, createdAt) @@ -65,7 +70,7 @@ func GetAllPublicKeys(e Execer) ([]PublicKey, error) { func GetPublicKeys(e Execer, did string) ([]PublicKey, error) { var keys []PublicKey - rows, err := e.Query(`select did, key, name, created from public_keys where did = ?`, did) + rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did) if err != nil { return nil, err } @@ -74,7 +79,7 @@ func GetPublicKeys(e Execer, did string) ([]PublicKey, error) { for rows.Next() { var publicKey PublicKey var createdAt string - if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &createdAt); err != nil { + if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &publicKey.Rkey, &createdAt); err != nil { return nil, err } createdAtTime, _ := time.Parse(time.RFC3339, createdAt) diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html index 98cd6b82..0d32e09d 100644 --- a/appview/pages/templates/repo/issues/issue.html +++ b/appview/pages/templates/repo/issues/issue.html @@ -5,7 +5,7 @@ {{ define "repoContent" }}
-

+

{{ .Issue.Title }} #{{ .Issue.IssueId }}

@@ -18,7 +18,7 @@ {{ $icon = "circle-dot" }} {{ end }} -
+
diff --git a/appview/pages/templates/settings.html b/appview/pages/templates/settings.html index ad967198..b580117f 100644 --- a/appview/pages/templates/settings.html +++ b/appview/pages/templates/settings.html @@ -32,13 +32,22 @@
{{ range .PubKeys }} -
-
- -

{{ .Name }}

-

added {{ .Created | timeFmt }}

+
+
+
+ +

{{ .Name }}

+

added {{ .Created | timeFmt }}

+
+ {{ .Key }}
- {{ .Key }} +
{{ end }}
diff --git a/appview/state/settings.go b/appview/state/settings.go index a05d5865..4ed2a019 100644 --- a/appview/state/settings.go +++ b/appview/state/settings.go @@ -48,7 +48,17 @@ func (s *State) SettingsKeys(w http.ResponseWriter, r *http.Request) { return } - if err := db.AddPublicKey(s.db, did, name, key); err != nil { + rkey := s.TID() + + tx, err := s.db.Begin() + if err != nil { + log.Printf("failed to start tx; adding public key: %s", err) + s.pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.") + return + } + defer tx.Rollback() + + if err := db.AddPublicKey(tx, did, name, key, rkey); err != nil { log.Printf("adding public key: %s", err) s.pages.Notice(w, "settings-keys", "Failed to add public key.") return @@ -58,7 +68,7 @@ func (s *State) SettingsKeys(w http.ResponseWriter, r *http.Request) { resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ Collection: tangled.PublicKeyNSID, Repo: did, - Rkey: s.TID(), + Rkey: rkey, Record: &lexutil.LexiconTypeDecoder{ Val: &tangled.PublicKey{ Created: time.Now().Format(time.RFC3339), @@ -74,6 +84,54 @@ func (s *State) SettingsKeys(w http.ResponseWriter, r *http.Request) { } log.Println("created atproto record: ", resp.Uri) + + err = tx.Commit() + if err != nil { + log.Printf("failed to commit tx; adding public key: %s", err) + s.pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.") + return + } + + s.pages.HxLocation(w, "/settings") + return + + case http.MethodDelete: + did := s.auth.GetDid(r) + q := r.URL.Query() + + name := q.Get("name") + rkey := q.Get("rkey") + key := q.Get("key") + + log.Println(name) + log.Println(rkey) + log.Println(key) + + client, _ := s.auth.AuthorizedClient(r) + + if err := db.RemovePublicKey(s.db, did, name, key); err != nil { + log.Printf("removing public key: %s", err) + s.pages.Notice(w, "settings-keys", "Failed to remove public key.") + return + } + + if rkey != "" { + // remove from pds too + _, err := comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ + Collection: tangled.PublicKeyNSID, + Repo: did, + Rkey: rkey, + }) + + // invalid record + if err != nil { + log.Printf("failed to delete record from PDS: %s", err) + s.pages.Notice(w, "settings-keys", "Failed to remove key from PDS.") + return + } + } + log.Println("deleted successfully") + s.pages.HxLocation(w, "/settings") return } diff --git a/appview/state/state.go b/appview/state/state.go index 89fd9428..7f142c26 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -965,6 +965,7 @@ func (s *State) StandardRouter() http.Handler { r.Use(AuthMiddleware(s)) r.Get("/", s.Settings) r.Put("/keys", s.SettingsKeys) + r.Delete("/keys", s.SettingsKeys) }) r.Get("/keys/{user}", s.Keys)