BlueGit

timfa bluegit

Merge branch 'cursor/settings-tokens-65da' into 'master'

fix: compacte token- en SSH-knoppen op /settings

See merge request Timfa/bluegit!32

timfa Tim Falken · pushed by timfa

Authored 2026-10-23 · 3 weeks ago

Hash
4604634c07085234308f0411cedf1e632ad2edf7
10 files changed +305 −22
internal/i18n/catalog_account.go added +56 −0
@@ -0,0 +1,56 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, accountEN)
5 addCatalog(nl, accountNL)
6 addCatalog(de, accountDE)
7 addCatalog(fr, accountFR)
8 }
9
10 var accountEN = map[string]string{
11 "acct.col.name": "Name",
12 "acct.col.prefix": "Prefix",
13 "acct.col.created": "Created",
14 "acct.col.used": "Last used",
15 "acct.col.expires": "Expires",
16 "acct.col.fingerprint": "Fingerprint",
17 "acct.never": "Never",
18 "acct.revokeAsk": "Revoke this token?",
19 "acct.removeAsk": "Remove this SSH key?",
20 }
21
22 var accountNL = map[string]string{
23 "acct.col.name": "Naam",
24 "acct.col.prefix": "Prefix",
25 "acct.col.created": "Aangemaakt",
26 "acct.col.used": "Laatst gebruikt",
27 "acct.col.expires": "Verloopt",
28 "acct.col.fingerprint": "Vingerafdruk",
29 "acct.never": "Nooit",
30 "acct.revokeAsk": "Dit token intrekken?",
31 "acct.removeAsk": "Deze SSH-sleutel verwijderen?",
32 }
33
34 var accountDE = map[string]string{
35 "acct.col.name": "Name",
36 "acct.col.prefix": "Präfix",
37 "acct.col.created": "Erstellt",
38 "acct.col.used": "Zuletzt verwendet",
39 "acct.col.expires": "Läuft ab",
40 "acct.col.fingerprint": "Fingerabdruck",
41 "acct.never": "Nie",
42 "acct.revokeAsk": "Dieses Token widerrufen?",
43 "acct.removeAsk": "Diesen SSH-Schlüssel entfernen?",
44 }
45
46 var accountFR = map[string]string{
47 "acct.col.name": "Nom",
48 "acct.col.prefix": "Préfixe",
49 "acct.col.created": "Créé",
50 "acct.col.used": "Dernière utilisation",
51 "acct.col.expires": "Expiration",
52 "acct.col.fingerprint": "Empreinte",
53 "acct.never": "Jamais",
54 "acct.revokeAsk": "Révoquer ce jeton ?",
55 "acct.removeAsk": "Supprimer cette clé SSH ?",
56 }
@@ -0,0 +1,56 @@
1package i18n
2
3func init() {
4 addCatalog(en, accountEN)
5 addCatalog(nl, accountNL)
6 addCatalog(de, accountDE)
7 addCatalog(fr, accountFR)
8}
9
10var accountEN = map[string]string{
11 "acct.col.name": "Name",
12 "acct.col.prefix": "Prefix",
13 "acct.col.created": "Created",
14 "acct.col.used": "Last used",
15 "acct.col.expires": "Expires",
16 "acct.col.fingerprint": "Fingerprint",
17 "acct.never": "Never",
18 "acct.revokeAsk": "Revoke this token?",
19 "acct.removeAsk": "Remove this SSH key?",
20}
21
22var accountNL = map[string]string{
23 "acct.col.name": "Naam",
24 "acct.col.prefix": "Prefix",
25 "acct.col.created": "Aangemaakt",
26 "acct.col.used": "Laatst gebruikt",
27 "acct.col.expires": "Verloopt",
28 "acct.col.fingerprint": "Vingerafdruk",
29 "acct.never": "Nooit",
30 "acct.revokeAsk": "Dit token intrekken?",
31 "acct.removeAsk": "Deze SSH-sleutel verwijderen?",
32}
33
34var accountDE = map[string]string{
35 "acct.col.name": "Name",
36 "acct.col.prefix": "Präfix",
37 "acct.col.created": "Erstellt",
38 "acct.col.used": "Zuletzt verwendet",
39 "acct.col.expires": "Läuft ab",
40 "acct.col.fingerprint": "Fingerabdruck",
41 "acct.never": "Nie",
42 "acct.revokeAsk": "Dieses Token widerrufen?",
43 "acct.removeAsk": "Diesen SSH-Schlüssel entfernen?",
44}
45
46var accountFR = map[string]string{
47 "acct.col.name": "Nom",
48 "acct.col.prefix": "Préfixe",
49 "acct.col.created": "Créé",
50 "acct.col.used": "Dernière utilisation",
51 "acct.col.expires": "Expiration",
52 "acct.col.fingerprint": "Empreinte",
53 "acct.never": "Jamais",
54 "acct.revokeAsk": "Révoquer ce jeton ?",
55 "acct.removeAsk": "Supprimer cette clé SSH ?",
56}
internal/server/account_layout_test.go added +118 −0
@@ -0,0 +1,118 @@
1 package server
2
3 import (
4 "crypto/ed25519"
5 "crypto/rand"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "path/filepath"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 "golang.org/x/crypto/ssh"
18 )
19
20 func TestAccountTokenAndKeyLayout(t *testing.T) {
21 dir := t.TempDir()
22 st, err := store.Open(filepath.Join(dir, "bluegit.db"), bytes32())
23 if err != nil {
24 t.Fatal(err)
25 }
26 t.Cleanup(func() { _ = st.Close() })
27 cfg := config.Config{
28 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: dir,
29 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
30 Git: config.Git{Binary: "git", DefaultBranch: "master"},
31 CI: config.CI{Enabled: false},
32 }
33 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", StateDir: dir}
34 ts := httptest.NewServer(srv.Handler())
35 t.Cleanup(ts.Close)
36 jar, _ := cookiejar.New(nil)
37 client := &http.Client{Jar: jar}
38 res, err := client.Get(ts.URL + "/login")
39 if err != nil {
40 t.Fatal(err)
41 }
42 page := read(t, res)
43 res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"Ada"}})
44 if err != nil {
45 t.Fatal(err)
46 }
47 body := read(t, res)
48 if res.StatusCode != 200 {
49 res, err = client.Get(ts.URL + "/settings")
50 if err != nil {
51 t.Fatal(err)
52 }
53 body = read(t, res)
54 }
55 for _, want := range []string{
56 `class="formline"`,
57 ">New token<",
58 `class="hscroll"`,
59 `<table class="acct">`,
60 "Prefix",
61 "Last used",
62 "Never",
63 ">Ada<",
64 `class="danger"`,
65 `data-confirm="Revoke this token?"`,
66 `src="/assets/confirm.js"`,
67 } {
68 if !strings.Contains(body, want) {
69 t.Fatalf("mist %q", want)
70 }
71 }
72 if strings.Contains(body, ">Expires<") {
73 t.Fatal("vervaldatum hoort weg te blijven zolang geen token die heeft")
74 }
75 tokenForm := body[strings.Index(body, "Access tokens"):strings.Index(body, "SSH keys")]
76 if strings.Contains(tokenForm, `class="row"`) {
77 t.Fatal("tokenformulier rekt de knop nog via row")
78 }
79 if strings.Contains(tokenForm, "onsubmit=") {
80 t.Fatal("inline onsubmit wordt door het content-security-beleid geblokkeerd")
81 }
82
83 pub, _, err := ed25519.GenerateKey(rand.Reader)
84 if err != nil {
85 t.Fatal(err)
86 }
87 key, err := ssh.NewPublicKey(pub)
88 if err != nil {
89 t.Fatal(err)
90 }
91 line := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(key)))
92 res, err = client.Get(ts.URL + "/settings")
93 if err != nil {
94 t.Fatal(err)
95 }
96 settings := read(t, res)
97 res, err = client.PostForm(ts.URL+"/settings/ssh", url.Values{
98 "csrf": {csrfOf(t, settings)}, "name": {"laptop"}, "key": {line},
99 })
100 if err != nil {
101 t.Fatal(err)
102 }
103 _ = read(t, res)
104 res, err = client.Get(ts.URL + "/settings")
105 if err != nil {
106 t.Fatal(err)
107 }
108 settings = read(t, res)
109 sshPart := settings[strings.Index(settings, "SSH keys"):]
110 for _, want := range []string{"Fingerprint", "laptop", `data-confirm="Remove this SSH key?"`, `class="danger"`} {
111 if !strings.Contains(sshPart, want) {
112 t.Fatalf("ssh mist %q", want)
113 }
114 }
115 if strings.Contains(sshPart, `class="row"`) {
116 t.Fatal("ssh-formulier rekt de knop nog via row")
117 }
118 }
@@ -0,0 +1,118 @@
1package server
2
3import (
4 "crypto/ed25519"
5 "crypto/rand"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "path/filepath"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 "golang.org/x/crypto/ssh"
18)
19
20func TestAccountTokenAndKeyLayout(t *testing.T) {
21 dir := t.TempDir()
22 st, err := store.Open(filepath.Join(dir, "bluegit.db"), bytes32())
23 if err != nil {
24 t.Fatal(err)
25 }
26 t.Cleanup(func() { _ = st.Close() })
27 cfg := config.Config{
28 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: dir,
29 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
30 Git: config.Git{Binary: "git", DefaultBranch: "master"},
31 CI: config.CI{Enabled: false},
32 }
33 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", StateDir: dir}
34 ts := httptest.NewServer(srv.Handler())
35 t.Cleanup(ts.Close)
36 jar, _ := cookiejar.New(nil)
37 client := &http.Client{Jar: jar}
38 res, err := client.Get(ts.URL + "/login")
39 if err != nil {
40 t.Fatal(err)
41 }
42 page := read(t, res)
43 res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"Ada"}})
44 if err != nil {
45 t.Fatal(err)
46 }
47 body := read(t, res)
48 if res.StatusCode != 200 {
49 res, err = client.Get(ts.URL + "/settings")
50 if err != nil {
51 t.Fatal(err)
52 }
53 body = read(t, res)
54 }
55 for _, want := range []string{
56 `class="formline"`,
57 ">New token<",
58 `class="hscroll"`,
59 `<table class="acct">`,
60 "Prefix",
61 "Last used",
62 "Never",
63 ">Ada<",
64 `class="danger"`,
65 `data-confirm="Revoke this token?"`,
66 `src="/assets/confirm.js"`,
67 } {
68 if !strings.Contains(body, want) {
69 t.Fatalf("mist %q", want)
70 }
71 }
72 if strings.Contains(body, ">Expires<") {
73 t.Fatal("vervaldatum hoort weg te blijven zolang geen token die heeft")
74 }
75 tokenForm := body[strings.Index(body, "Access tokens"):strings.Index(body, "SSH keys")]
76 if strings.Contains(tokenForm, `class="row"`) {
77 t.Fatal("tokenformulier rekt de knop nog via row")
78 }
79 if strings.Contains(tokenForm, "onsubmit=") {
80 t.Fatal("inline onsubmit wordt door het content-security-beleid geblokkeerd")
81 }
82
83 pub, _, err := ed25519.GenerateKey(rand.Reader)
84 if err != nil {
85 t.Fatal(err)
86 }
87 key, err := ssh.NewPublicKey(pub)
88 if err != nil {
89 t.Fatal(err)
90 }
91 line := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(key)))
92 res, err = client.Get(ts.URL + "/settings")
93 if err != nil {
94 t.Fatal(err)
95 }
96 settings := read(t, res)
97 res, err = client.PostForm(ts.URL+"/settings/ssh", url.Values{
98 "csrf": {csrfOf(t, settings)}, "name": {"laptop"}, "key": {line},
99 })
100 if err != nil {
101 t.Fatal(err)
102 }
103 _ = read(t, res)
104 res, err = client.Get(ts.URL + "/settings")
105 if err != nil {
106 t.Fatal(err)
107 }
108 settings = read(t, res)
109 sshPart := settings[strings.Index(settings, "SSH keys"):]
110 for _, want := range []string{"Fingerprint", "laptop", `data-confirm="Remove this SSH key?"`, `class="danger"`} {
111 if !strings.Contains(sshPart, want) {
112 t.Fatalf("ssh mist %q", want)
113 }
114 }
115 if strings.Contains(sshPart, `class="row"`) {
116 t.Fatal("ssh-formulier rekt de knop nog via row")
117 }
118}
internal/server/auth_handlers.go +6 −0
@@ -145,6 +145,12 @@ func (s *Server) account(w http.ResponseWriter, r *http.Request) {
145 145 v := s.view(w, r, "title.account")
146 146 v.Page = "account"
147 147 v.Tokens, _ = s.Store.ListTokens(r.Context(), u.ID)
148 for _, tok := range v.Tokens {
149 if !tok.ExpiresAt.IsZero() {
150 v.ShowExpiry = true
151 break
152 }
153 }
148 154 v.Keys, _ = s.Store.ListSSHKeys(r.Context(), u.ID)
149 155 v.NewToken = cookieVal(r, "bluegit_token_once")
150 156 if v.NewToken != "" {
@@ -145,6 +145,12 @@ func (s *Server) account(w http.ResponseWriter, r *http.Request) {
145 v := s.view(w, r, "title.account")
145 v := s.view(w, r, "title.account")
146 v.Page = "account"
146 v.Page = "account"
147 v.Tokens, _ = s.Store.ListTokens(r.Context(), u.ID)
147 v.Tokens, _ = s.Store.ListTokens(r.Context(), u.ID)
148 for _, tok := range v.Tokens {
149 if !tok.ExpiresAt.IsZero() {
150 v.ShowExpiry = true
151 break
152 }
153 }
148 v.Keys, _ = s.Store.ListSSHKeys(r.Context(), u.ID)
154 v.Keys, _ = s.Store.ListSSHKeys(r.Context(), u.ID)
149 v.NewToken = cookieVal(r, "bluegit_token_once")
155 v.NewToken = cookieVal(r, "bluegit_token_once")
150 if v.NewToken != "" {
156 if v.NewToken != "" {
internal/server/server.go +2 −0
@@ -211,6 +211,7 @@ func (s *Server) mustTemplates() {
211 211 },
212 212 "iconOf": func(name string) string { return fileIcon(name, "blob") },
213 213 "t": func(key string, args ...any) string { return i18n.T(l, key, args...) },
214 "date": func(t time.Time) string { return i18n.FormatDate(l, t) },
214 215 "tn": func(n int, one, many string) string {
215 216 key := many
216 217 if n == 1 {
@@ -502,6 +503,7 @@ type View struct {
502 503 TagPatterns []string
503 504 Tags []TagRow
504 505 Tokens []store.TokenInfo
506 ShowExpiry bool
505 507 Keys []store.SSHKey
506 508 CloneHTTP string
507 509 CloneSSH string
@@ -211,6 +211,7 @@ func (s *Server) mustTemplates() {
211 },
211 },
212 "iconOf": func(name string) string { return fileIcon(name, "blob") },
212 "iconOf": func(name string) string { return fileIcon(name, "blob") },
213 "t": func(key string, args ...any) string { return i18n.T(l, key, args...) },
213 "t": func(key string, args ...any) string { return i18n.T(l, key, args...) },
214 "date": func(t time.Time) string { return i18n.FormatDate(l, t) },
214 "tn": func(n int, one, many string) string {
215 "tn": func(n int, one, many string) string {
215 key := many
216 key := many
216 if n == 1 {
217 if n == 1 {
@@ -502,6 +503,7 @@ type View struct {
502 TagPatterns []string
503 TagPatterns []string
503 Tags []TagRow
504 Tags []TagRow
504 Tokens []store.TokenInfo
505 Tokens []store.TokenInfo
506 ShowExpiry bool
505 Keys []store.SSHKey
507 Keys []store.SSHKey
506 CloneHTTP string
508 CloneHTTP string
507 CloneSSH string
509 CloneSSH string
internal/server/static/confirm.js added +15 −0
@@ -0,0 +1,15 @@
1 (function () {
2 document.addEventListener("submit", function (ev) {
3 var form = ev.target;
4 if (!form || !form.getAttribute) {
5 return;
6 }
7 var ask = form.getAttribute("data-confirm");
8 if (!ask) {
9 return;
10 }
11 if (!window.confirm(ask)) {
12 ev.preventDefault();
13 }
14 }, true);
15 })();
@@ -0,0 +1,15 @@
1(function () {
2 document.addEventListener("submit", function (ev) {
3 var form = ev.target;
4 if (!form || !form.getAttribute) {
5 return;
6 }
7 var ask = form.getAttribute("data-confirm");
8 if (!ask) {
9 return;
10 }
11 if (!window.confirm(ask)) {
12 ev.preventDefault();
13 }
14 }, true);
15})();
internal/server/static/style.css +16 −1
@@ -125,7 +125,22 @@ input, textarea, select {
125 125 textarea { min-height: 7rem; }
126 126 .row { display: flex; gap: var(--sp-2); align-items: center; flex-wrap: wrap; }
127 127 .row > input:not([type="checkbox"]):not([type="radio"]):not([type="hidden"]),
128 .row > select, .row > button, .row > .btn { width: auto; flex: 1 1 8rem; min-width: 0; }
128 .row > select { width: auto; flex: 1 1 8rem; min-width: 0; }
129 .row > button, .row > .btn, .formline > button { width: auto; flex: none; }
130 .formline { display: flex; gap: var(--sp-2); align-items: center; flex-wrap: wrap; }
131 .formline > input { flex: 1 1 12rem; width: auto; min-width: 0; }
132 .formline > select { width: auto; flex: 0 1 16rem; max-width: 100%; }
133 button.danger { background: var(--bad); color: #fff; font-size: var(--fs-sm); min-height: 24px; padding: 0 var(--sp-2); }
134 table.acct { margin-top: var(--sp-3); border-collapse: separate; border-spacing: 0; }
135 table.acct td { overflow-wrap: anywhere; }
136 table.acct th:last-child,
137 table.acct td.act {
138 position: sticky; right: 0; background: var(--card); z-index: 1;
139 box-shadow: -6px 0 6px -6px rgba(20, 32, 51, 0.25);
140 }
141 table.acct td.act { width: 1%; white-space: nowrap; text-align: right; vertical-align: middle; overflow-wrap: normal; }
142 table.acct form { margin: 0; }
143 table.acct code { font-size: var(--fs-sm); }
129 144 code, pre { font-family: var(--mono); }
130 145 pre, .code {
131 146 background: #0f1b2d; color: #e7eef8; padding: var(--sp-3) var(--sp-4); border-radius: var(--radius-lg); overflow: auto;
@@ -125,7 +125,22 @@ input, textarea, select {
125textarea { min-height: 7rem; }
125textarea { min-height: 7rem; }
126.row { display: flex; gap: var(--sp-2); align-items: center; flex-wrap: wrap; }
126.row { display: flex; gap: var(--sp-2); align-items: center; flex-wrap: wrap; }
127.row > input:not([type="checkbox"]):not([type="radio"]):not([type="hidden"]),
127.row > input:not([type="checkbox"]):not([type="radio"]):not([type="hidden"]),
128.row > select, .row > button, .row > .btn { width: auto; flex: 1 1 8rem; min-width: 0; }
128.row > select { width: auto; flex: 1 1 8rem; min-width: 0; }
129.row > button, .row > .btn, .formline > button { width: auto; flex: none; }
130.formline { display: flex; gap: var(--sp-2); align-items: center; flex-wrap: wrap; }
131.formline > input { flex: 1 1 12rem; width: auto; min-width: 0; }
132.formline > select { width: auto; flex: 0 1 16rem; max-width: 100%; }
133button.danger { background: var(--bad); color: #fff; font-size: var(--fs-sm); min-height: 24px; padding: 0 var(--sp-2); }
134table.acct { margin-top: var(--sp-3); border-collapse: separate; border-spacing: 0; }
135table.acct td { overflow-wrap: anywhere; }
136table.acct th:last-child,
137table.acct td.act {
138 position: sticky; right: 0; background: var(--card); z-index: 1;
139 box-shadow: -6px 0 6px -6px rgba(20, 32, 51, 0.25);
140}
141table.acct td.act { width: 1%; white-space: nowrap; text-align: right; vertical-align: middle; overflow-wrap: normal; }
142table.acct form { margin: 0; }
143table.acct code { font-size: var(--fs-sm); }
129code, pre { font-family: var(--mono); }
144code, pre { font-family: var(--mono); }
130pre, .code {
145pre, .code {
131 background: #0f1b2d; color: #e7eef8; padding: var(--sp-3) var(--sp-4); border-radius: var(--radius-lg); overflow: auto;
146 background: #0f1b2d; color: #e7eef8; padding: var(--sp-3) var(--sp-4); border-radius: var(--radius-lg); overflow: auto;
internal/server/templates/layout.html +1 −0
@@ -47,6 +47,7 @@
47 47 </div>
48 48 </div>
49 49 <script src="/assets/float.js"></script>
50 <script src="/assets/confirm.js"></script>
50 51 </body>
51 52 </html>
52 53 {{end}}
@@ -47,6 +47,7 @@
47</div>
47</div>
48</div>
48</div>
49<script src="/assets/float.js"></script>
49<script src="/assets/float.js"></script>
50<script src="/assets/confirm.js"></script>
50</body>
51</body>
51</html>
52</html>
52{{end}}
53{{end}}
internal/server/templates/pages.html +56 −18
@@ -166,7 +166,7 @@
166 166 <h2>{{t "acct.language"}}</h2>
167 167 <form method="post" action="/settings/language">
168 168 <input type="hidden" name="csrf" value="{{.CSRF}}">
169 <div class="row">
169 <div class="formline">
170 170 <select name="language">
171 171 {{range .Langs}}<option value="{{.Code}}" {{if eq .Code $.Lang}}selected{{end}}>{{.Label}}</option>{{end}}
172 172 </select>
@@ -179,16 +179,37 @@
179 179 <h2>{{t "acct.tokens"}}</h2>
180 180 <form method="post" action="/settings/tokens">
181 181 <input type="hidden" name="csrf" value="{{.CSRF}}">
182 <div class="row"><input name="name" placeholder="{{t "acct.tokenName"}}" required><button type="submit">{{t "acct.newToken"}}</button></div>
182 <div class="formline"><input name="name" placeholder="{{t "acct.tokenName"}}" required><button type="submit">{{t "acct.newToken"}}</button></div>
183 183 </form>
184 <ul class="clean">
185 {{range .Tokens}}<li>{{.Name}} <span class="muted">{{.Prefix}}…</span>
186 <form method="post" action="/settings/tokens/delete" class="row">
187 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
188 <button class="ghost" type="submit">{{t "acct.revoke"}}</button>
189 </form>
190 </li>{{end}}
191 </ul>
184 {{if .Tokens}}
185 <div class="hscroll">
186 <table class="acct">
187 <thead><tr>
188 <th>{{t "acct.col.name"}}</th>
189 <th>{{t "acct.col.prefix"}}</th>
190 <th>{{t "acct.col.created"}}</th>
191 <th>{{t "acct.col.used"}}</th>
192 {{if .ShowExpiry}}<th>{{t "acct.col.expires"}}</th>{{end}}
193 <th></th>
194 </tr></thead>
195 <tbody>
196 {{range .Tokens}}<tr>
197 <td>{{.Name}}</td>
198 <td><code>{{.Prefix}}</code></td>
199 <td>{{date .CreatedAt}}</td>
200 <td>{{with date .LastUsedAt}}{{.}}{{else}}{{t "acct.never"}}{{end}}</td>
201 {{if $.ShowExpiry}}<td>{{date .ExpiresAt}}</td>{{end}}
202 <td class="act">
203 <form method="post" action="/settings/tokens/delete" data-confirm="{{t "acct.revokeAsk"}}">
204 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
205 <button class="danger" type="submit">{{t "acct.revoke"}}</button>
206 </form>
207 </td>
208 </tr>{{end}}
209 </tbody>
210 </table>
211 </div>
212 {{end}}
192 213 </section>
193 214 <section class="panel">
194 215 <h2>{{t "acct.ssh"}}</h2>
@@ -198,14 +219,31 @@
198 219 <label>{{t "acct.pubkey"}} <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
199 220 <button type="submit">{{t "acct.add"}}</button>
200 221 </form>
201 <ul class="clean">
202 {{range .Keys}}<li>{{.Name}} <span class="muted">{{.Fingerprint}}</span>
203 <form method="post" action="/settings/ssh/delete">
204 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
205 <button class="ghost" type="submit">{{t "acct.remove"}}</button>
206 </form>
207 </li>{{end}}
208 </ul>
222 {{if .Keys}}
223 <div class="hscroll">
224 <table class="acct">
225 <thead><tr>
226 <th>{{t "acct.col.name"}}</th>
227 <th>{{t "acct.col.fingerprint"}}</th>
228 <th>{{t "acct.col.created"}}</th>
229 <th></th>
230 </tr></thead>
231 <tbody>
232 {{range .Keys}}<tr>
233 <td>{{.Name}}</td>
234 <td><code>{{.Fingerprint}}</code></td>
235 <td>{{date .CreatedAt}}</td>
236 <td class="act">
237 <form method="post" action="/settings/ssh/delete" data-confirm="{{t "acct.removeAsk"}}">
238 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
239 <button class="danger" type="submit">{{t "acct.remove"}}</button>
240 </form>
241 </td>
242 </tr>{{end}}
243 </tbody>
244 </table>
245 </div>
246 {{end}}
209 247 </section>
210 248 <p><a href="/settings/export">{{t "acct.export"}}</a></p>
211 249 {{template "layout-end" .}}
@@ -166,7 +166,7 @@
166 <h2>{{t "acct.language"}}</h2>
166 <h2>{{t "acct.language"}}</h2>
167 <form method="post" action="/settings/language">
167 <form method="post" action="/settings/language">
168 <input type="hidden" name="csrf" value="{{.CSRF}}">
168 <input type="hidden" name="csrf" value="{{.CSRF}}">
169 <div class="row">
169 <div class="formline">
170 <select name="language">
170 <select name="language">
171 {{range .Langs}}<option value="{{.Code}}" {{if eq .Code $.Lang}}selected{{end}}>{{.Label}}</option>{{end}}
171 {{range .Langs}}<option value="{{.Code}}" {{if eq .Code $.Lang}}selected{{end}}>{{.Label}}</option>{{end}}
172 </select>
172 </select>
@@ -179,16 +179,37 @@
179 <h2>{{t "acct.tokens"}}</h2>
179 <h2>{{t "acct.tokens"}}</h2>
180 <form method="post" action="/settings/tokens">
180 <form method="post" action="/settings/tokens">
181 <input type="hidden" name="csrf" value="{{.CSRF}}">
181 <input type="hidden" name="csrf" value="{{.CSRF}}">
182 <div class="row"><input name="name" placeholder="{{t "acct.tokenName"}}" required><button type="submit">{{t "acct.newToken"}}</button></div>
182 <div class="formline"><input name="name" placeholder="{{t "acct.tokenName"}}" required><button type="submit">{{t "acct.newToken"}}</button></div>
183 </form>
183 </form>
184 <ul class="clean">
184 {{if .Tokens}}
185 {{range .Tokens}}<li>{{.Name}} <span class="muted">{{.Prefix}}…</span>
185 <div class="hscroll">
186 <form method="post" action="/settings/tokens/delete" class="row">
186 <table class="acct">
187 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
187 <thead><tr>
188 <button class="ghost" type="submit">{{t "acct.revoke"}}</button>
188 <th>{{t "acct.col.name"}}</th>
189 </form>
189 <th>{{t "acct.col.prefix"}}</th>
190 </li>{{end}}
190 <th>{{t "acct.col.created"}}</th>
191 </ul>
191 <th>{{t "acct.col.used"}}</th>
192 {{if .ShowExpiry}}<th>{{t "acct.col.expires"}}</th>{{end}}
193 <th></th>
194 </tr></thead>
195 <tbody>
196 {{range .Tokens}}<tr>
197 <td>{{.Name}}</td>
198 <td><code>{{.Prefix}}</code></td>
199 <td>{{date .CreatedAt}}</td>
200 <td>{{with date .LastUsedAt}}{{.}}{{else}}{{t "acct.never"}}{{end}}</td>
201 {{if $.ShowExpiry}}<td>{{date .ExpiresAt}}</td>{{end}}
202 <td class="act">
203 <form method="post" action="/settings/tokens/delete" data-confirm="{{t "acct.revokeAsk"}}">
204 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
205 <button class="danger" type="submit">{{t "acct.revoke"}}</button>
206 </form>
207 </td>
208 </tr>{{end}}
209 </tbody>
210 </table>
211 </div>
212 {{end}}
192</section>
213</section>
193<section class="panel">
214<section class="panel">
194 <h2>{{t "acct.ssh"}}</h2>
215 <h2>{{t "acct.ssh"}}</h2>
@@ -198,14 +219,31 @@
198 <label>{{t "acct.pubkey"}} <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
219 <label>{{t "acct.pubkey"}} <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
199 <button type="submit">{{t "acct.add"}}</button>
220 <button type="submit">{{t "acct.add"}}</button>
200 </form>
221 </form>
201 <ul class="clean">
222 {{if .Keys}}
202 {{range .Keys}}<li>{{.Name}} <span class="muted">{{.Fingerprint}}</span>
223 <div class="hscroll">
203 <form method="post" action="/settings/ssh/delete">
224 <table class="acct">
204 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
225 <thead><tr>
205 <button class="ghost" type="submit">{{t "acct.remove"}}</button>
226 <th>{{t "acct.col.name"}}</th>
206 </form>
227 <th>{{t "acct.col.fingerprint"}}</th>
207 </li>{{end}}
228 <th>{{t "acct.col.created"}}</th>
208 </ul>
229 <th></th>
230 </tr></thead>
231 <tbody>
232 {{range .Keys}}<tr>
233 <td>{{.Name}}</td>
234 <td><code>{{.Fingerprint}}</code></td>
235 <td>{{date .CreatedAt}}</td>
236 <td class="act">
237 <form method="post" action="/settings/ssh/delete" data-confirm="{{t "acct.removeAsk"}}">
238 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
239 <button class="danger" type="submit">{{t "acct.remove"}}</button>
240 </form>
241 </td>
242 </tr>{{end}}
243 </tbody>
244 </table>
245 </div>
246 {{end}}
209</section>
247</section>
210<p><a href="/settings/export">{{t "acct.export"}}</a></p>
248<p><a href="/settings/export">{{t "acct.export"}}</a></p>
211{{template "layout-end" .}}
249{{template "layout-end" .}}
internal/store/store.go +5 −3
@@ -644,6 +644,7 @@ type TokenInfo struct {
644 644 Prefix string
645 645 CreatedAt time.Time
646 646 LastUsedAt time.Time
647 ExpiresAt time.Time
647 648 }
648 649
649 650 // CreateToken maakt een bg_-token. De tekst wordt één keer teruggegeven.
@@ -666,7 +667,7 @@ func (s *Store) CreateToken(ctx context.Context, userID int64, name string) (str
666 667
667 668 // ListTokens toont de tokens van een gebruiker.
668 669 func (s *Store) ListTokens(ctx context.Context, userID int64) ([]TokenInfo, error) {
669 rows, err := s.db.QueryContext(ctx, `SELECT id, name, prefix, created_at, COALESCE(last_used_at, '') FROM access_tokens WHERE user_id = ? ORDER BY id DESC`, userID)
670 rows, err := s.db.QueryContext(ctx, `SELECT id, name, prefix, created_at, COALESCE(last_used_at, ''), COALESCE(expires_at, '') FROM access_tokens WHERE user_id = ? ORDER BY id DESC`, userID)
670 671 if err != nil {
671 672 return nil, err
672 673 }
@@ -674,12 +675,13 @@ func (s *Store) ListTokens(ctx context.Context, userID int64) ([]TokenInfo, erro
674 675 var out []TokenInfo
675 676 for rows.Next() {
676 677 var t TokenInfo
677 var created, used string
678 if err := rows.Scan(&t.ID, &t.Name, &t.Prefix, &created, &used); err != nil {
678 var created, used, expires string
679 if err := rows.Scan(&t.ID, &t.Name, &t.Prefix, &created, &used, &expires); err != nil {
679 680 return nil, err
680 681 }
681 682 t.CreatedAt = parseTime(created)
682 683 t.LastUsedAt = parseTime(used)
684 t.ExpiresAt = parseTime(expires)
683 685 out = append(out, t)
684 686 }
685 687 return out, rows.Err()
@@ -644,6 +644,7 @@ type TokenInfo struct {
644 Prefix string
644 Prefix string
645 CreatedAt time.Time
645 CreatedAt time.Time
646 LastUsedAt time.Time
646 LastUsedAt time.Time
647 ExpiresAt time.Time
647}
648}
648
649
649// CreateToken maakt een bg_-token. De tekst wordt één keer teruggegeven.
650// CreateToken maakt een bg_-token. De tekst wordt één keer teruggegeven.
@@ -666,7 +667,7 @@ func (s *Store) CreateToken(ctx context.Context, userID int64, name string) (str
666
667
667// ListTokens toont de tokens van een gebruiker.
668// ListTokens toont de tokens van een gebruiker.
668func (s *Store) ListTokens(ctx context.Context, userID int64) ([]TokenInfo, error) {
669func (s *Store) ListTokens(ctx context.Context, userID int64) ([]TokenInfo, error) {
669 rows, err := s.db.QueryContext(ctx, `SELECT id, name, prefix, created_at, COALESCE(last_used_at, '') FROM access_tokens WHERE user_id = ? ORDER BY id DESC`, userID)
670 rows, err := s.db.QueryContext(ctx, `SELECT id, name, prefix, created_at, COALESCE(last_used_at, ''), COALESCE(expires_at, '') FROM access_tokens WHERE user_id = ? ORDER BY id DESC`, userID)
670 if err != nil {
671 if err != nil {
671 return nil, err
672 return nil, err
672 }
673 }
@@ -674,12 +675,13 @@ func (s *Store) ListTokens(ctx context.Context, userID int64) ([]TokenInfo, erro
674 var out []TokenInfo
675 var out []TokenInfo
675 for rows.Next() {
676 for rows.Next() {
676 var t TokenInfo
677 var t TokenInfo
677 var created, used string
678 var created, used, expires string
678 if err := rows.Scan(&t.ID, &t.Name, &t.Prefix, &created, &used); err != nil {
679 if err := rows.Scan(&t.ID, &t.Name, &t.Prefix, &created, &used, &expires); err != nil {
679 return nil, err
680 return nil, err
680 }
681 }
681 t.CreatedAt = parseTime(created)
682 t.CreatedAt = parseTime(created)
682 t.LastUsedAt = parseTime(used)
683 t.LastUsedAt = parseTime(used)
684 t.ExpiresAt = parseTime(expires)
683 out = append(out, t)
685 out = append(out, t)
684 }
686 }
685 return out, rows.Err()
687 return out, rows.Err()
internal/store/token_test.go added +30 −0
@@ -0,0 +1,30 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 "time"
7 )
8
9 func TestListTokensReadsExpiry(t *testing.T) {
10 s := openTest(t)
11 ctx := context.Background()
12 user, err := s.UpsertUser(ctx, 1, "tim", "", false)
13 if err != nil {
14 t.Fatal(err)
15 }
16 if _, err := s.CreateToken(ctx, user.ID, "laptop"); err != nil {
17 t.Fatal(err)
18 }
19 when := time.Date(2026, 12, 1, 0, 0, 0, 0, time.UTC)
20 if _, err := s.db.ExecContext(ctx, `UPDATE access_tokens SET expires_at = ? WHERE user_id = ?`, when.Format(time.RFC3339), user.ID); err != nil {
21 t.Fatal(err)
22 }
23 list, err := s.ListTokens(ctx, user.ID)
24 if err != nil || len(list) != 1 {
25 t.Fatalf("%v %+v", err, list)
26 }
27 if !list[0].ExpiresAt.Equal(when) || list[0].Prefix == "" || list[0].Name != "laptop" {
28 t.Fatalf("%+v", list[0])
29 }
30 }
@@ -0,0 +1,30 @@
1package store
2
3import (
4 "context"
5 "testing"
6 "time"
7)
8
9func TestListTokensReadsExpiry(t *testing.T) {
10 s := openTest(t)
11 ctx := context.Background()
12 user, err := s.UpsertUser(ctx, 1, "tim", "", false)
13 if err != nil {
14 t.Fatal(err)
15 }
16 if _, err := s.CreateToken(ctx, user.ID, "laptop"); err != nil {
17 t.Fatal(err)
18 }
19 when := time.Date(2026, 12, 1, 0, 0, 0, 0, time.UTC)
20 if _, err := s.db.ExecContext(ctx, `UPDATE access_tokens SET expires_at = ? WHERE user_id = ?`, when.Format(time.RFC3339), user.ID); err != nil {
21 t.Fatal(err)
22 }
23 list, err := s.ListTokens(ctx, user.ID)
24 if err != nil || len(list) != 1 {
25 t.Fatalf("%v %+v", err, list)
26 }
27 if !list[0].ExpiresAt.Equal(when) || list[0].Prefix == "" || list[0].Name != "laptop" {
28 t.Fatalf("%+v", list[0])
29 }
30}