krz/gitbay

web: drop the key comment column !81

merged merged by cmc on 2026-08-26 05:20 UTC · krz/gitbay:key-comment into main

4 files changed, +10 −19

Layout: unified · split

e2e/accountweb_test.go +5
@@ -38,6 +38,11 @@ func TestAccountSettingsWeb(t *testing.T) {
38 if !strings.Contains(body, "SHA256:") { 38 if !strings.Contains(body, "SHA256:") {
39 t.Error("no SSH key fingerprint listed") 39 t.Error("no SSH key fingerprint listed")
40 } 40 }
41 // Keys are stored in wire format, which holds no comment; anything
42 // pulled out of it and printed would be binary noise.
43 if strings.Contains(body, "\ufffd") {
44 t.Error("key row is rendering raw blob bytes")
45 }
41 if !strings.Contains(body, "alice@example.test") || !strings.Contains(body, "verified") { 46 if !strings.Contains(body, "alice@example.test") || !strings.Contains(body, "verified") {
42 t.Error("verified address not shown") 47 t.Error("verified address not shown")
43 } 48 }
e2e/facts_test.go +3 −3
@@ -47,9 +47,9 @@ func TestRepoFacts(t *testing.T) {
47 "<strong>2</strong> commit", // both commits counted 47 "<strong>2</strong> commit", // both commits counted
48 "<strong>1</strong> branch", 48 "<strong>1</strong> branch",
49 "<strong>1</strong> tag", 49 "<strong>1</strong> tag",
50 "0BSD", // license detected and surfaced 50 "0BSD", // license detected and surfaced
51 "Go", // language census 51 "Go", // language census
52 "Shell", // and it is not single-language 52 "Shell", // and it is not single-language
53 "2 contributors", 53 "2 contributors",
54 } { 54 } {
55 if !strings.Contains(body, want) { 55 if !strings.Contains(body, want) {
internal/httpd/account.go +1 −15
@@ -15,7 +15,6 @@ type accountKey struct {
15 Fingerprint string 15 Fingerprint string
16 Algo string 16 Algo string
17 Scope string 17 Scope string
18 Comment string
19} 18}
20 19
21type accountPGP struct { 20type accountPGP struct {
@@ -31,10 +30,7 @@ func (s *Server) accountForm(w http.ResponseWriter, r *http.Request, u store.Use
31 var keys []accountKey 30 var keys []accountKey
32 if list, err := s.st.ListSSHKeys(u.ID); err == nil { 31 if list, err := s.st.ListSSHKeys(u.ID); err == nil {
33 for _, k := range list { 32 for _, k := range list {
34 keys = append(keys, accountKey{ 33 keys = append(keys, accountKey{Fingerprint: k.Fingerprint, Algo: k.Algo, Scope: k.Scope})
35 Fingerprint: k.Fingerprint, Algo: k.Algo, Scope: k.Scope,
36 Comment: keyComment(k.Blob),
37 })
38 } 34 }
39 } 35 }
40 var pgp []accountPGP 36 var pgp []accountPGP
@@ -62,16 +58,6 @@ func (s *Server) accountForm(w http.ResponseWriter, r *http.Request, u store.Use
62 r.URL.Query().Get("e"), r.URL.Query().Get("m")}) 58 r.URL.Query().Get("e"), r.URL.Query().Get("m")})
63} 59}
64 60
65// keyComment pulls the trailing comment off an authorized_keys blob, which
66// is how people tell their own keys apart.
67func keyComment(blob []byte) string {
68 f := strings.Fields(string(blob))
69 if len(f) < 3 {
70 return ""
71 }
72 return strings.Join(f[2:], " ")
73}
74
75// accountSubmit routes the account forms to their commands. Everything 61// accountSubmit routes the account forms to their commands. Everything
76// here is a public key or an address — no secret is accepted over the web. 62// here is a public key or an address — no secret is accepted over the web.
77func (s *Server) accountSubmit(w http.ResponseWriter, r *http.Request, u store.User) { 63func (s *Server) accountSubmit(w http.ResponseWriter, r *http.Request, u store.User) {
internal/web/templates/account.html +1 −1
@@ -11,7 +11,7 @@ a CI checkout wants.</p>
11{{if .Keys}}<div class="tablewrap"><table class="keys"> 11{{if .Keys}}<div class="tablewrap"><table class="keys">
12<tr class="cols"><th scope="col">fingerprint</th><th scope="col">type</th><th scope="col">scope</th><th scope="col"></th></tr> 12<tr class="cols"><th scope="col">fingerprint</th><th scope="col">type</th><th scope="col">scope</th><th scope="col"></th></tr>
13{{range .Keys}}<tr> 13{{range .Keys}}<tr>
14 <td class="mono">{{.Fingerprint}}{{with .Comment}}<br><span class="muted">{{.}}</span>{{end}}</td> 14 <td class="mono">{{.Fingerprint}}</td>
15 <td>{{.Algo}}</td> 15 <td>{{.Algo}}</td>
16 <td>{{.Scope}}</td> 16 <td>{{.Scope}}</td>
17 <td class="act"><form method="post" action="/settings"><input type="hidden" name="field" value="key-remove"><input type="hidden" name="fingerprint" value="{{.Fingerprint}}"><button type="submit" class="linklike">Remove</button></form></td> 17 <td class="act"><form method="post" action="/settings"><input type="hidden" name="field" value="key-remove"><input type="hidden" name="fingerprint" value="{{.Fingerprint}}"><button type="submit" class="linklike">Remove</button></form></td>