feat: vrije tekst wordt een repository- of groepsslug
'test repo' wordt test-repo. Onder het naamveld staat meteen de slug en de URL. Een groep houdt de getypte naam als titel. Co-authored-by: tim <tim@timfalken.com>
@@ -45,6 +45,62 @@ func ValidRepoName(s string) error {
45
45
return nil
46
46
}
47
47
48
// Slug maakt van vrije tekst een pad. "test repo" wordt "test-repo".
49
// Een repository mag een punt houden. Een groep niet, en begint met een letter.
50
func Slug(kind, raw string) (string, error) {
51
s := strings.ToLower(strings.TrimSpace(raw))
52
s = foldLatin(s)
53
var b strings.Builder
54
gap := false
55
for _, r := range s {
56
if slugChar(kind, r) {
57
if gap && b.Len() > 0 {
58
b.WriteByte('-')
59
}
60
gap = false
61
b.WriteRune(r)
62
continue
63
}
64
gap = true
65
}
66
out := strings.Trim(b.String(), "._")
67
if len(out) > 63 {
68
out = strings.Trim(out[:63], "-._")
69
}
70
switch kind {
71
case "repo":
72
if err := ValidRepoName(out); err != nil {
73
return "", fmt.Errorf("naam is niet bruikbaar")
74
}
75
case "group":
76
if err := ValidGroupPath(out); err != nil {
77
return "", fmt.Errorf("naam is niet bruikbaar")
78
}
79
default:
80
return "", fmt.Errorf("naam is niet bruikbaar")
81
}
82
return out, nil
83
}
84
85
func slugChar(kind string, r rune) bool {
86
if r >= 'a' && r <= 'z' || r >= '0' && r <= '9' || r == '_' {
87
return true
88
}
89
return kind == "repo" && r == '.'
90
}
91
92
func foldLatin(s string) string {
93
return strings.NewReplacer(
94
"à", "a", "á", "a", "â", "a", "ä", "a", "ã", "a", "å", "a", "ā", "a",
95
"è", "e", "é", "e", "ê", "e", "ë", "e", "ē", "e",
96
"ì", "i", "í", "i", "î", "i", "ï", "i", "ī", "i",
97
"ò", "o", "ó", "o", "ô", "o", "ö", "o", "õ", "o", "ø", "o", "ō", "o",
98
"ù", "u", "ú", "u", "û", "u", "ü", "u", "ū", "u",
99
"ý", "y", "ÿ", "y", "ñ", "n", "ç", "c", "ß", "ss",
100
"æ", "ae", "œ", "oe", "ð", "d", "þ", "th",
101
).Replace(s)
102
}
103
48
104
// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
49
105
func ValidTag(s string) error {
50
106
if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
@@ -45,6 +45,62 @@ func ValidRepoName(s string) error {45
return nil45
return nil46
}46
}47
47
48
// Slug maakt van vrije tekst een pad. "test repo" wordt "test-repo".49
// Een repository mag een punt houden. Een groep niet, en begint met een letter.50
func Slug(kind, raw string) (string, error) {51
s := strings.ToLower(strings.TrimSpace(raw))52
s = foldLatin(s)53
var b strings.Builder54
gap := false55
for _, r := range s {56
if slugChar(kind, r) {57
if gap && b.Len() > 0 {58
b.WriteByte('-')59
}60
gap = false61
b.WriteRune(r)62
continue63
}64
gap = true65
}66
out := strings.Trim(b.String(), "._")67
if len(out) > 63 {68
out = strings.Trim(out[:63], "-._")69
}70
switch kind {71
case "repo":72
if err := ValidRepoName(out); err != nil {73
return "", fmt.Errorf("naam is niet bruikbaar")74
}75
case "group":76
if err := ValidGroupPath(out); err != nil {77
return "", fmt.Errorf("naam is niet bruikbaar")78
}79
default:80
return "", fmt.Errorf("naam is niet bruikbaar")81
}82
return out, nil83
}84
85
func slugChar(kind string, r rune) bool {86
if r >= 'a' && r <= 'z' || r >= '0' && r <= '9' || r == '_' {87
return true88
}89
return kind == "repo" && r == '.'90
}91
92
func foldLatin(s string) string {93
return strings.NewReplacer(94
"à", "a", "á", "a", "â", "a", "ä", "a", "ã", "a", "å", "a", "ā", "a",95
"è", "e", "é", "e", "ê", "e", "ë", "e", "ē", "e",96
"ì", "i", "í", "i", "î", "i", "ï", "i", "ī", "i",97
"ò", "o", "ó", "o", "ô", "o", "ö", "o", "õ", "o", "ø", "o", "ō", "o",98
"ù", "u", "ú", "u", "û", "u", "ü", "u", "ū", "u",99
"ý", "y", "ÿ", "y", "ñ", "n", "ç", "c", "ß", "ss",100
"æ", "ae", "œ", "oe", "ð", "d", "þ", "th",101
).Replace(s)102
}103
48
// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.104
// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.49
func ValidTag(s string) error {105
func ValidTag(s string) error {50
if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {106
if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {@@ -0,0 +1,61 @@
1
package names
2
3
import (
4
"strings"
5
"testing"
6
)
7
8
func TestSlug(t *testing.T) {
9
cases := []struct {
10
kind string
11
in string
12
want string
13
}{
14
{"repo", "test repo", "test-repo"},
15
{"repo", " Test Repo ", "test-repo"},
16
{"repo", "test-repo", "test-repo"},
17
{"repo", "test_repo", "test_repo"},
18
{"repo", "foo---bar", "foo-bar"},
19
{"repo", "foo.bar", "foo.bar"},
20
{"repo", "foo/bar", "foo-bar"},
21
{"repo", "BlueGit", "bluegit"},
22
{"repo", "café repo", "cafe-repo"},
23
{"repo", "123 test", "123-test"},
24
{"repo", " a ", "a"},
25
{"repo", ".git", "git"},
26
{"group", "test repo", "test-repo"},
27
{"group", "Test Groep", "test-groep"},
28
{"group", "foo.bar", "foo-bar"},
29
{"group", "foo.git", "foo-git"},
30
{"group", "Werk", "werk"},
31
}
32
for _, tc := range cases {
33
got, err := Slug(tc.kind, tc.in)
34
if err != nil || got != tc.want {
35
t.Errorf("Slug(%s, %q) = %q, %v; wil %q", tc.kind, tc.in, got, err, tc.want)
36
}
37
}
38
39
bad := []struct{ kind, in string }{
40
{"repo", "!!!"},
41
{"repo", "foo.git"},
42
{"repo", ".."},
43
{"repo", ""},
44
{"repo", " "},
45
{"group", "123 test"},
46
{"group", "new"},
47
{"group", "settings"},
48
{"group", "!!!"},
49
{"other", "test"},
50
}
51
for _, tc := range bad {
52
if _, err := Slug(tc.kind, tc.in); err == nil {
53
t.Errorf("Slug(%s, %q) hoort te falen", tc.kind, tc.in)
54
}
55
}
56
57
got, err := Slug("repo", "test "+strings.Repeat("a", 80))
58
if err != nil || len(got) > 63 || !strings.HasPrefix(got, "test-") {
59
t.Fatalf("lange naam %q %v", got, err)
60
}
61
}
@@ -0,0 +1,61 @@1
package names2
3
import (4
"strings"5
"testing"6
)7
8
func TestSlug(t *testing.T) {9
cases := []struct {10
kind string11
in string12
want string13
}{14
{"repo", "test repo", "test-repo"},15
{"repo", " Test Repo ", "test-repo"},16
{"repo", "test-repo", "test-repo"},17
{"repo", "test_repo", "test_repo"},18
{"repo", "foo---bar", "foo-bar"},19
{"repo", "foo.bar", "foo.bar"},20
{"repo", "foo/bar", "foo-bar"},21
{"repo", "BlueGit", "bluegit"},22
{"repo", "café repo", "cafe-repo"},23
{"repo", "123 test", "123-test"},24
{"repo", " a ", "a"},25
{"repo", ".git", "git"},26
{"group", "test repo", "test-repo"},27
{"group", "Test Groep", "test-groep"},28
{"group", "foo.bar", "foo-bar"},29
{"group", "foo.git", "foo-git"},30
{"group", "Werk", "werk"},31
}32
for _, tc := range cases {33
got, err := Slug(tc.kind, tc.in)34
if err != nil || got != tc.want {35
t.Errorf("Slug(%s, %q) = %q, %v; wil %q", tc.kind, tc.in, got, err, tc.want)36
}37
}38
39
bad := []struct{ kind, in string }{40
{"repo", "!!!"},41
{"repo", "foo.git"},42
{"repo", ".."},43
{"repo", ""},44
{"repo", " "},45
{"group", "123 test"},46
{"group", "new"},47
{"group", "settings"},48
{"group", "!!!"},49
{"other", "test"},50
}51
for _, tc := range bad {52
if _, err := Slug(tc.kind, tc.in); err == nil {53
t.Errorf("Slug(%s, %q) hoort te falen", tc.kind, tc.in)54
}55
}56
57
got, err := Slug("repo", "test "+strings.Repeat("a", 80))58
if err != nil || len(got) > 63 || !strings.HasPrefix(got, "test-") {59
t.Fatalf("lange naam %q %v", got, err)60
}61
}@@ -354,9 +354,9 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
354
354
s.redirect(w, r, "/", "", strings.TrimSpace(noStorageMsg))
355
355
return
356
356
}
357
name := strings.TrimSpace(r.FormValue("name"))
358
if err := names.ValidRepoName(name); err != nil {
359
s.redirect(w, r, "/new", "", err.Error())
357
name, err := names.Slug("repo", r.FormValue("name"))
358
if err != nil {
359
s.redirect(w, r, "/new", "", "Deze naam kan niet.")
360
360
return
361
361
}
362
362
ownerKind := "user"
@@ -397,7 +397,13 @@ func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
397
397
if !ok || !s.csrfOK(w, r) {
398
398
return
399
399
}
400
g, err := s.Store.CreateGroup(r.Context(), u.ID, r.FormValue("name"), r.FormValue("path"), r.FormValue("description"))
400
display := strings.TrimSpace(r.FormValue("name"))
401
path, err := names.Slug("group", display)
402
if err != nil {
403
s.redirect(w, r, "/new", "", "Deze naam kan niet.")
404
return
405
}
406
g, err := s.Store.CreateGroup(r.Context(), u.ID, display, path, r.FormValue("description"))
401
407
if err != nil {
402
408
s.redirect(w, r, "/new", "", err.Error())
403
409
return
@@ -354,9 +354,9 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {354
s.redirect(w, r, "/", "", strings.TrimSpace(noStorageMsg))354
s.redirect(w, r, "/", "", strings.TrimSpace(noStorageMsg))355
return355
return356
}356
}357
name := strings.TrimSpace(r.FormValue("name"))357
name, err := names.Slug("repo", r.FormValue("name"))358
if err := names.ValidRepoName(name); err != nil {358
if err != nil {359
s.redirect(w, r, "/new", "", err.Error())359
s.redirect(w, r, "/new", "", "Deze naam kan niet.")360
return360
return361
}361
}362
ownerKind := "user"362
ownerKind := "user"@@ -397,7 +397,13 @@ func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {397
if !ok || !s.csrfOK(w, r) {397
if !ok || !s.csrfOK(w, r) {398
return398
return399
}399
}400
g, err := s.Store.CreateGroup(r.Context(), u.ID, r.FormValue("name"), r.FormValue("path"), r.FormValue("description"))400
display := strings.TrimSpace(r.FormValue("name"))401
path, err := names.Slug("group", display)402
if err != nil {403
s.redirect(w, r, "/new", "", "Deze naam kan niet.")404
return405
}406
g, err := s.Store.CreateGroup(r.Context(), u.ID, display, path, r.FormValue("description"))401
if err != nil {407
if err != nil {402
s.redirect(w, r, "/new", "", err.Error())408
s.redirect(w, r, "/new", "", err.Error())403
return409
return@@ -68,6 +68,7 @@ func (s *Server) Handler() http.Handler {
68
68
mux.HandleFunc("POST /logout", s.logout)
69
69
mux.HandleFunc("GET /{$}", s.home)
70
70
mux.HandleFunc("GET /new", s.newPage)
71
mux.HandleFunc("GET /new/slug", s.slugPreview)
71
72
mux.HandleFunc("POST /new/repo", s.createRepo)
72
73
mux.HandleFunc("POST /new/group", s.createGroup)
73
74
mux.HandleFunc("GET /setup", s.setupPage)
@@ -68,6 +68,7 @@ func (s *Server) Handler() http.Handler {68
mux.HandleFunc("POST /logout", s.logout)68
mux.HandleFunc("POST /logout", s.logout)69
mux.HandleFunc("GET /{$}", s.home)69
mux.HandleFunc("GET /{$}", s.home)70
mux.HandleFunc("GET /new", s.newPage)70
mux.HandleFunc("GET /new", s.newPage)71
mux.HandleFunc("GET /new/slug", s.slugPreview)71
mux.HandleFunc("POST /new/repo", s.createRepo)72
mux.HandleFunc("POST /new/repo", s.createRepo)72
mux.HandleFunc("POST /new/group", s.createGroup)73
mux.HandleFunc("POST /new/group", s.createGroup)73
mux.HandleFunc("GET /setup", s.setupPage)74
mux.HandleFunc("GET /setup", s.setupPage)@@ -2,6 +2,7 @@ package server
2
2
3
3
import (
4
4
"context"
5
"encoding/json"
5
6
"io"
6
7
"net/http"
7
8
"net/http/cookiejar"
@@ -293,6 +294,119 @@ func TestSetupChoosesStorage(t *testing.T) {
293
294
_ = res.Body.Close()
294
295
}
295
296
297
func TestNameBecomesSlug(t *testing.T) {
298
if _, err := exec.LookPath("git"); err != nil {
299
t.Skip("git ontbreekt")
300
}
301
storage := t.TempDir()
302
st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), bytes32())
303
if err != nil {
304
t.Fatal(err)
305
}
306
t.Cleanup(func() { _ = st.Close() })
307
cfg := config.Config{
308
BaseURL: "http://git.timfalken.com", Listen: "127.0.0.1:0", StoragePath: storage,
309
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
310
Git: config.Git{Binary: "git", DefaultBranch: "master"},
311
}
312
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
313
ts := httptest.NewServer(srv.Handler())
314
t.Cleanup(ts.Close)
315
jar, _ := cookiejar.New(nil)
316
client := &http.Client{Jar: jar}
317
res, err := client.Get(ts.URL + "/login")
318
if err != nil {
319
t.Fatal(err)
320
}
321
_ = read(t, res)
322
res, err = client.Get(ts.URL + "/new")
323
if err != nil {
324
t.Fatal(err)
325
}
326
page := read(t, res)
327
if !strings.Contains(page, `data-kind="repo"`) || !strings.Contains(page, "/assets/slug.js") {
328
t.Fatalf("formulier:\n%s", page)
329
}
330
if strings.Contains(page, `pattern=`) {
331
t.Fatalf("het naamveld blokkeert spaties in de browser:\n%s", page)
332
}
333
334
prev, err := client.Get(ts.URL + "/new/slug?kind=repo&name=test+repo")
335
if err != nil {
336
t.Fatal(err)
337
}
338
var body struct {
339
Name string `json:"name"`
340
URL string `json:"url"`
341
}
342
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {
343
t.Fatal(err)
344
}
345
prev.Body.Close()
346
if body.Name != "test-repo" || body.URL != "git.timfalken.com/tim/test-repo" {
347
t.Fatalf("preview %+v", body)
348
}
349
prev, err = client.Get(ts.URL + "/new/slug?kind=group&name=Test+Groep")
350
if err != nil {
351
t.Fatal(err)
352
}
353
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {
354
t.Fatal(err)
355
}
356
prev.Body.Close()
357
if body.Name != "test-groep" || body.URL != "git.timfalken.com/groups/test-groep" {
358
t.Fatalf("groep-preview %+v", body)
359
}
360
prev, err = client.Get(ts.URL + "/new/slug?kind=repo&name=foo.git")
361
if err != nil {
362
t.Fatal(err)
363
}
364
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {
365
t.Fatal(err)
366
}
367
prev.Body.Close()
368
if body.Name != "" || body.URL != "" {
369
t.Fatalf("ongeldige preview %+v", body)
370
}
371
372
csrf := csrfOf(t, page)
373
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrf}, "name": {"test repo"}, "visibility": {"private"}})
374
if err != nil {
375
t.Fatal(err)
376
}
377
page = read(t, res)
378
if !strings.Contains(page, "tim/test-repo") || strings.Contains(page, "test repo") {
379
t.Fatalf("repository:\n%s", page)
380
}
381
res, err = client.PostForm(ts.URL+"/new/group", url.Values{"csrf": {csrfOf(t, page)}, "name": {"Test Groep"}})
382
if err != nil {
383
t.Fatal(err)
384
}
385
page = read(t, res)
386
if !strings.Contains(page, ">Test Groep<") || !strings.Contains(page, "test-groep") {
387
t.Fatalf("groep:\n%s", page)
388
}
389
prev, err = client.Get(ts.URL + "/new/slug?kind=repo&name=test+repo&owner=test-groep")
390
if err != nil {
391
t.Fatal(err)
392
}
393
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {
394
t.Fatal(err)
395
}
396
prev.Body.Close()
397
if body.URL != "git.timfalken.com/test-groep/test-repo" {
398
t.Fatalf("preview met groep %+v", body)
399
}
400
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"foo.git"}})
401
if err != nil {
402
t.Fatal(err)
403
}
404
page = read(t, res)
405
if !strings.Contains(page, "Deze naam kan niet.") {
406
t.Fatalf("weigering:\n%s", page)
407
}
408
}
409
296
410
func csrfOf(t *testing.T, body string) string {
297
411
t.Helper()
298
412
const needle = `name="csrf" value="`
@@ -2,6 +2,7 @@ package server2
2
3
import (3
import (4
"context"4
"context"5
"encoding/json"5
"io"6
"io"6
"net/http"7
"net/http"7
"net/http/cookiejar"8
"net/http/cookiejar"@@ -293,6 +294,119 @@ func TestSetupChoosesStorage(t *testing.T) {293
_ = res.Body.Close()294
_ = res.Body.Close()294
}295
}295
296
297
func TestNameBecomesSlug(t *testing.T) {298
if _, err := exec.LookPath("git"); err != nil {299
t.Skip("git ontbreekt")300
}301
storage := t.TempDir()302
st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), bytes32())303
if err != nil {304
t.Fatal(err)305
}306
t.Cleanup(func() { _ = st.Close() })307
cfg := config.Config{308
BaseURL: "http://git.timfalken.com", Listen: "127.0.0.1:0", StoragePath: storage,309
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},310
Git: config.Git{Binary: "git", DefaultBranch: "master"},311
}312
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}313
ts := httptest.NewServer(srv.Handler())314
t.Cleanup(ts.Close)315
jar, _ := cookiejar.New(nil)316
client := &http.Client{Jar: jar}317
res, err := client.Get(ts.URL + "/login")318
if err != nil {319
t.Fatal(err)320
}321
_ = read(t, res)322
res, err = client.Get(ts.URL + "/new")323
if err != nil {324
t.Fatal(err)325
}326
page := read(t, res)327
if !strings.Contains(page, `data-kind="repo"`) || !strings.Contains(page, "/assets/slug.js") {328
t.Fatalf("formulier:\n%s", page)329
}330
if strings.Contains(page, `pattern=`) {331
t.Fatalf("het naamveld blokkeert spaties in de browser:\n%s", page)332
}333
334
prev, err := client.Get(ts.URL + "/new/slug?kind=repo&name=test+repo")335
if err != nil {336
t.Fatal(err)337
}338
var body struct {339
Name string `json:"name"`340
URL string `json:"url"`341
}342
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {343
t.Fatal(err)344
}345
prev.Body.Close()346
if body.Name != "test-repo" || body.URL != "git.timfalken.com/tim/test-repo" {347
t.Fatalf("preview %+v", body)348
}349
prev, err = client.Get(ts.URL + "/new/slug?kind=group&name=Test+Groep")350
if err != nil {351
t.Fatal(err)352
}353
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {354
t.Fatal(err)355
}356
prev.Body.Close()357
if body.Name != "test-groep" || body.URL != "git.timfalken.com/groups/test-groep" {358
t.Fatalf("groep-preview %+v", body)359
}360
prev, err = client.Get(ts.URL + "/new/slug?kind=repo&name=foo.git")361
if err != nil {362
t.Fatal(err)363
}364
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {365
t.Fatal(err)366
}367
prev.Body.Close()368
if body.Name != "" || body.URL != "" {369
t.Fatalf("ongeldige preview %+v", body)370
}371
372
csrf := csrfOf(t, page)373
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrf}, "name": {"test repo"}, "visibility": {"private"}})374
if err != nil {375
t.Fatal(err)376
}377
page = read(t, res)378
if !strings.Contains(page, "tim/test-repo") || strings.Contains(page, "test repo") {379
t.Fatalf("repository:\n%s", page)380
}381
res, err = client.PostForm(ts.URL+"/new/group", url.Values{"csrf": {csrfOf(t, page)}, "name": {"Test Groep"}})382
if err != nil {383
t.Fatal(err)384
}385
page = read(t, res)386
if !strings.Contains(page, ">Test Groep<") || !strings.Contains(page, "test-groep") {387
t.Fatalf("groep:\n%s", page)388
}389
prev, err = client.Get(ts.URL + "/new/slug?kind=repo&name=test+repo&owner=test-groep")390
if err != nil {391
t.Fatal(err)392
}393
if err := json.NewDecoder(prev.Body).Decode(&body); err != nil {394
t.Fatal(err)395
}396
prev.Body.Close()397
if body.URL != "git.timfalken.com/test-groep/test-repo" {398
t.Fatalf("preview met groep %+v", body)399
}400
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"foo.git"}})401
if err != nil {402
t.Fatal(err)403
}404
page = read(t, res)405
if !strings.Contains(page, "Deze naam kan niet.") {406
t.Fatalf("weigering:\n%s", page)407
}408
}409
296
func csrfOf(t *testing.T, body string) string {410
func csrfOf(t *testing.T, body string) string {297
t.Helper()411
t.Helper()298
const needle = `name="csrf" value="`412
const needle = `name="csrf" value="`@@ -0,0 +1,63 @@
1
package server
2
3
import (
4
"encoding/json"
5
"net/http"
6
"net/url"
7
"strings"
8
9
"gitlab.com/Timfa/bluegit/internal/access"
10
"gitlab.com/Timfa/bluegit/internal/names"
11
)
12
13
func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {
14
u, ok := s.loginRequired(w, r)
15
if !ok {
16
return
17
}
18
kind := r.URL.Query().Get("kind")
19
raw := r.URL.Query().Get("name")
20
w.Header().Set("Content-Type", "application/json; charset=utf-8")
21
slug, err := names.Slug(kind, raw)
22
if strings.TrimSpace(raw) == "" || err != nil {
23
_ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})
24
return
25
}
26
host := publicHost(s.Cfg.BaseURL, r.Host)
27
var path string
28
switch kind {
29
case "repo":
30
owner := s.previewOwner(r, u.ID, u.Username)
31
path = host + "/" + owner + "/" + slug
32
case "group":
33
path = host + "/groups/" + slug
34
default:
35
_ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})
36
return
37
}
38
_ = json.NewEncoder(w).Encode(map[string]string{"name": slug, "url": path})
39
}
40
41
func (s *Server) previewOwner(r *http.Request, userID int64, username string) string {
42
owner := strings.TrimSpace(r.URL.Query().Get("owner"))
43
if owner == "" || owner == username {
44
return username
45
}
46
g, err := s.Store.GroupByPath(r.Context(), owner)
47
if err != nil {
48
return username
49
}
50
role, err := s.Store.GroupRole(r.Context(), g.ID, userID)
51
if err != nil || role == access.RoleNone {
52
return username
53
}
54
return g.Path
55
}
56
57
func publicHost(base, fallback string) string {
58
u, err := url.Parse(strings.TrimSpace(base))
59
if err != nil || u.Host == "" {
60
return fallback
61
}
62
return u.Host
63
}
@@ -0,0 +1,63 @@1
package server2
3
import (4
"encoding/json"5
"net/http"6
"net/url"7
"strings"8
9
"gitlab.com/Timfa/bluegit/internal/access"10
"gitlab.com/Timfa/bluegit/internal/names"11
)12
13
func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {14
u, ok := s.loginRequired(w, r)15
if !ok {16
return17
}18
kind := r.URL.Query().Get("kind")19
raw := r.URL.Query().Get("name")20
w.Header().Set("Content-Type", "application/json; charset=utf-8")21
slug, err := names.Slug(kind, raw)22
if strings.TrimSpace(raw) == "" || err != nil {23
_ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})24
return25
}26
host := publicHost(s.Cfg.BaseURL, r.Host)27
var path string28
switch kind {29
case "repo":30
owner := s.previewOwner(r, u.ID, u.Username)31
path = host + "/" + owner + "/" + slug32
case "group":33
path = host + "/groups/" + slug34
default:35
_ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})36
return37
}38
_ = json.NewEncoder(w).Encode(map[string]string{"name": slug, "url": path})39
}40
41
func (s *Server) previewOwner(r *http.Request, userID int64, username string) string {42
owner := strings.TrimSpace(r.URL.Query().Get("owner"))43
if owner == "" || owner == username {44
return username45
}46
g, err := s.Store.GroupByPath(r.Context(), owner)47
if err != nil {48
return username49
}50
role, err := s.Store.GroupRole(r.Context(), g.ID, userID)51
if err != nil || role == access.RoleNone {52
return username53
}54
return g.Path55
}56
57
func publicHost(base, fallback string) string {58
u, err := url.Parse(strings.TrimSpace(base))59
if err != nil || u.Host == "" {60
return fallback61
}62
return u.Host63
}@@ -0,0 +1,52 @@
1
(function () {
2
var forms = document.querySelectorAll("form[data-kind]");
3
for (var i = 0; i < forms.length; i++) {
4
bind(forms[i]);
5
}
6
7
function bind(form) {
8
var name = form.querySelector("[name=name]");
9
var out = form.querySelector("[data-slug-out]");
10
var owner = form.querySelector("[name=group]");
11
if (!name || !out) {
12
return;
13
}
14
var seq = 0;
15
function update() {
16
var n = ++seq;
17
var value = name.value;
18
if (!value.trim()) {
19
out.textContent = "";
20
return;
21
}
22
var q = new URLSearchParams();
23
q.set("kind", form.getAttribute("data-kind"));
24
q.set("name", value);
25
if (owner) {
26
q.set("owner", owner.value);
27
}
28
fetch("/new/slug?" + q.toString(), { headers: { Accept: "application/json" } })
29
.then(function (res) {
30
if (!res.ok) {
31
throw new Error("slug");
32
}
33
return res.json();
34
})
35
.then(function (data) {
36
if (n !== seq) {
37
return;
38
}
39
out.textContent = data.name ? data.name + " · " + data.url : "Deze naam kan niet.";
40
})
41
.catch(function () {
42
if (n === seq) {
43
out.textContent = "";
44
}
45
});
46
}
47
name.addEventListener("input", update);
48
if (owner) {
49
owner.addEventListener("change", update);
50
}
51
}
52
})();
@@ -0,0 +1,52 @@1
(function () {2
var forms = document.querySelectorAll("form[data-kind]");3
for (var i = 0; i < forms.length; i++) {4
bind(forms[i]);5
}6
7
function bind(form) {8
var name = form.querySelector("[name=name]");9
var out = form.querySelector("[data-slug-out]");10
var owner = form.querySelector("[name=group]");11
if (!name || !out) {12
return;13
}14
var seq = 0;15
function update() {16
var n = ++seq;17
var value = name.value;18
if (!value.trim()) {19
out.textContent = "";20
return;21
}22
var q = new URLSearchParams();23
q.set("kind", form.getAttribute("data-kind"));24
q.set("name", value);25
if (owner) {26
q.set("owner", owner.value);27
}28
fetch("/new/slug?" + q.toString(), { headers: { Accept: "application/json" } })29
.then(function (res) {30
if (!res.ok) {31
throw new Error("slug");32
}33
return res.json();34
})35
.then(function (data) {36
if (n !== seq) {37
return;38
}39
out.textContent = data.name ? data.name + " · " + data.url : "Deze naam kan niet.";40
})41
.catch(function () {42
if (n === seq) {43
out.textContent = "";44
}45
});46
}47
name.addEventListener("input", update);48
if (owner) {49
owner.addEventListener("change", update);50
}51
}52
})();@@ -40,6 +40,8 @@ main { max-width: 980px; margin: 0 auto; padding: 1.4rem; }
40
40
.tabs, .sub { display: flex; gap: 0.8rem; flex-wrap: wrap; margin: 0.4rem 0 1rem; }
41
41
.sub a { text-decoration: none; padding-bottom: 0.2rem; }
42
42
.muted { color: var(--muted); }
43
.preview { margin: 0.15rem 0 0.7rem; color: var(--muted); word-break: break-all; }
44
.preview:empty { display: none; }
43
45
label { display: block; margin: 0.55rem 0; }
44
46
input[type="checkbox"] { width: auto; }
45
47
input, textarea, select {
@@ -40,6 +40,8 @@ main { max-width: 980px; margin: 0 auto; padding: 1.4rem; }40
.tabs, .sub { display: flex; gap: 0.8rem; flex-wrap: wrap; margin: 0.4rem 0 1rem; }40
.tabs, .sub { display: flex; gap: 0.8rem; flex-wrap: wrap; margin: 0.4rem 0 1rem; }41
.sub a { text-decoration: none; padding-bottom: 0.2rem; }41
.sub a { text-decoration: none; padding-bottom: 0.2rem; }42
.muted { color: var(--muted); }42
.muted { color: var(--muted); }43
.preview { margin: 0.15rem 0 0.7rem; color: var(--muted); word-break: break-all; }44
.preview:empty { display: none; }43
label { display: block; margin: 0.55rem 0; }45
label { display: block; margin: 0.55rem 0; }44
input[type="checkbox"] { width: auto; }46
input[type="checkbox"] { width: auto; }45
input, textarea, select {47
input, textarea, select {@@ -67,10 +67,11 @@
67
67
{{template "layout-start" .}}
68
68
<h1>Nieuw</h1>
69
69
<div class="grid-2">
70
<form class="panel" method="post" action="/new/repo">
70
<form class="panel" method="post" action="/new/repo" data-kind="repo">
71
71
<h2>Repository</h2>
72
72
<input type="hidden" name="csrf" value="{{.CSRF}}">
73
<label>Naam <input name="name" required pattern="[A-Za-z0-9][A-Za-z0-9._-]{0,62}"></label>
73
<label>Naam <input name="name" required autocomplete="off"></label>
74
<p class="preview" data-slug-out></p>
74
75
<label>Beschrijving <input name="description"></label>
75
76
<label>Eigenaar
76
77
<select name="group">
@@ -83,15 +84,16 @@
83
84
</label>
84
85
<button type="submit">Aanmaken</button>
85
86
</form>
86
<form class="panel" method="post" action="/new/group">
87
<form class="panel" method="post" action="/new/group" data-kind="group">
87
88
<h2>Groep</h2>
88
89
<input type="hidden" name="csrf" value="{{.CSRF}}">
89
<label>Naam <input name="name" required></label>
90
<label>Pad <input name="path" required pattern="[a-z][a-z0-9_-]{0,62}"></label>
90
<label>Naam <input name="name" required autocomplete="off"></label>
91
<p class="preview" data-slug-out></p>
91
92
<label>Beschrijving <input name="description"></label>
92
93
<button type="submit">Aanmaken</button>
93
94
</form>
94
95
</div>
96
<script src="/assets/slug.js"></script>
95
97
{{template "layout-end" .}}
96
98
{{end}}
97
99
@@ -67,10 +67,11 @@67
{{template "layout-start" .}}67
{{template "layout-start" .}}68
<h1>Nieuw</h1>68
<h1>Nieuw</h1>69
<div class="grid-2">69
<div class="grid-2">70
<form class="panel" method="post" action="/new/repo">70
<form class="panel" method="post" action="/new/repo" data-kind="repo">71
<h2>Repository</h2>71
<h2>Repository</h2>72
<input type="hidden" name="csrf" value="{{.CSRF}}">72
<input type="hidden" name="csrf" value="{{.CSRF}}">73
<label>Naam <input name="name" required pattern="[A-Za-z0-9][A-Za-z0-9._-]{0,62}"></label>73
<label>Naam <input name="name" required autocomplete="off"></label>74
<p class="preview" data-slug-out></p>74
<label>Beschrijving <input name="description"></label>75
<label>Beschrijving <input name="description"></label>75
<label>Eigenaar76
<label>Eigenaar76
<select name="group">77
<select name="group">@@ -83,15 +84,16 @@83
</label>84
</label>84
<button type="submit">Aanmaken</button>85
<button type="submit">Aanmaken</button>85
</form>86
</form>86
<form class="panel" method="post" action="/new/group">87
<form class="panel" method="post" action="/new/group" data-kind="group">87
<h2>Groep</h2>88
<h2>Groep</h2>88
<input type="hidden" name="csrf" value="{{.CSRF}}">89
<input type="hidden" name="csrf" value="{{.CSRF}}">89
<label>Naam <input name="name" required></label>90
<label>Naam <input name="name" required autocomplete="off"></label>90
<label>Pad <input name="path" required pattern="[a-z][a-z0-9_-]{0,62}"></label>91
<p class="preview" data-slug-out></p>91
<label>Beschrijving <input name="description"></label>92
<label>Beschrijving <input name="description"></label>92
<button type="submit">Aanmaken</button>93
<button type="submit">Aanmaken</button>93
</form>94
</form>94
</div>95
</div>96
<script src="/assets/slug.js"></script>95
{{template "layout-end" .}}97
{{template "layout-end" .}}96
{{end}}98
{{end}}97
99