BlueGit

timfa bluegit

feat: nieuw-formulier, groepsoverzicht, logo's en talen

De pagina Nieuw opent een modal, controleert de slug en maakt groepen
met een standaardrol. Groepen krijgen een overzicht met zoeken, sterren
en logo's. Alle interface-teksten lopen via i18n, standaard Engels.

Co-authored-by: tim <tim@timfalken.com>

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-21 · 3 weeks ago

Hash
d1203d3bbfb62e630f0651eced2965fef8a757e3
Parent
d5433bc7
Pipeline
Failed
46 files changed +4155 −633
internal/access/access.go +27 −17
@@ -7,9 +7,10 @@
7 7 package access
8 8
9 9 import (
10 "fmt"
11 10 "path"
12 11 "strings"
12
13 "gitlab.com/Timfa/bluegit/internal/i18n"
13 14 )
14 15
15 16 // Role is een toegangsrol op een repository of groep.
@@ -32,23 +33,23 @@ func ParseRole(s string) (Role, error) {
32 33 case RoleMaintainer:
33 34 return RoleMaintainer, nil
34 35 case RoleNone:
35 return RoleNone, fmt.Errorf("rol ontbreekt")
36 return RoleNone, i18n.E("err.roleMissing")
36 37 default:
37 return RoleNone, fmt.Errorf("onbekende rol %q", s)
38 return RoleNone, i18n.E("err.roleUnknown", s)
38 39 }
39 40 }
40 41
41 // Label is de Nederlandse naam in de interface.
42 // Label is de Engelse naam. De webinterface vertaalt via i18n.
42 43 func (r Role) Label() string {
43 44 switch r {
44 45 case RoleReadonly:
45 return "Alleen lezen"
46 return "Readonly"
46 47 case RoleDeveloper:
47 return "Ontwikkelaar"
48 return "Developer"
48 49 case RoleMaintainer:
49 return "Beheerder"
50 return "Maintainer"
50 51 default:
51 return "Geen"
52 return "None"
52 53 }
53 54 }
54 55
@@ -119,13 +120,22 @@ type Input struct {
119 120 }
120 121
121 122 // Resolve kiest de effectieve rol.
122 // De persoonlijke eigenaar is beheerder. Anders geldt de hoogste van
123 // groepsrol en repositoryrol.
123 // De persoonlijke eigenaar is beheerder. Een groepsbeheerder blijft
124 // beheerder van elke repository van de groep. Een expliciete
125 // repositoryrol vervangt een lagere groepsrol, zodat de standaardrol
126 // van de groep op een nieuwe repository kan gelden. Zonder
127 // repositoryrol blijft de groepsrol van kracht.
124 128 func Resolve(in Input) Role {
125 129 if in.UserOwner {
126 130 return RoleMaintainer
127 131 }
128 return Max(in.GroupRole, in.RepoRole)
132 if in.GroupRole == RoleMaintainer {
133 return RoleMaintainer
134 }
135 if in.RepoRole != RoleNone {
136 return in.RepoRole
137 }
138 return in.GroupRole
129 139 }
130 140
131 141 // BranchProtected meldt of branch op een van de patronen past.
@@ -161,7 +171,7 @@ type RefUpdate struct {
161 171 // mag een ontwikkelaar schrijven. Alleen-lezen mag niets schrijven.
162 172 func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
163 173 if !role.CanWriteCode() {
164 return fmt.Errorf("geen schrijfrechten op %s", u.Ref)
174 return i18n.E("err.hook.nowrite", u.Ref)
165 175 }
166 176 const heads = "refs/heads/"
167 177 if !strings.HasPrefix(u.Ref, heads) {
@@ -169,10 +179,10 @@ func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
169 179 }
170 180 branch := strings.TrimPrefix(u.Ref, heads)
171 181 if branch == "" || strings.Contains(branch, "..") {
172 return fmt.Errorf("ongeldige branch %q", branch)
182 return i18n.E("err.hook.branch", branch)
173 183 }
174 184 if BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
175 return fmt.Errorf("branch %s is beschermd; alleen een beheerder mag die wijzigen", branch)
185 return i18n.E("err.hook.protected", branch)
176 186 }
177 187 return nil
178 188 }
@@ -180,7 +190,7 @@ func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
180 190 // AuthorizeUpdates keurt een hele push goed. De eerste fout stopt.
181 191 func AuthorizeUpdates(role Role, patterns []string, updates []RefUpdate) error {
182 192 if len(updates) == 0 {
183 return fmt.Errorf("lege push")
193 return i18n.E("err.hook.empty")
184 194 }
185 195 for _, u := range updates {
186 196 if err := AuthorizeUpdate(role, patterns, u); err != nil {
@@ -205,12 +215,12 @@ func InjectSecret(secretProtected, refProtected bool) bool {
205 215 // ValidSecretName eist een omgevingsvariabelenaam.
206 216 func ValidSecretName(name string) error {
207 217 if name == "" || len(name) > 80 {
208 return fmt.Errorf("geheimnaam moet 1 tot 80 tekens zijn")
218 return i18n.E("err.secretLen")
209 219 }
210 220 for i, c := range name {
211 221 ok := c == '_' || (c >= 'A' && c <= 'Z') || (i > 0 && c >= '0' && c <= '9')
212 222 if !ok {
213 return fmt.Errorf("geheimnaam %q moet [A-Z][A-Z0-9_]* zijn", name)
223 return i18n.E("err.secretForm", name)
214 224 }
215 225 }
216 226 return nil
@@ -7,9 +7,10 @@
7package access
7package access
8
8
9import (
9import (
10 "fmt"
11 "path"
10 "path"
12 "strings"
11 "strings"
12
13 "gitlab.com/Timfa/bluegit/internal/i18n"
13)
14)
14
15
15// Role is een toegangsrol op een repository of groep.
16// Role is een toegangsrol op een repository of groep.
@@ -32,23 +33,23 @@ func ParseRole(s string) (Role, error) {
32 case RoleMaintainer:
33 case RoleMaintainer:
33 return RoleMaintainer, nil
34 return RoleMaintainer, nil
34 case RoleNone:
35 case RoleNone:
35 return RoleNone, fmt.Errorf("rol ontbreekt")
36 return RoleNone, i18n.E("err.roleMissing")
36 default:
37 default:
37 return RoleNone, fmt.Errorf("onbekende rol %q", s)
38 return RoleNone, i18n.E("err.roleUnknown", s)
38 }
39 }
39}
40}
40
41
41// Label is de Nederlandse naam in de interface.
42// Label is de Engelse naam. De webinterface vertaalt via i18n.
42func (r Role) Label() string {
43func (r Role) Label() string {
43 switch r {
44 switch r {
44 case RoleReadonly:
45 case RoleReadonly:
45 return "Alleen lezen"
46 return "Readonly"
46 case RoleDeveloper:
47 case RoleDeveloper:
47 return "Ontwikkelaar"
48 return "Developer"
48 case RoleMaintainer:
49 case RoleMaintainer:
49 return "Beheerder"
50 return "Maintainer"
50 default:
51 default:
51 return "Geen"
52 return "None"
52 }
53 }
53}
54}
54
55
@@ -119,13 +120,22 @@ type Input struct {
119}
120}
120
121
121// Resolve kiest de effectieve rol.
122// Resolve kiest de effectieve rol.
122// De persoonlijke eigenaar is beheerder. Anders geldt de hoogste van
123// De persoonlijke eigenaar is beheerder. Een groepsbeheerder blijft
123// groepsrol en repositoryrol.
124// beheerder van elke repository van de groep. Een expliciete
125// repositoryrol vervangt een lagere groepsrol, zodat de standaardrol
126// van de groep op een nieuwe repository kan gelden. Zonder
127// repositoryrol blijft de groepsrol van kracht.
124func Resolve(in Input) Role {
128func Resolve(in Input) Role {
125 if in.UserOwner {
129 if in.UserOwner {
126 return RoleMaintainer
130 return RoleMaintainer
127 }
131 }
128 return Max(in.GroupRole, in.RepoRole)
132 if in.GroupRole == RoleMaintainer {
133 return RoleMaintainer
134 }
135 if in.RepoRole != RoleNone {
136 return in.RepoRole
137 }
138 return in.GroupRole
129}
139}
130
140
131// BranchProtected meldt of branch op een van de patronen past.
141// BranchProtected meldt of branch op een van de patronen past.
@@ -161,7 +171,7 @@ type RefUpdate struct {
161// mag een ontwikkelaar schrijven. Alleen-lezen mag niets schrijven.
171// mag een ontwikkelaar schrijven. Alleen-lezen mag niets schrijven.
162func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
172func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
163 if !role.CanWriteCode() {
173 if !role.CanWriteCode() {
164 return fmt.Errorf("geen schrijfrechten op %s", u.Ref)
174 return i18n.E("err.hook.nowrite", u.Ref)
165 }
175 }
166 const heads = "refs/heads/"
176 const heads = "refs/heads/"
167 if !strings.HasPrefix(u.Ref, heads) {
177 if !strings.HasPrefix(u.Ref, heads) {
@@ -169,10 +179,10 @@ func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
169 }
179 }
170 branch := strings.TrimPrefix(u.Ref, heads)
180 branch := strings.TrimPrefix(u.Ref, heads)
171 if branch == "" || strings.Contains(branch, "..") {
181 if branch == "" || strings.Contains(branch, "..") {
172 return fmt.Errorf("ongeldige branch %q", branch)
182 return i18n.E("err.hook.branch", branch)
173 }
183 }
174 if BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
184 if BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
175 return fmt.Errorf("branch %s is beschermd; alleen een beheerder mag die wijzigen", branch)
185 return i18n.E("err.hook.protected", branch)
176 }
186 }
177 return nil
187 return nil
178}
188}
@@ -180,7 +190,7 @@ func AuthorizeUpdate(role Role, patterns []string, u RefUpdate) error {
180// AuthorizeUpdates keurt een hele push goed. De eerste fout stopt.
190// AuthorizeUpdates keurt een hele push goed. De eerste fout stopt.
181func AuthorizeUpdates(role Role, patterns []string, updates []RefUpdate) error {
191func AuthorizeUpdates(role Role, patterns []string, updates []RefUpdate) error {
182 if len(updates) == 0 {
192 if len(updates) == 0 {
183 return fmt.Errorf("lege push")
193 return i18n.E("err.hook.empty")
184 }
194 }
185 for _, u := range updates {
195 for _, u := range updates {
186 if err := AuthorizeUpdate(role, patterns, u); err != nil {
196 if err := AuthorizeUpdate(role, patterns, u); err != nil {
@@ -205,12 +215,12 @@ func InjectSecret(secretProtected, refProtected bool) bool {
205// ValidSecretName eist een omgevingsvariabelenaam.
215// ValidSecretName eist een omgevingsvariabelenaam.
206func ValidSecretName(name string) error {
216func ValidSecretName(name string) error {
207 if name == "" || len(name) > 80 {
217 if name == "" || len(name) > 80 {
208 return fmt.Errorf("geheimnaam moet 1 tot 80 tekens zijn")
218 return i18n.E("err.secretLen")
209 }
219 }
210 for i, c := range name {
220 for i, c := range name {
211 ok := c == '_' || (c >= 'A' && c <= 'Z') || (i > 0 && c >= '0' && c <= '9')
221 ok := c == '_' || (c >= 'A' && c <= 'Z') || (i > 0 && c >= '0' && c <= '9')
212 if !ok {
222 if !ok {
213 return fmt.Errorf("geheimnaam %q moet [A-Z][A-Z0-9_]* zijn", name)
223 return i18n.E("err.secretForm", name)
214 }
224 }
215 }
225 }
216 return nil
226 return nil
internal/access/access_test.go +3 −0
@@ -47,6 +47,9 @@ func TestResolve(t *testing.T) {
47 47 if Resolve(Input{}) != RoleNone {
48 48 t.Fatal("geen lidmaatschap")
49 49 }
50 if Resolve(Input{GroupRole: RoleDeveloper, RepoRole: RoleReadonly}) != RoleReadonly {
51 t.Fatal("expliciete repositoryrol vervangt een lagere groepsrol")
52 }
50 53 }
51 54
52 55 func TestCapabilities(t *testing.T) {
@@ -47,6 +47,9 @@ func TestResolve(t *testing.T) {
47 if Resolve(Input{}) != RoleNone {
47 if Resolve(Input{}) != RoleNone {
48 t.Fatal("geen lidmaatschap")
48 t.Fatal("geen lidmaatschap")
49 }
49 }
50 if Resolve(Input{GroupRole: RoleDeveloper, RepoRole: RoleReadonly}) != RoleReadonly {
51 t.Fatal("expliciete repositoryrol vervangt een lagere groepsrol")
52 }
50}
53}
51
54
52func TestCapabilities(t *testing.T) {
55func TestCapabilities(t *testing.T) {
internal/activity/calendar.go +7 −27
@@ -2,8 +2,9 @@
2 2 package activity
3 3
4 4 import (
5 "fmt"
6 5 "time"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
7 8 )
8 9
9 10 // Day is één vakje. Off ligt buiten het venster en telt niet mee.
@@ -54,7 +55,7 @@ func Level(n int) int {
54 55
55 56 // Build maakt het rooster tot en met de dag van now.
56 57 // counts gebruikt de sleutel 2006-01-02 in Location.
57 func Build(now time.Time, counts map[string]int) Calendar {
58 func Build(now time.Time, counts map[string]int, lang i18n.Lang) Calendar {
58 59 loc := Location()
59 60 end := midnight(now, loc)
60 61 start := end.AddDate(0, -12, 0)
@@ -82,20 +83,20 @@ func Build(now time.Time, counts map[string]int) Calendar {
82 83 }
83 84 cal.Total += n
84 85 if day.Day() == 1 {
85 label = monthShort(day.Month())
86 label = i18n.MonthShort(lang, day.Month())
86 87 }
87 days = append(days, Day{Level: Level(n), Tip: phrase(n, "op "+longDate(day))})
88 days = append(days, Day{Level: Level(n), Tip: i18n.Contrib(lang, n, i18n.FormatDate(lang, day), false)})
88 89 }
89 90 if label == "" && first {
90 91 if d := firstInside(week, start, end); !d.IsZero() {
91 label = monthShort(d.Month())
92 label = i18n.MonthShort(lang, d.Month())
92 93 }
93 94 }
94 95 first = false
95 96 cal.Weeks = append(cal.Weeks, Week{Days: days, Label: label})
96 97 week = week.AddDate(0, 0, 7)
97 98 }
98 cal.TotalText = phrase(cal.Total, "in de laatste 12 maanden")
99 cal.TotalText = i18n.Contrib(lang, cal.Total, "", true)
99 100 return cal
100 101 }
101 102
@@ -113,24 +114,3 @@ func firstInside(week, start, end time.Time) time.Time {
113 114 }
114 115 return time.Time{}
115 116 }
116
117 func phrase(n int, tail string) string {
118 switch {
119 case n <= 0:
120 return "Geen bijdragen " + tail
121 case n == 1:
122 return "1 bijdrage " + tail
123 default:
124 return fmt.Sprintf("%d bijdragen %s", n, tail)
125 }
126 }
127
128 func longDate(t time.Time) string {
129 months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
130 return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
131 }
132
133 func monthShort(m time.Month) string {
134 short := []string{"", "jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}
135 return short[m]
136 }
@@ -2,8 +2,9 @@
2package activity
2package activity
3
3
4import (
4import (
5 "fmt"
6 "time"
5 "time"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
7)
8)
8
9
9// Day is één vakje. Off ligt buiten het venster en telt niet mee.
10// Day is één vakje. Off ligt buiten het venster en telt niet mee.
@@ -54,7 +55,7 @@ func Level(n int) int {
54
55
55// Build maakt het rooster tot en met de dag van now.
56// Build maakt het rooster tot en met de dag van now.
56// counts gebruikt de sleutel 2006-01-02 in Location.
57// counts gebruikt de sleutel 2006-01-02 in Location.
57func Build(now time.Time, counts map[string]int) Calendar {
58func Build(now time.Time, counts map[string]int, lang i18n.Lang) Calendar {
58 loc := Location()
59 loc := Location()
59 end := midnight(now, loc)
60 end := midnight(now, loc)
60 start := end.AddDate(0, -12, 0)
61 start := end.AddDate(0, -12, 0)
@@ -82,20 +83,20 @@ func Build(now time.Time, counts map[string]int) Calendar {
82 }
83 }
83 cal.Total += n
84 cal.Total += n
84 if day.Day() == 1 {
85 if day.Day() == 1 {
85 label = monthShort(day.Month())
86 label = i18n.MonthShort(lang, day.Month())
86 }
87 }
87 days = append(days, Day{Level: Level(n), Tip: phrase(n, "op "+longDate(day))})
88 days = append(days, Day{Level: Level(n), Tip: i18n.Contrib(lang, n, i18n.FormatDate(lang, day), false)})
88 }
89 }
89 if label == "" && first {
90 if label == "" && first {
90 if d := firstInside(week, start, end); !d.IsZero() {
91 if d := firstInside(week, start, end); !d.IsZero() {
91 label = monthShort(d.Month())
92 label = i18n.MonthShort(lang, d.Month())
92 }
93 }
93 }
94 }
94 first = false
95 first = false
95 cal.Weeks = append(cal.Weeks, Week{Days: days, Label: label})
96 cal.Weeks = append(cal.Weeks, Week{Days: days, Label: label})
96 week = week.AddDate(0, 0, 7)
97 week = week.AddDate(0, 0, 7)
97 }
98 }
98 cal.TotalText = phrase(cal.Total, "in de laatste 12 maanden")
99 cal.TotalText = i18n.Contrib(lang, cal.Total, "", true)
99 return cal
100 return cal
100}
101}
101
102
@@ -113,24 +114,3 @@ func firstInside(week, start, end time.Time) time.Time {
113 }
114 }
114 return time.Time{}
115 return time.Time{}
115}
116}
116
117func phrase(n int, tail string) string {
118 switch {
119 case n <= 0:
120 return "Geen bijdragen " + tail
121 case n == 1:
122 return "1 bijdrage " + tail
123 default:
124 return fmt.Sprintf("%d bijdragen %s", n, tail)
125 }
126}
127
128func longDate(t time.Time) string {
129 months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
130 return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
131}
132
133func monthShort(m time.Month) string {
134 short := []string{"", "jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}
135 return short[m]
136}
internal/activity/calendar_test.go +8 −6
@@ -4,6 +4,8 @@ import (
4 4 "strings"
5 5 "testing"
6 6 "time"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
7 9 )
8 10
9 11 func TestLevel(t *testing.T) {
@@ -23,11 +25,11 @@ func TestBuildYearGrid(t *testing.T) {
23 25 "2026-10-20": 4,
24 26 "2025-11-01": 2,
25 27 "2025-10-20": 9,
26 })
28 }, i18n.EN)
27 29 if cal.Total != 7 {
28 30 t.Fatalf("totaal %d, tekst %s", cal.Total, cal.TotalText)
29 31 }
30 if cal.TotalText != "7 bijdragen in de laatste 12 maanden" {
32 if cal.TotalText != "7 contributions in the last 12 months" {
31 33 t.Fatal(cal.TotalText)
32 34 }
33 35 if len(cal.Weeks) < 52 || len(cal.Weeks) > 54 {
@@ -37,17 +39,17 @@ func TestBuildYearGrid(t *testing.T) {
37 39 if len(first.Days) != 7 || !first.Days[0].Off || !first.Days[1].Off || first.Days[2].Off {
38 40 t.Fatalf("eerste week %+v", first.Days)
39 41 }
40 if first.Label != "okt" {
42 if first.Label != "Oct" {
41 43 t.Fatalf("eerste label %q", first.Label)
42 44 }
43 45 last := cal.Weeks[len(cal.Weeks)-1]
44 46 if len(last.Days) != 4 {
45 47 t.Fatalf("laatste week heeft %d dagen", len(last.Days))
46 48 }
47 if last.Days[2].Level != 3 || last.Days[2].Tip != "4 bijdragen op 20 oktober 2026" {
49 if last.Days[2].Level != 3 || last.Days[2].Tip != "4 contributions on 20 October 2026" {
48 50 t.Fatalf("dinsdag %+v", last.Days[2])
49 51 }
50 if last.Days[3].Level != 1 || !strings.Contains(last.Days[3].Tip, "1 bijdrage op 21 oktober 2026") {
52 if last.Days[3].Level != 1 || !strings.Contains(last.Days[3].Tip, "1 contribution on 21 October 2026") {
51 53 t.Fatalf("woensdag %+v", last.Days[3])
52 54 }
53 55 labels := 0
@@ -58,7 +60,7 @@ func TestBuildYearGrid(t *testing.T) {
58 60 seen = append(seen, w.Label)
59 61 }
60 62 }
61 if labels != 13 || seen[0] != "okt" || seen[len(seen)-1] != "okt" || !contains(seen, "nov") || !contains(seen, "mrt") {
63 if labels != 13 || seen[0] != "Oct" || seen[len(seen)-1] != "Oct" || !contains(seen, "Nov") || !contains(seen, "Mar") {
62 64 t.Fatalf("labels %v", seen)
63 65 }
64 66 }
@@ -4,6 +4,8 @@ import (
4 "strings"
4 "strings"
5 "testing"
5 "testing"
6 "time"
6 "time"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
7)
9)
8
10
9func TestLevel(t *testing.T) {
11func TestLevel(t *testing.T) {
@@ -23,11 +25,11 @@ func TestBuildYearGrid(t *testing.T) {
23 "2026-10-20": 4,
25 "2026-10-20": 4,
24 "2025-11-01": 2,
26 "2025-11-01": 2,
25 "2025-10-20": 9,
27 "2025-10-20": 9,
26 })
28 }, i18n.EN)
27 if cal.Total != 7 {
29 if cal.Total != 7 {
28 t.Fatalf("totaal %d, tekst %s", cal.Total, cal.TotalText)
30 t.Fatalf("totaal %d, tekst %s", cal.Total, cal.TotalText)
29 }
31 }
30 if cal.TotalText != "7 bijdragen in de laatste 12 maanden" {
32 if cal.TotalText != "7 contributions in the last 12 months" {
31 t.Fatal(cal.TotalText)
33 t.Fatal(cal.TotalText)
32 }
34 }
33 if len(cal.Weeks) < 52 || len(cal.Weeks) > 54 {
35 if len(cal.Weeks) < 52 || len(cal.Weeks) > 54 {
@@ -37,17 +39,17 @@ func TestBuildYearGrid(t *testing.T) {
37 if len(first.Days) != 7 || !first.Days[0].Off || !first.Days[1].Off || first.Days[2].Off {
39 if len(first.Days) != 7 || !first.Days[0].Off || !first.Days[1].Off || first.Days[2].Off {
38 t.Fatalf("eerste week %+v", first.Days)
40 t.Fatalf("eerste week %+v", first.Days)
39 }
41 }
40 if first.Label != "okt" {
42 if first.Label != "Oct" {
41 t.Fatalf("eerste label %q", first.Label)
43 t.Fatalf("eerste label %q", first.Label)
42 }
44 }
43 last := cal.Weeks[len(cal.Weeks)-1]
45 last := cal.Weeks[len(cal.Weeks)-1]
44 if len(last.Days) != 4 {
46 if len(last.Days) != 4 {
45 t.Fatalf("laatste week heeft %d dagen", len(last.Days))
47 t.Fatalf("laatste week heeft %d dagen", len(last.Days))
46 }
48 }
47 if last.Days[2].Level != 3 || last.Days[2].Tip != "4 bijdragen op 20 oktober 2026" {
49 if last.Days[2].Level != 3 || last.Days[2].Tip != "4 contributions on 20 October 2026" {
48 t.Fatalf("dinsdag %+v", last.Days[2])
50 t.Fatalf("dinsdag %+v", last.Days[2])
49 }
51 }
50 if last.Days[3].Level != 1 || !strings.Contains(last.Days[3].Tip, "1 bijdrage op 21 oktober 2026") {
52 if last.Days[3].Level != 1 || !strings.Contains(last.Days[3].Tip, "1 contribution on 21 October 2026") {
51 t.Fatalf("woensdag %+v", last.Days[3])
53 t.Fatalf("woensdag %+v", last.Days[3])
52 }
54 }
53 labels := 0
55 labels := 0
@@ -58,7 +60,7 @@ func TestBuildYearGrid(t *testing.T) {
58 seen = append(seen, w.Label)
60 seen = append(seen, w.Label)
59 }
61 }
60 }
62 }
61 if labels != 13 || seen[0] != "okt" || seen[len(seen)-1] != "okt" || !contains(seen, "nov") || !contains(seen, "mrt") {
63 if labels != 13 || seen[0] != "Oct" || seen[len(seen)-1] != "Oct" || !contains(seen, "Nov") || !contains(seen, "Mar") {
62 t.Fatalf("labels %v", seen)
64 t.Fatalf("labels %v", seen)
63 }
65 }
64}
66}
internal/i18n/catalog.go added +358 −0
@@ -0,0 +1,358 @@
1 package i18n
2
3 var catalogs = map[Lang]map[string]string{
4 EN: en,
5 NL: nl,
6 DE: de,
7 FR: fr,
8 }
9
10 var en = map[string]string{
11 "nav.dashboard": "Overview",
12 "nav.new": "New",
13 "nav.storage": "Storage",
14 "nav.signout": "Sign out",
15 "nav.signin": "Sign in",
16
17 "action.save": "Save",
18 "action.copy": "Copy",
19 "action.copied": "Copied",
20 "action.remove": "Remove",
21 "action.open": "Open",
22 "action.close": "Close",
23 "action.merge": "Merge",
24 "action.start": "Start",
25 "action.protect": "Protect",
26 "action.post": "Post",
27
28 "home.lead": "Sign in to view repositories.",
29 "home.public": "Public repositories",
30 "home.storage": "Storage is not set up yet. Repositories are temporarily unavailable.",
31
32 "dash.repos": "Repositories",
33 "dash.groups": "Groups",
34 "dash.noRepos": "No repositories yet.",
35 "dash.noGroups": "No groups yet.",
36
37 "heat.title": "Activity",
38 "heat.less": "Less",
39 "heat.more": "More",
40 "heat.note": "Commits, merge requests and comments.",
41 "heat.mon": "M",
42 "heat.wed": "W",
43 "heat.fri": "F",
44 "heat.none.year": "No contributions in the last 12 months",
45 "heat.one.year": "1 contribution in the last 12 months",
46 "heat.many.year": "%d contributions in the last 12 months",
47 "heat.none.day": "No contributions on %s",
48 "heat.one.day": "1 contribution on %s",
49 "heat.many.day": "%d contributions on %s",
50
51 "month.1": "January", "month.2": "February", "month.3": "March", "month.4": "April",
52 "month.5": "May", "month.6": "June", "month.7": "July", "month.8": "August",
53 "month.9": "September", "month.10": "October", "month.11": "November", "month.12": "December",
54 "month.s.1": "Jan", "month.s.2": "Feb", "month.s.3": "Mar", "month.s.4": "Apr",
55 "month.s.5": "May", "month.s.6": "Jun", "month.s.7": "Jul", "month.s.8": "Aug",
56 "month.s.9": "Sep", "month.s.10": "Oct", "month.s.11": "Nov", "month.s.12": "Dec",
57
58 "ago.just": "just now", "ago.minute": "1 minute ago", "ago.minutes": "%d minutes ago",
59 "ago.hour": "1 hour ago", "ago.hours": "%d hours ago",
60 "ago.day": "1 day ago", "ago.days": "%d days ago",
61 "ago.week": "1 week ago", "ago.weeks": "%d weeks ago",
62 "ago.month": "1 month ago", "ago.months": "%d months ago",
63 "ago.year": "1 year ago", "ago.years": "%d years ago",
64
65 "title.new": "New",
66 "title.account": "Account",
67 "title.storage": "Storage",
68 "title.commits": "Commits",
69 "title.branches": "Branches",
70 "title.mrs": "Merge requests",
71 "title.pipelines": "Pipelines",
72 "title.pipeline": "Pipeline",
73 "title.releases": "Releases",
74 "title.tags": "Tags",
75 "title.settings": "Settings",
76
77 "new.group": "New Group",
78 "new.repo": "New Repository",
79 "new.name": "Name",
80 "new.description": "Description",
81 "new.owner": "Owner",
82 "new.me": "Myself",
83 "new.visibility": "Visibility",
84 "new.role": "Default role",
85 "new.roleHint": "Role for members in new repositories of this group.",
86 "slug.bad": "This name cannot be used.",
87 "slug.free": "Available",
88 "slug.taken": "Taken",
89
90 "role.readonly": "Readonly",
91 "role.developer": "Developer",
92 "role.maintainer": "Maintainer",
93 "role.": "None",
94
95 "vis.public": "Public",
96 "vis.private": "Private",
97 "vis.protected": "Protected",
98
99 "group.tab.repos": "Repositories",
100 "group.tab.members": "Members",
101 "group.tab.settings": "Settings",
102 "group.search": "Search",
103 "group.sort": "Name",
104 "group.direction": "Sort direction",
105 "group.created": "Created %s",
106 "group.empty": "No repositories yet.",
107 "group.menu": "Menu",
108 "group.star": "Star",
109 "group.unstar": "Unstar",
110 "group.secretsNote": "Only secrets of this group.",
111 "group.defaultRole": "Default role for new repositories",
112
113 "tab.overview": "Overview",
114 "tab.files": "Files",
115 "tab.commits": "Commits",
116 "tab.branches": "Branches",
117 "tab.mrs": "Merge requests",
118 "tab.pipelines": "Pipelines",
119 "tab.releases": "Releases",
120 "tab.settings": "Settings",
121
122 "repo.searchFile": "Find file",
123 "repo.code": "Code",
124 "repo.ssh": "SSH",
125 "repo.https": "HTTPS",
126 "repo.cloneHint": "Username and a token as the password.",
127 "repo.name": "Name",
128 "repo.lastCommit": "Last commit",
129 "repo.lastChange": "Last update",
130 "repo.emptyDir": "This directory is empty.",
131 "repo.noCommits": "No commits yet.",
132 "repo.project": "Project information",
133 "repo.created": "Created on %s",
134 "repo.history": "History",
135 "repo.files": "Files",
136 "repo.binary": "Binary file.",
137 "repo.noTags": "No tags yet.",
138 "repo.noBranches": "No branches yet.",
139 "count.commit.one": "%d commit", "count.commit.many": "%d commits",
140 "count.branch.one": "%d branch", "count.branch.many": "%d branches",
141 "count.tag.one": "%d tag", "count.tag.many": "%d tags",
142 "count.release.one": "%d release", "count.release.many": "%d releases",
143
144 "mr.title": "Merge requests",
145 "mr.none": "No merge requests.",
146 "mr.new": "New",
147 "mr.titleField": "Title",
148 "mr.description": "Description",
149 "mr.source": "Source",
150 "mr.target": "Target",
151 "mr.commits": "Commits",
152 "mr.noDiff": "no commits ahead of the target branch, or the branch is missing",
153 "mr.comments": "Comments",
154 "mr.noComments": "No comments yet.",
155 "mr.comment": "Comment",
156
157 "pipe.title": "Pipelines",
158 "pipe.ref": "branch, empty is the default",
159 "pipe.none": "No pipelines yet. Add blue-ci-cd.yml in the root.",
160 "pipe.one": "Pipeline",
161
162 "rel.none": "No releases yet.",
163 "rel.bytes": "bytes",
164
165 "set.onlyAdmin": "Only a maintainer changes settings, secrets and webhooks. Your role: %s.",
166 "set.general": "General",
167 "set.members": "Members",
168 "set.branches": "Branches",
169 "set.secrets": "Secrets",
170 "set.webhooks": "Webhooks",
171 "set.username": "username",
172 "set.pending": "waiting for the first sign-in",
173 "set.pattern": "master or release/*",
174 "set.protectHint": "Developers cannot push to these branches.",
175 "set.secretName": "Name",
176 "set.secretValue": "Value",
177 "set.protectedOnly": "Only include on a protected branch",
178 "set.valuesHidden": "Values are not shown again.",
179 "set.delete": "Delete",
180 "set.typeName": "Type %s",
181 "set.deleteRepo": "Delete repository",
182 "set.whName": "Name",
183 "set.preset": "Preset",
184 "set.preset.generic": "Generic JSON",
185 "set.preset.discord": "Discord",
186 "set.preset.grok": "Grok Bot",
187 "set.url": "URL",
188 "set.branchFilter": "Push branch filter",
189 "set.filterHint": "empty, master, or re:^release/.*",
190 "set.headers": "Headers, one per line",
191 "set.body": "Body template, empty sends the event as JSON",
192 "set.ev.push": "push",
193 "set.ev.mr": "merge request",
194 "set.ev.ok": "pipeline succeeded",
195 "set.ev.fail": "pipeline failed",
196 "set.ev.release": "release published",
197 "set.saveWebhook": "Save webhook",
198 "logo.file": "Logo",
199 "logo.hint": "PNG, JPEG, GIF or SVG. Images larger than 512×512 are scaled down.",
200
201 "acct.hint": "For git over HTTPS: your username and a token as the password.",
202 "acct.tokens": "Access tokens",
203 "acct.tokenName": "name, for example laptop",
204 "acct.newToken": "New token",
205 "acct.revoke": "Revoke",
206 "acct.ssh": "SSH keys",
207 "acct.keyName": "Name",
208 "acct.pubkey": "Public key",
209 "acct.add": "Add",
210 "acct.remove": "Remove",
211 "acct.export": "Download your data (JSON)",
212 "acct.language": "Language",
213
214 "setup.choose": "Choose storage",
215 "setup.pathTitle": "Storage path",
216 "setup.changeWarn": "Changing the path does not move repositories, artifacts or releases.",
217 "setup.free": "Free space: %s of %s.",
218 "setup.disk": "Path on disk",
219 "setup.rules": "The path must exist, be writable, and have at least %s free.",
220
221 "flash.saved": "Saved",
222 "flash.memberSaved": "Member saved",
223 "flash.memberRemoved": "Member removed",
224 "flash.branchOn": "Branch protected",
225 "flash.patternOff": "Pattern removed",
226 "flash.secretSaved": "Secret saved",
227 "flash.secretRemoved": "Secret removed",
228 "flash.webhookSaved": "Webhook saved",
229 "flash.webhookRemoved": "Webhook removed",
230 "flash.repoDeleted": "Repository deleted",
231 "flash.tokenCreated": "Token created. Copy it now; it is not shown again.",
232 "flash.tokenRevoked": "Token revoked",
233 "flash.sshAdded": "Key added",
234 "flash.sshRemoved": "Key removed",
235 "flash.pipeline": "Pipeline started",
236 "flash.language": "Language saved",
237 "flash.logo": "Logo saved",
238 "flash.star": "Star updated",
239
240 "err.forbidden": "no access",
241 "err.rights": "could not read permissions",
242 "err.badForm": "invalid form",
243 "err.badCSRF": "invalid form, reload the page",
244 "err.groupMissing": "group not found",
245 "err.gitInit": "git init: %s",
246 "err.confirmDelete": "type the repository name to delete it",
247 "err.tokenMissing": "token not found",
248 "err.sshBad": "that is not an OpenSSH public key",
249 "err.sshMissing": "key not found",
250 "err.pickEvent": "choose at least one event",
251 "err.preset": "unknown preset",
252 "err.header": "a header must look like Name: value",
253 "err.noStorageAdmin": "You cannot configure storage.",
254 "err.storageSave": "The path could not be saved.",
255 "err.storageSame": "Choose the directory for the repositories.",
256 "err.storageSet": "Storage set to %s. %s free.",
257 "err.storageMoved": "Storage path changed to %s. Existing data was not moved. %s free.",
258 "err.noStorage": "Storage is not set up yet. An administrator chooses a path in the web interface.",
259 "err.logoType": "use a PNG, JPEG, GIF or SVG",
260 "err.logoBig": "the file is too large",
261 "err.logoSVG": "this SVG is not accepted",
262 "err.logoStore": "the logo could not be saved",
263 "err.logoRead": "the logo could not be read",
264
265 "err.userName": "username %q cannot be used here",
266 "err.groupPath": "group path %q cannot be used",
267 "err.repoName": "repository name %q cannot be used",
268 "err.slug": "this name cannot be used",
269 "err.tag": "tag %q cannot be used",
270 "err.tagChar": "tag %q contains a forbidden character",
271 "err.groupNeedsName": "the group needs a name",
272 "err.pathUser": "path %s is already a user",
273 "err.pathGroup": "path %s is already a group",
274 "err.ownerKind": "owner must be user or group",
275 "err.visibility": "visibility must be public or private",
276 "err.userGroupClash": "a group named %s already exists; personal repositories would be unreachable",
277 "err.repoExists": "repository %s already exists",
278 "err.scope": "scope must be repo or group",
279 "err.pattern": "pattern %q cannot be used",
280 "err.emptyValue": "the value is empty",
281 "err.userTaken": "username %s is already in use",
282 "err.tokenNeedsName": "give the token a name",
283 "err.sshDup": "this key is already registered",
284 "err.notFound": "not found",
285 "err.noteEmpty": "a comment is empty",
286 "err.mrTitle": "a merge request needs a title",
287 "err.tagExists": "tag %s already exists",
288 "err.roleMissing": "role is missing",
289 "err.roleUnknown": "unknown role %q",
290 "err.hook.nowrite": "no write access on %s",
291 "err.hook.branch": "invalid branch %q",
292 "err.hook.protected": "branch %s is protected; only a maintainer may change it",
293 "err.hook.empty": "empty push",
294 "err.secretLen": "a secret name must be 1 to 80 characters",
295 "err.secretForm": "secret name %q must match [A-Z][A-Z0-9_]*",
296 "err.mergeConflict": "merge failed, there is a conflict or the branch is missing",
297 "err.targetBranch": "target branch %s: %s",
298
299 "err.pathMissing": "path is missing",
300 "err.pathNewline": "path contains a line break",
301 "err.pathAbsolute": "path must be absolute",
302 "err.pathAbsent": "path does not exist",
303 "err.pathRead": "cannot read path: %s",
304 "err.pathDir": "path is not a directory",
305 "err.pathFree": "could not determine free space: %s",
306 "err.pathWrite": "path is not writable",
307 "err.pathSpace": "not enough free space: %s free, at least %s",
308
309 "err.whFilter": "branchfilter: %s",
310 "err.whEvent": "unknown event %q",
311 "err.whTemplate": "unclosed {{ in the template",
312 "err.whSecret": "secret %s does not exist",
313 "err.whField": "unknown field event.%s",
314 "err.whPlaceholder": "unknown placeholder %q",
315 "err.whURL": "webhook URL is invalid",
316 "err.whScheme": "webhook URL must be http or https",
317 "err.whHost": "webhook host is missing",
318 "err.whBlockedIP": "%s is in a blocked range",
319 "err.whDNS": "dns for %s: %s",
320 "err.whNoAddr": "no address for %s",
321 "err.whBlockedHost": "%s points at %s in a blocked range",
322 "err.whRedirects": "too many redirects",
323 "err.whRedirectHost": "a redirect to another host with the original body was refused",
324
325 "flash.welcome": "Welcome, %s",
326 "flash.repoCreated": "Repository created",
327 "flash.groupCreated": "Group created",
328 "flash.mrOpened": "Merge request opened",
329 "flash.note": "Comment posted",
330 "flash.merged": "Merged",
331 "flash.closed": "Closed",
332 "hook.push": "%s pushed to %s in %s",
333 "hook.mr": "merge request !%s opened: %s",
334 "hook.release": "release %s of %s published",
335 "err.session": "session",
336 "err.oauth": "Sign-in failed: %s",
337 "err.oauthFail": "Sign-in failed",
338 "err.oauthState": "invalid sign-in state",
339 "err.branchMissing": "branch not found",
340 "err.branches": "choose two different branches",
341 "err.targetAccess": "no access to the target branch",
342 "err.commitMissing": "commit is not in this repository",
343 "err.artifactMissing": "artifact not found: %s %s",
344 "err.noWrite": "no write access",
345 "err.noRead": "no read access",
346 "err.overview": "overview",
347 "err.tokenAbsent": "token is missing",
348 "err.tokenBad": "token is invalid",
349 "err.jobToken": "job token is invalid",
350 "err.onlyAdmin": "only a maintainer",
351 "err.commitAbsent": "commit is missing",
352 "err.assetsJob": "assets belong with a job token",
353 "err.assetName": "asset name",
354 "err.assetDisk": "artifact is missing on disk",
355 "err.assetCopy": "could not copy the asset",
356 "err.tagFail": "tag: %s",
357 "err.json": "invalid json",
358 }
@@ -0,0 +1,358 @@
1package i18n
2
3var catalogs = map[Lang]map[string]string{
4 EN: en,
5 NL: nl,
6 DE: de,
7 FR: fr,
8}
9
10var en = map[string]string{
11 "nav.dashboard": "Overview",
12 "nav.new": "New",
13 "nav.storage": "Storage",
14 "nav.signout": "Sign out",
15 "nav.signin": "Sign in",
16
17 "action.save": "Save",
18 "action.copy": "Copy",
19 "action.copied": "Copied",
20 "action.remove": "Remove",
21 "action.open": "Open",
22 "action.close": "Close",
23 "action.merge": "Merge",
24 "action.start": "Start",
25 "action.protect": "Protect",
26 "action.post": "Post",
27
28 "home.lead": "Sign in to view repositories.",
29 "home.public": "Public repositories",
30 "home.storage": "Storage is not set up yet. Repositories are temporarily unavailable.",
31
32 "dash.repos": "Repositories",
33 "dash.groups": "Groups",
34 "dash.noRepos": "No repositories yet.",
35 "dash.noGroups": "No groups yet.",
36
37 "heat.title": "Activity",
38 "heat.less": "Less",
39 "heat.more": "More",
40 "heat.note": "Commits, merge requests and comments.",
41 "heat.mon": "M",
42 "heat.wed": "W",
43 "heat.fri": "F",
44 "heat.none.year": "No contributions in the last 12 months",
45 "heat.one.year": "1 contribution in the last 12 months",
46 "heat.many.year": "%d contributions in the last 12 months",
47 "heat.none.day": "No contributions on %s",
48 "heat.one.day": "1 contribution on %s",
49 "heat.many.day": "%d contributions on %s",
50
51 "month.1": "January", "month.2": "February", "month.3": "March", "month.4": "April",
52 "month.5": "May", "month.6": "June", "month.7": "July", "month.8": "August",
53 "month.9": "September", "month.10": "October", "month.11": "November", "month.12": "December",
54 "month.s.1": "Jan", "month.s.2": "Feb", "month.s.3": "Mar", "month.s.4": "Apr",
55 "month.s.5": "May", "month.s.6": "Jun", "month.s.7": "Jul", "month.s.8": "Aug",
56 "month.s.9": "Sep", "month.s.10": "Oct", "month.s.11": "Nov", "month.s.12": "Dec",
57
58 "ago.just": "just now", "ago.minute": "1 minute ago", "ago.minutes": "%d minutes ago",
59 "ago.hour": "1 hour ago", "ago.hours": "%d hours ago",
60 "ago.day": "1 day ago", "ago.days": "%d days ago",
61 "ago.week": "1 week ago", "ago.weeks": "%d weeks ago",
62 "ago.month": "1 month ago", "ago.months": "%d months ago",
63 "ago.year": "1 year ago", "ago.years": "%d years ago",
64
65 "title.new": "New",
66 "title.account": "Account",
67 "title.storage": "Storage",
68 "title.commits": "Commits",
69 "title.branches": "Branches",
70 "title.mrs": "Merge requests",
71 "title.pipelines": "Pipelines",
72 "title.pipeline": "Pipeline",
73 "title.releases": "Releases",
74 "title.tags": "Tags",
75 "title.settings": "Settings",
76
77 "new.group": "New Group",
78 "new.repo": "New Repository",
79 "new.name": "Name",
80 "new.description": "Description",
81 "new.owner": "Owner",
82 "new.me": "Myself",
83 "new.visibility": "Visibility",
84 "new.role": "Default role",
85 "new.roleHint": "Role for members in new repositories of this group.",
86 "slug.bad": "This name cannot be used.",
87 "slug.free": "Available",
88 "slug.taken": "Taken",
89
90 "role.readonly": "Readonly",
91 "role.developer": "Developer",
92 "role.maintainer": "Maintainer",
93 "role.": "None",
94
95 "vis.public": "Public",
96 "vis.private": "Private",
97 "vis.protected": "Protected",
98
99 "group.tab.repos": "Repositories",
100 "group.tab.members": "Members",
101 "group.tab.settings": "Settings",
102 "group.search": "Search",
103 "group.sort": "Name",
104 "group.direction": "Sort direction",
105 "group.created": "Created %s",
106 "group.empty": "No repositories yet.",
107 "group.menu": "Menu",
108 "group.star": "Star",
109 "group.unstar": "Unstar",
110 "group.secretsNote": "Only secrets of this group.",
111 "group.defaultRole": "Default role for new repositories",
112
113 "tab.overview": "Overview",
114 "tab.files": "Files",
115 "tab.commits": "Commits",
116 "tab.branches": "Branches",
117 "tab.mrs": "Merge requests",
118 "tab.pipelines": "Pipelines",
119 "tab.releases": "Releases",
120 "tab.settings": "Settings",
121
122 "repo.searchFile": "Find file",
123 "repo.code": "Code",
124 "repo.ssh": "SSH",
125 "repo.https": "HTTPS",
126 "repo.cloneHint": "Username and a token as the password.",
127 "repo.name": "Name",
128 "repo.lastCommit": "Last commit",
129 "repo.lastChange": "Last update",
130 "repo.emptyDir": "This directory is empty.",
131 "repo.noCommits": "No commits yet.",
132 "repo.project": "Project information",
133 "repo.created": "Created on %s",
134 "repo.history": "History",
135 "repo.files": "Files",
136 "repo.binary": "Binary file.",
137 "repo.noTags": "No tags yet.",
138 "repo.noBranches": "No branches yet.",
139 "count.commit.one": "%d commit", "count.commit.many": "%d commits",
140 "count.branch.one": "%d branch", "count.branch.many": "%d branches",
141 "count.tag.one": "%d tag", "count.tag.many": "%d tags",
142 "count.release.one": "%d release", "count.release.many": "%d releases",
143
144 "mr.title": "Merge requests",
145 "mr.none": "No merge requests.",
146 "mr.new": "New",
147 "mr.titleField": "Title",
148 "mr.description": "Description",
149 "mr.source": "Source",
150 "mr.target": "Target",
151 "mr.commits": "Commits",
152 "mr.noDiff": "no commits ahead of the target branch, or the branch is missing",
153 "mr.comments": "Comments",
154 "mr.noComments": "No comments yet.",
155 "mr.comment": "Comment",
156
157 "pipe.title": "Pipelines",
158 "pipe.ref": "branch, empty is the default",
159 "pipe.none": "No pipelines yet. Add blue-ci-cd.yml in the root.",
160 "pipe.one": "Pipeline",
161
162 "rel.none": "No releases yet.",
163 "rel.bytes": "bytes",
164
165 "set.onlyAdmin": "Only a maintainer changes settings, secrets and webhooks. Your role: %s.",
166 "set.general": "General",
167 "set.members": "Members",
168 "set.branches": "Branches",
169 "set.secrets": "Secrets",
170 "set.webhooks": "Webhooks",
171 "set.username": "username",
172 "set.pending": "waiting for the first sign-in",
173 "set.pattern": "master or release/*",
174 "set.protectHint": "Developers cannot push to these branches.",
175 "set.secretName": "Name",
176 "set.secretValue": "Value",
177 "set.protectedOnly": "Only include on a protected branch",
178 "set.valuesHidden": "Values are not shown again.",
179 "set.delete": "Delete",
180 "set.typeName": "Type %s",
181 "set.deleteRepo": "Delete repository",
182 "set.whName": "Name",
183 "set.preset": "Preset",
184 "set.preset.generic": "Generic JSON",
185 "set.preset.discord": "Discord",
186 "set.preset.grok": "Grok Bot",
187 "set.url": "URL",
188 "set.branchFilter": "Push branch filter",
189 "set.filterHint": "empty, master, or re:^release/.*",
190 "set.headers": "Headers, one per line",
191 "set.body": "Body template, empty sends the event as JSON",
192 "set.ev.push": "push",
193 "set.ev.mr": "merge request",
194 "set.ev.ok": "pipeline succeeded",
195 "set.ev.fail": "pipeline failed",
196 "set.ev.release": "release published",
197 "set.saveWebhook": "Save webhook",
198 "logo.file": "Logo",
199 "logo.hint": "PNG, JPEG, GIF or SVG. Images larger than 512×512 are scaled down.",
200
201 "acct.hint": "For git over HTTPS: your username and a token as the password.",
202 "acct.tokens": "Access tokens",
203 "acct.tokenName": "name, for example laptop",
204 "acct.newToken": "New token",
205 "acct.revoke": "Revoke",
206 "acct.ssh": "SSH keys",
207 "acct.keyName": "Name",
208 "acct.pubkey": "Public key",
209 "acct.add": "Add",
210 "acct.remove": "Remove",
211 "acct.export": "Download your data (JSON)",
212 "acct.language": "Language",
213
214 "setup.choose": "Choose storage",
215 "setup.pathTitle": "Storage path",
216 "setup.changeWarn": "Changing the path does not move repositories, artifacts or releases.",
217 "setup.free": "Free space: %s of %s.",
218 "setup.disk": "Path on disk",
219 "setup.rules": "The path must exist, be writable, and have at least %s free.",
220
221 "flash.saved": "Saved",
222 "flash.memberSaved": "Member saved",
223 "flash.memberRemoved": "Member removed",
224 "flash.branchOn": "Branch protected",
225 "flash.patternOff": "Pattern removed",
226 "flash.secretSaved": "Secret saved",
227 "flash.secretRemoved": "Secret removed",
228 "flash.webhookSaved": "Webhook saved",
229 "flash.webhookRemoved": "Webhook removed",
230 "flash.repoDeleted": "Repository deleted",
231 "flash.tokenCreated": "Token created. Copy it now; it is not shown again.",
232 "flash.tokenRevoked": "Token revoked",
233 "flash.sshAdded": "Key added",
234 "flash.sshRemoved": "Key removed",
235 "flash.pipeline": "Pipeline started",
236 "flash.language": "Language saved",
237 "flash.logo": "Logo saved",
238 "flash.star": "Star updated",
239
240 "err.forbidden": "no access",
241 "err.rights": "could not read permissions",
242 "err.badForm": "invalid form",
243 "err.badCSRF": "invalid form, reload the page",
244 "err.groupMissing": "group not found",
245 "err.gitInit": "git init: %s",
246 "err.confirmDelete": "type the repository name to delete it",
247 "err.tokenMissing": "token not found",
248 "err.sshBad": "that is not an OpenSSH public key",
249 "err.sshMissing": "key not found",
250 "err.pickEvent": "choose at least one event",
251 "err.preset": "unknown preset",
252 "err.header": "a header must look like Name: value",
253 "err.noStorageAdmin": "You cannot configure storage.",
254 "err.storageSave": "The path could not be saved.",
255 "err.storageSame": "Choose the directory for the repositories.",
256 "err.storageSet": "Storage set to %s. %s free.",
257 "err.storageMoved": "Storage path changed to %s. Existing data was not moved. %s free.",
258 "err.noStorage": "Storage is not set up yet. An administrator chooses a path in the web interface.",
259 "err.logoType": "use a PNG, JPEG, GIF or SVG",
260 "err.logoBig": "the file is too large",
261 "err.logoSVG": "this SVG is not accepted",
262 "err.logoStore": "the logo could not be saved",
263 "err.logoRead": "the logo could not be read",
264
265 "err.userName": "username %q cannot be used here",
266 "err.groupPath": "group path %q cannot be used",
267 "err.repoName": "repository name %q cannot be used",
268 "err.slug": "this name cannot be used",
269 "err.tag": "tag %q cannot be used",
270 "err.tagChar": "tag %q contains a forbidden character",
271 "err.groupNeedsName": "the group needs a name",
272 "err.pathUser": "path %s is already a user",
273 "err.pathGroup": "path %s is already a group",
274 "err.ownerKind": "owner must be user or group",
275 "err.visibility": "visibility must be public or private",
276 "err.userGroupClash": "a group named %s already exists; personal repositories would be unreachable",
277 "err.repoExists": "repository %s already exists",
278 "err.scope": "scope must be repo or group",
279 "err.pattern": "pattern %q cannot be used",
280 "err.emptyValue": "the value is empty",
281 "err.userTaken": "username %s is already in use",
282 "err.tokenNeedsName": "give the token a name",
283 "err.sshDup": "this key is already registered",
284 "err.notFound": "not found",
285 "err.noteEmpty": "a comment is empty",
286 "err.mrTitle": "a merge request needs a title",
287 "err.tagExists": "tag %s already exists",
288 "err.roleMissing": "role is missing",
289 "err.roleUnknown": "unknown role %q",
290 "err.hook.nowrite": "no write access on %s",
291 "err.hook.branch": "invalid branch %q",
292 "err.hook.protected": "branch %s is protected; only a maintainer may change it",
293 "err.hook.empty": "empty push",
294 "err.secretLen": "a secret name must be 1 to 80 characters",
295 "err.secretForm": "secret name %q must match [A-Z][A-Z0-9_]*",
296 "err.mergeConflict": "merge failed, there is a conflict or the branch is missing",
297 "err.targetBranch": "target branch %s: %s",
298
299 "err.pathMissing": "path is missing",
300 "err.pathNewline": "path contains a line break",
301 "err.pathAbsolute": "path must be absolute",
302 "err.pathAbsent": "path does not exist",
303 "err.pathRead": "cannot read path: %s",
304 "err.pathDir": "path is not a directory",
305 "err.pathFree": "could not determine free space: %s",
306 "err.pathWrite": "path is not writable",
307 "err.pathSpace": "not enough free space: %s free, at least %s",
308
309 "err.whFilter": "branchfilter: %s",
310 "err.whEvent": "unknown event %q",
311 "err.whTemplate": "unclosed {{ in the template",
312 "err.whSecret": "secret %s does not exist",
313 "err.whField": "unknown field event.%s",
314 "err.whPlaceholder": "unknown placeholder %q",
315 "err.whURL": "webhook URL is invalid",
316 "err.whScheme": "webhook URL must be http or https",
317 "err.whHost": "webhook host is missing",
318 "err.whBlockedIP": "%s is in a blocked range",
319 "err.whDNS": "dns for %s: %s",
320 "err.whNoAddr": "no address for %s",
321 "err.whBlockedHost": "%s points at %s in a blocked range",
322 "err.whRedirects": "too many redirects",
323 "err.whRedirectHost": "a redirect to another host with the original body was refused",
324
325 "flash.welcome": "Welcome, %s",
326 "flash.repoCreated": "Repository created",
327 "flash.groupCreated": "Group created",
328 "flash.mrOpened": "Merge request opened",
329 "flash.note": "Comment posted",
330 "flash.merged": "Merged",
331 "flash.closed": "Closed",
332 "hook.push": "%s pushed to %s in %s",
333 "hook.mr": "merge request !%s opened: %s",
334 "hook.release": "release %s of %s published",
335 "err.session": "session",
336 "err.oauth": "Sign-in failed: %s",
337 "err.oauthFail": "Sign-in failed",
338 "err.oauthState": "invalid sign-in state",
339 "err.branchMissing": "branch not found",
340 "err.branches": "choose two different branches",
341 "err.targetAccess": "no access to the target branch",
342 "err.commitMissing": "commit is not in this repository",
343 "err.artifactMissing": "artifact not found: %s %s",
344 "err.noWrite": "no write access",
345 "err.noRead": "no read access",
346 "err.overview": "overview",
347 "err.tokenAbsent": "token is missing",
348 "err.tokenBad": "token is invalid",
349 "err.jobToken": "job token is invalid",
350 "err.onlyAdmin": "only a maintainer",
351 "err.commitAbsent": "commit is missing",
352 "err.assetsJob": "assets belong with a job token",
353 "err.assetName": "asset name",
354 "err.assetDisk": "artifact is missing on disk",
355 "err.assetCopy": "could not copy the asset",
356 "err.tagFail": "tag: %s",
357 "err.json": "invalid json",
358}
internal/i18n/catalog_lang.go added +1063 −0
@@ -0,0 +1,1063 @@
1 package i18n
2
3 var nl = map[string]string{
4 "nav.dashboard": "Overzicht",
5 "nav.new": "Nieuw",
6 "nav.storage": "Opslag",
7 "nav.signout": "Afmelden",
8 "nav.signin": "Aanmelden",
9 "action.save": "Opslaan",
10 "action.copy": "Kopieer",
11 "action.copied": "Gekopieerd",
12 "action.remove": "Weg",
13 "action.open": "Openen",
14 "action.close": "Sluiten",
15 "action.merge": "Samenvoegen",
16 "action.start": "Starten",
17 "action.protect": "Beschermen",
18 "action.post": "Plaatsen",
19 "home.lead": "Meld je aan om repositories te bekijken.",
20 "home.public": "Openbare repositories",
21 "home.storage": "Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.",
22 "dash.repos": "Repositories",
23 "dash.groups": "Groepen",
24 "dash.noRepos": "Nog geen repositories.",
25 "dash.noGroups": "Nog geen groepen.",
26 "heat.title": "Activiteit",
27 "heat.less": "Minder",
28 "heat.more": "Meer",
29 "heat.note": "Commits, merge requests en reacties.",
30 "heat.mon": "M",
31 "heat.wed": "W",
32 "heat.fri": "V",
33 "heat.none.year": "Geen bijdragen in de laatste 12 maanden",
34 "heat.one.year": "1 bijdrage in de laatste 12 maanden",
35 "heat.many.year": "%d bijdragen in de laatste 12 maanden",
36 "heat.none.day": "Geen bijdragen op %s",
37 "heat.one.day": "1 bijdrage op %s",
38 "heat.many.day": "%d bijdragen op %s",
39 "month.1": "januari",
40 "month.2": "februari",
41 "month.3": "maart",
42 "month.4": "april",
43 "month.5": "mei",
44 "month.6": "juni",
45 "month.7": "juli",
46 "month.8": "augustus",
47 "month.9": "september",
48 "month.10": "oktober",
49 "month.11": "november",
50 "month.12": "december",
51 "month.s.1": "jan",
52 "month.s.2": "feb",
53 "month.s.3": "mrt",
54 "month.s.4": "apr",
55 "month.s.5": "mei",
56 "month.s.6": "jun",
57 "month.s.7": "jul",
58 "month.s.8": "aug",
59 "month.s.9": "sep",
60 "month.s.10": "okt",
61 "month.s.11": "nov",
62 "month.s.12": "dec",
63 "ago.just": "zojuist",
64 "ago.minute": "1 minuut geleden",
65 "ago.minutes": "%d minuten geleden",
66 "ago.hour": "1 uur geleden",
67 "ago.hours": "%d uur geleden",
68 "ago.day": "1 dag geleden",
69 "ago.days": "%d dagen geleden",
70 "ago.week": "1 week geleden",
71 "ago.weeks": "%d weken geleden",
72 "ago.month": "1 maand geleden",
73 "ago.months": "%d maanden geleden",
74 "ago.year": "1 jaar geleden",
75 "ago.years": "%d jaar geleden",
76 "title.new": "Nieuw",
77 "title.account": "Account",
78 "title.storage": "Opslag",
79 "title.commits": "Commits",
80 "title.branches": "Branches",
81 "title.mrs": "Merge requests",
82 "title.pipelines": "Pipelines",
83 "title.pipeline": "Pipeline",
84 "title.releases": "Releases",
85 "title.tags": "Tags",
86 "title.settings": "Instellingen",
87 "new.group": "Nieuwe groep",
88 "new.repo": "Nieuwe repository",
89 "new.name": "Naam",
90 "new.description": "Beschrijving",
91 "new.owner": "Eigenaar",
92 "new.me": "Ikzelf",
93 "new.visibility": "Zichtbaarheid",
94 "new.role": "Standaardrol",
95 "new.roleHint": "Rol voor leden in nieuwe repositories van deze groep.",
96 "slug.bad": "Deze naam kan niet.",
97 "slug.free": "Beschikbaar",
98 "slug.taken": "Bezet",
99 "role.readonly": "Alleen lezen",
100 "role.developer": "Ontwikkelaar",
101 "role.maintainer": "Beheerder",
102 "role.": "Geen",
103 "vis.public": "Openbaar",
104 "vis.private": "Privé",
105 "vis.protected": "Beschermd",
106 "group.tab.repos": "Repositories",
107 "group.tab.members": "Leden",
108 "group.tab.settings": "Instellingen",
109 "group.search": "Zoeken",
110 "group.sort": "Naam",
111 "group.direction": "Sorteerrichting",
112 "group.created": "Aangemaakt %s",
113 "group.empty": "Nog geen repositories.",
114 "group.menu": "Menu",
115 "group.star": "Ster",
116 "group.unstar": "Ster weg",
117 "group.secretsNote": "Alleen geheimen van deze groep.",
118 "group.defaultRole": "Standaardrol voor nieuwe repositories",
119 "tab.overview": "Overzicht",
120 "tab.files": "Bestanden",
121 "tab.commits": "Commits",
122 "tab.branches": "Branches",
123 "tab.mrs": "Merge requests",
124 "tab.pipelines": "Pipelines",
125 "tab.releases": "Releases",
126 "tab.settings": "Instellingen",
127 "repo.searchFile": "Bestand zoeken",
128 "repo.code": "Code",
129 "repo.ssh": "SSH",
130 "repo.https": "HTTPS",
131 "repo.cloneHint": "Gebruikersnaam en een token als wachtwoord.",
132 "repo.name": "Naam",
133 "repo.lastCommit": "Laatste commit",
134 "repo.lastChange": "Laatste wijziging",
135 "repo.emptyDir": "Deze map is leeg.",
136 "repo.noCommits": "Nog geen commits.",
137 "repo.project": "Projectinformatie",
138 "repo.created": "Aangemaakt op %s",
139 "repo.history": "Geschiedenis",
140 "repo.files": "Bestanden",
141 "repo.binary": "Binair bestand.",
142 "repo.noTags": "Nog geen tags.",
143 "repo.noBranches": "Nog geen branches.",
144 "count.commit.one": "%d commit",
145 "count.commit.many": "%d commits",
146 "count.branch.one": "%d branch",
147 "count.branch.many": "%d branches",
148 "count.tag.one": "%d tag",
149 "count.tag.many": "%d tags",
150 "count.release.one": "%d release",
151 "count.release.many": "%d releases",
152 "mr.title": "Merge requests",
153 "mr.none": "Geen merge requests.",
154 "mr.new": "Nieuw",
155 "mr.titleField": "Titel",
156 "mr.description": "Beschrijving",
157 "mr.source": "Bron",
158 "mr.target": "Doel",
159 "mr.commits": "Commits",
160 "mr.noDiff": "geen commits vóór de doelbranch, of de branch ontbreekt",
161 "mr.comments": "Reacties",
162 "mr.noComments": "Nog geen reacties.",
163 "mr.comment": "Reactie",
164 "pipe.title": "Pipelines",
165 "pipe.ref": "branch, leeg is de standaard",
166 "pipe.none": "Nog geen pipelines. Voeg blue-ci-cd.yml toe in de root.",
167 "pipe.one": "Pipeline",
168 "rel.none": "Nog geen releases.",
169 "rel.bytes": "bytes",
170 "set.onlyAdmin": "Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: %s.",
171 "set.general": "Algemeen",
172 "set.members": "Leden",
173 "set.branches": "Branches",
174 "set.secrets": "Geheimen",
175 "set.webhooks": "Webhooks",
176 "set.username": "gebruikersnaam",
177 "set.pending": "wacht op eerste aanmelding",
178 "set.pattern": "master of release/*",
179 "set.protectHint": "Ontwikkelaars kunnen niet naar deze branches pushen.",
180 "set.secretName": "Naam",
181 "set.secretValue": "Waarde",
182 "set.protectedOnly": "Alleen meesturen op een beschermde branch",
183 "set.valuesHidden": "Waarden worden niet teruggetoond.",
184 "set.delete": "Verwijderen",
185 "set.typeName": "Typ %s",
186 "set.deleteRepo": "Repository verwijderen",
187 "set.whName": "Naam",
188 "set.preset": "Preset",
189 "set.preset.generic": "Generieke JSON",
190 "set.preset.discord": "Discord",
191 "set.preset.grok": "Grok Bot",
192 "set.url": "URL",
193 "set.branchFilter": "Branchfilter voor push",
194 "set.filterHint": "leeg, master, of re:^release/.*",
195 "set.headers": "Headers, één per regel",
196 "set.body": "Body-sjabloon, leeg is de gebeurtenis als JSON",
197 "set.ev.push": "push",
198 "set.ev.mr": "merge request",
199 "set.ev.ok": "pipeline geslaagd",
200 "set.ev.fail": "pipeline mislukt",
201 "set.ev.release": "release gepubliceerd",
202 "set.saveWebhook": "Webhook opslaan",
203 "logo.file": "Logo",
204 "logo.hint": "PNG, JPEG, GIF of SVG. Groter dan 512×512 wordt teruggeschaald.",
205 "acct.hint": "Voor git via HTTPS: je gebruikersnaam en een token als wachtwoord.",
206 "acct.tokens": "Toegangstokens",
207 "acct.tokenName": "naam, bijvoorbeeld laptop",
208 "acct.newToken": "Nieuw token",
209 "acct.revoke": "Intrekken",
210 "acct.ssh": "SSH-sleutels",
211 "acct.keyName": "Naam",
212 "acct.pubkey": "Publieke sleutel",
213 "acct.add": "Toevoegen",
214 "acct.remove": "Verwijderen",
215 "acct.export": "Gegevens downloaden (JSON)",
216 "acct.language": "Taal",
217 "setup.choose": "Opslag kiezen",
218 "setup.pathTitle": "Opslagpad",
219 "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",
220 "setup.free": "Vrije ruimte: %s van %s.",
221 "setup.disk": "Pad op de schijf",
222 "setup.rules": "Het pad moet bestaan, beschrijfbaar zijn en minstens %s vrij hebben.",
223 "flash.saved": "Opgeslagen",
224 "flash.memberSaved": "Lid opgeslagen",
225 "flash.memberRemoved": "Lid verwijderd",
226 "flash.branchOn": "Branch beschermd",
227 "flash.patternOff": "Patroon verwijderd",
228 "flash.secretSaved": "Geheim opgeslagen",
229 "flash.secretRemoved": "Geheim verwijderd",
230 "flash.webhookSaved": "Webhook opgeslagen",
231 "flash.webhookRemoved": "Webhook verwijderd",
232 "flash.repoDeleted": "Repository verwijderd",
233 "flash.tokenCreated": "Token aangemaakt. Kopieer hem nu; hij wordt niet opnieuw getoond.",
234 "flash.tokenRevoked": "Token ingetrokken",
235 "flash.sshAdded": "Sleutel toegevoegd",
236 "flash.sshRemoved": "Sleutel verwijderd",
237 "flash.pipeline": "Pipeline gestart",
238 "flash.language": "Taal opgeslagen",
239 "flash.logo": "Logo opgeslagen",
240 "flash.star": "Ster bijgewerkt",
241 "err.forbidden": "geen toegang",
242 "err.rights": "rechten niet te lezen",
243 "err.badForm": "ongeldig formulier",
244 "err.badCSRF": "ongeldig formulier, vernieuw de pagina",
245 "err.groupMissing": "groep niet gevonden",
246 "err.gitInit": "git init: %s",
247 "err.confirmDelete": "typ de repositorynaam om te verwijderen",
248 "err.tokenMissing": "token niet gevonden",
249 "err.sshBad": "dat is geen OpenSSH-publieke sleutel",
250 "err.sshMissing": "sleutel niet gevonden",
251 "err.pickEvent": "kies minstens één gebeurtenis",
252 "err.preset": "onbekende preset",
253 "err.header": "header moet 'Naam: waarde' zijn",
254 "err.noStorageAdmin": "Je mag de opslag niet instellen.",
255 "err.storageSave": "Het pad kon niet bewaard worden.",
256 "err.storageSame": "Kies de map voor de repositories.",
257 "err.storageSet": "Opslag ingesteld op %s. %s vrij.",
258 "err.storageMoved": "Opslagpad gewijzigd naar %s. Bestaande data is niet verplaatst. %s vrij.",
259 "err.noStorage": "Opslag is nog niet ingesteld. De beheerder kiest een pad in de webinterface.",
260 "err.logoType": "gebruik een PNG, JPEG, GIF of SVG",
261 "err.logoBig": "het bestand is te groot",
262 "err.logoSVG": "deze SVG wordt niet geaccepteerd",
263 "err.logoStore": "het logo kon niet bewaard worden",
264 "err.logoRead": "het logo kon niet gelezen worden",
265 "err.userName": "gebruikersnaam %q is hier niet bruikbaar",
266 "err.groupPath": "groepspad %q is niet bruikbaar",
267 "err.repoName": "repositorynaam %q is niet bruikbaar",
268 "err.slug": "naam is niet bruikbaar",
269 "err.tag": "tag %q is niet bruikbaar",
270 "err.tagChar": "tag %q bevat een verboden teken",
271 "err.groupNeedsName": "de groep heeft een naam nodig",
272 "err.pathUser": "pad %s is al een gebruiker",
273 "err.pathGroup": "pad %s is al een groep",
274 "err.ownerKind": "eigenaar moet user of group zijn",
275 "err.visibility": "zichtbaarheid moet public of private zijn",
276 "err.userGroupClash": "er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar",
277 "err.repoExists": "er is al een repository %s",
278 "err.scope": "scope moet repo of group zijn",
279 "err.pattern": "patroon %q is niet bruikbaar",
280 "err.emptyValue": "de waarde is leeg",
281 "err.userTaken": "gebruikersnaam %s is al in gebruik",
282 "err.tokenNeedsName": "geef het token een naam",
283 "err.sshDup": "deze sleutel staat al geregistreerd",
284 "err.notFound": "niet gevonden",
285 "err.noteEmpty": "een reactie is leeg",
286 "err.mrTitle": "een merge request heeft een titel nodig",
287 "err.tagExists": "tag %s bestaat al",
288 "err.roleMissing": "rol ontbreekt",
289 "err.roleUnknown": "onbekende rol %q",
290 "err.hook.nowrite": "geen schrijfrechten op %s",
291 "err.hook.branch": "ongeldige branch %q",
292 "err.hook.protected": "branch %s is beschermd; alleen een beheerder mag die wijzigen",
293 "err.hook.empty": "lege push",
294 "err.secretLen": "geheimnaam moet 1 tot 80 tekens zijn",
295 "err.secretForm": "geheimnaam %q moet [A-Z][A-Z0-9_]* zijn",
296 "err.mergeConflict": "samenvoegen lukt niet, er is een conflict of de branch ontbreekt",
297 "err.targetBranch": "doelbranch %s: %s",
298 "err.pathMissing": "pad ontbreekt",
299 "err.pathNewline": "pad bevat een regeleinde",
300 "err.pathAbsolute": "pad moet absoluut zijn",
301 "err.pathAbsent": "pad bestaat niet",
302 "err.pathRead": "pad niet te lezen: %s",
303 "err.pathDir": "pad is geen map",
304 "err.pathFree": "vrije ruimte niet te bepalen: %s",
305 "err.pathWrite": "pad is niet beschrijfbaar",
306 "err.pathSpace": "te weinig vrije ruimte: %s vrij, minimaal %s",
307 "err.whFilter": "branchfilter: %s",
308 "err.whEvent": "onbekende gebeurtenis %q",
309 "err.whTemplate": "onafgesloten {{ in sjabloon",
310 "err.whSecret": "geheim %s bestaat niet",
311 "err.whField": "onbekend veld event.%s",
312 "err.whPlaceholder": "onbekende plaatsaanduiding %q",
313 "err.whURL": "webhook-URL is ongeldig",
314 "err.whScheme": "webhook-URL moet http of https zijn",
315 "err.whHost": "webhook-host ontbreekt",
316 "err.whBlockedIP": "%s ligt in een geblokkeerd bereik",
317 "err.whDNS": "dns voor %s: %s",
318 "err.whNoAddr": "geen adres voor %s",
319 "err.whBlockedHost": "%s wijst naar %s in een geblokkeerd bereik",
320 "err.whRedirects": "te veel redirects",
321 "err.whRedirectHost": "redirect naar een andere host met de oorspronkelijke body is geweigerd",
322 "flash.welcome": "Welkom, %s",
323 "flash.repoCreated": "Repository aangemaakt",
324 "flash.groupCreated": "Groep aangemaakt",
325 "flash.mrOpened": "Merge request geopend",
326 "flash.note": "Reactie geplaatst",
327 "flash.merged": "Samengevoegd",
328 "flash.closed": "Gesloten",
329 "hook.push": "%s pushte naar %s in %s",
330 "hook.mr": "merge request !%s geopend: %s",
331 "hook.release": "release %s van %s gepubliceerd",
332 "err.session": "sessie",
333 "err.oauth": "Aanmelden mislukt: %s",
334 "err.oauthFail": "Aanmelden is mislukt",
335 "err.oauthState": "ongeldige aanmeldstatus",
336 "err.branchMissing": "branch niet gevonden",
337 "err.branches": "kies twee verschillende branches",
338 "err.targetAccess": "geen toegang tot de doelbranch",
339 "err.commitMissing": "commit niet in deze repository",
340 "err.artifactMissing": "artifact niet gevonden: %s %s",
341 "err.noWrite": "geen schrijfrechten",
342 "err.noRead": "geen leesrechten",
343 "err.overview": "overzicht",
344 "err.tokenAbsent": "token ontbreekt",
345 "err.tokenBad": "token ongeldig",
346 "err.jobToken": "job-token ongeldig",
347 "err.onlyAdmin": "alleen een beheerder",
348 "err.commitAbsent": "commit ontbreekt",
349 "err.assetsJob": "assets horen bij een job-token",
350 "err.assetName": "assetnaam",
351 "err.assetDisk": "artifact ontbreekt op schijf",
352 "err.assetCopy": "asset kopiëren",
353 "err.tagFail": "tag: %s",
354 "err.json": "json",
355 }
356
357 var de = map[string]string{
358 "nav.dashboard": "Übersicht",
359 "nav.new": "Neu",
360 "nav.storage": "Speicher",
361 "nav.signout": "Abmelden",
362 "nav.signin": "Anmelden",
363 "action.save": "Speichern",
364 "action.copy": "Kopieren",
365 "action.copied": "Kopiert",
366 "action.remove": "Entfernen",
367 "action.open": "Öffnen",
368 "action.close": "Schließen",
369 "action.merge": "Zusammenführen",
370 "action.start": "Starten",
371 "action.protect": "Schützen",
372 "action.post": "Senden",
373 "home.lead": "Melde dich an, um Repositories zu sehen.",
374 "home.public": "Öffentliche Repositories",
375 "home.storage": "Der Speicher ist noch nicht eingerichtet. Repositories sind vorübergehend nicht verfügbar.",
376 "dash.repos": "Repositories",
377 "dash.groups": "Gruppen",
378 "dash.noRepos": "Noch keine Repositories.",
379 "dash.noGroups": "Noch keine Gruppen.",
380 "heat.title": "Aktivität",
381 "heat.less": "Weniger",
382 "heat.more": "Mehr",
383 "heat.note": "Commits, Merge Requests und Kommentare.",
384 "heat.mon": "M",
385 "heat.wed": "M",
386 "heat.fri": "F",
387 "heat.none.year": "Keine Beiträge in den letzten 12 Monaten",
388 "heat.one.year": "1 Beitrag in den letzten 12 Monaten",
389 "heat.many.year": "%d Beiträge in den letzten 12 Monaten",
390 "heat.none.day": "Keine Beiträge am %s",
391 "heat.one.day": "1 Beitrag am %s",
392 "heat.many.day": "%d Beiträge am %s",
393 "month.1": "Januar",
394 "month.2": "Februar",
395 "month.3": "März",
396 "month.4": "April",
397 "month.5": "Mai",
398 "month.6": "Juni",
399 "month.7": "Juli",
400 "month.8": "August",
401 "month.9": "September",
402 "month.10": "Oktober",
403 "month.11": "November",
404 "month.12": "Dezember",
405 "month.s.1": "Jan",
406 "month.s.2": "Feb",
407 "month.s.3": "Mär",
408 "month.s.4": "Apr",
409 "month.s.5": "Mai",
410 "month.s.6": "Jun",
411 "month.s.7": "Jul",
412 "month.s.8": "Aug",
413 "month.s.9": "Sep",
414 "month.s.10": "Okt",
415 "month.s.11": "Nov",
416 "month.s.12": "Dez",
417 "ago.just": "gerade eben",
418 "ago.minute": "vor 1 Minute",
419 "ago.minutes": "vor %d Minuten",
420 "ago.hour": "vor 1 Stunde",
421 "ago.hours": "vor %d Stunden",
422 "ago.day": "vor 1 Tag",
423 "ago.days": "vor %d Tagen",
424 "ago.week": "vor 1 Woche",
425 "ago.weeks": "vor %d Wochen",
426 "ago.month": "vor 1 Monat",
427 "ago.months": "vor %d Monaten",
428 "ago.year": "vor 1 Jahr",
429 "ago.years": "vor %d Jahren",
430 "title.new": "Neu",
431 "title.account": "Konto",
432 "title.storage": "Speicher",
433 "title.commits": "Commits",
434 "title.branches": "Branches",
435 "title.mrs": "Merge Requests",
436 "title.pipelines": "Pipelines",
437 "title.pipeline": "Pipeline",
438 "title.releases": "Releases",
439 "title.tags": "Tags",
440 "title.settings": "Einstellungen",
441 "new.group": "Neue Gruppe",
442 "new.repo": "Neues Repository",
443 "new.name": "Name",
444 "new.description": "Beschreibung",
445 "new.owner": "Eigentümer",
446 "new.me": "Ich",
447 "new.visibility": "Sichtbarkeit",
448 "new.role": "Standardrolle",
449 "new.roleHint": "Rolle für Mitglieder in neuen Repositories dieser Gruppe.",
450 "slug.bad": "Dieser Name geht nicht.",
451 "slug.free": "Verfügbar",
452 "slug.taken": "Belegt",
453 "role.readonly": "Nur lesen",
454 "role.developer": "Entwickler",
455 "role.maintainer": "Betreuer",
456 "role.": "Keine",
457 "vis.public": "Öffentlich",
458 "vis.private": "Privat",
459 "vis.protected": "Geschützt",
460 "group.tab.repos": "Repositories",
461 "group.tab.members": "Mitglieder",
462 "group.tab.settings": "Einstellungen",
463 "group.search": "Suchen",
464 "group.sort": "Name",
465 "group.direction": "Sortierrichtung",
466 "group.created": "Erstellt %s",
467 "group.empty": "Noch keine Repositories.",
468 "group.menu": "Menü",
469 "group.star": "Stern",
470 "group.unstar": "Stern entfernen",
471 "group.secretsNote": "Nur Geheimnisse dieser Gruppe.",
472 "group.defaultRole": "Standardrolle für neue Repositories",
473 "tab.overview": "Übersicht",
474 "tab.files": "Dateien",
475 "tab.commits": "Commits",
476 "tab.branches": "Branches",
477 "tab.mrs": "Merge Requests",
478 "tab.pipelines": "Pipelines",
479 "tab.releases": "Releases",
480 "tab.settings": "Einstellungen",
481 "repo.searchFile": "Datei suchen",
482 "repo.code": "Code",
483 "repo.ssh": "SSH",
484 "repo.https": "HTTPS",
485 "repo.cloneHint": "Benutzername und ein Token als Passwort.",
486 "repo.name": "Name",
487 "repo.lastCommit": "Letzter Commit",
488 "repo.lastChange": "Letzte Änderung",
489 "repo.emptyDir": "Dieses Verzeichnis ist leer.",
490 "repo.noCommits": "Noch keine Commits.",
491 "repo.project": "Projektinformationen",
492 "repo.created": "Erstellt am %s",
493 "repo.history": "Verlauf",
494 "repo.files": "Dateien",
495 "repo.binary": "Binäre Datei.",
496 "repo.noTags": "Noch keine Tags.",
497 "repo.noBranches": "Noch keine Branches.",
498 "count.commit.one": "%d Commit",
499 "count.commit.many": "%d Commits",
500 "count.branch.one": "%d Branch",
501 "count.branch.many": "%d Branches",
502 "count.tag.one": "%d Tag",
503 "count.tag.many": "%d Tags",
504 "count.release.one": "%d Release",
505 "count.release.many": "%d Releases",
506 "mr.title": "Merge Requests",
507 "mr.none": "Keine Merge Requests.",
508 "mr.new": "Neu",
509 "mr.titleField": "Titel",
510 "mr.description": "Beschreibung",
511 "mr.source": "Quelle",
512 "mr.target": "Ziel",
513 "mr.commits": "Commits",
514 "mr.noDiff": "keine Commits vor dem Zielbranch, oder der Branch fehlt",
515 "mr.comments": "Kommentare",
516 "mr.noComments": "Noch keine Kommentare.",
517 "mr.comment": "Kommentar",
518 "pipe.title": "Pipelines",
519 "pipe.ref": "Branch, leer ist der Standard",
520 "pipe.none": "Noch keine Pipelines. Lege blue-ci-cd.yml im Stammverzeichnis an.",
521 "pipe.one": "Pipeline",
522 "rel.none": "Noch keine Releases.",
523 "rel.bytes": "Bytes",
524 "set.onlyAdmin": "Nur ein Betreuer ändert Einstellungen, Geheimnisse und Webhooks. Deine Rolle: %s.",
525 "set.general": "Allgemein",
526 "set.members": "Mitglieder",
527 "set.branches": "Branches",
528 "set.secrets": "Geheimnisse",
529 "set.webhooks": "Webhooks",
530 "set.username": "Benutzername",
531 "set.pending": "wartet auf die erste Anmeldung",
532 "set.pattern": "master oder release/*",
533 "set.protectHint": "Entwickler können nicht auf diese Branches pushen.",
534 "set.secretName": "Name",
535 "set.secretValue": "Wert",
536 "set.protectedOnly": "Nur auf einem geschützten Branch mitsenden",
537 "set.valuesHidden": "Werte werden nicht erneut angezeigt.",
538 "set.delete": "Löschen",
539 "set.typeName": "Tippe %s",
540 "set.deleteRepo": "Repository löschen",
541 "set.whName": "Name",
542 "set.preset": "Vorlage",
543 "set.preset.generic": "Generisches JSON",
544 "set.preset.discord": "Discord",
545 "set.preset.grok": "Grok Bot",
546 "set.url": "URL",
547 "set.branchFilter": "Branchfilter für Push",
548 "set.filterHint": "leer, master oder re:^release/.*",
549 "set.headers": "Header, eine pro Zeile",
550 "set.body": "Body-Vorlage, leer sendet das Ereignis als JSON",
551 "set.ev.push": "Push",
552 "set.ev.mr": "Merge Request",
553 "set.ev.ok": "Pipeline erfolgreich",
554 "set.ev.fail": "Pipeline fehlgeschlagen",
555 "set.ev.release": "Release veröffentlicht",
556 "set.saveWebhook": "Webhook speichern",
557 "logo.file": "Logo",
558 "logo.hint": "PNG, JPEG, GIF oder SVG. Größer als 512×512 wird verkleinert.",
559 "acct.hint": "Für Git über HTTPS: dein Benutzername und ein Token als Passwort.",
560 "acct.tokens": "Zugriffstoken",
561 "acct.tokenName": "Name, zum Beispiel Laptop",
562 "acct.newToken": "Neues Token",
563 "acct.revoke": "Widerrufen",
564 "acct.ssh": "SSH-Schlüssel",
565 "acct.keyName": "Name",
566 "acct.pubkey": "Öffentlicher Schlüssel",
567 "acct.add": "Hinzufügen",
568 "acct.remove": "Entfernen",
569 "acct.export": "Daten herunterladen (JSON)",
570 "acct.language": "Sprache",
571 "setup.choose": "Speicher wählen",
572 "setup.pathTitle": "Speicherpfad",
573 "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",
574 "setup.free": "Freier Speicher: %s von %s.",
575 "setup.disk": "Pfad auf der Festplatte",
576 "setup.rules": "Der Pfad muss existieren, beschreibbar sein und mindestens %s frei haben.",
577 "flash.saved": "Gespeichert",
578 "flash.memberSaved": "Mitglied gespeichert",
579 "flash.memberRemoved": "Mitglied entfernt",
580 "flash.branchOn": "Branch geschützt",
581 "flash.patternOff": "Muster entfernt",
582 "flash.secretSaved": "Geheimnis gespeichert",
583 "flash.secretRemoved": "Geheimnis entfernt",
584 "flash.webhookSaved": "Webhook gespeichert",
585 "flash.webhookRemoved": "Webhook entfernt",
586 "flash.repoDeleted": "Repository gelöscht",
587 "flash.tokenCreated": "Token erstellt. Kopiere es jetzt; es wird nicht erneut angezeigt.",
588 "flash.tokenRevoked": "Token widerrufen",
589 "flash.sshAdded": "Schlüssel hinzugefügt",
590 "flash.sshRemoved": "Schlüssel entfernt",
591 "flash.pipeline": "Pipeline gestartet",
592 "flash.language": "Sprache gespeichert",
593 "flash.logo": "Logo gespeichert",
594 "flash.star": "Stern aktualisiert",
595 "err.forbidden": "kein Zugriff",
596 "err.rights": "Rechte nicht lesbar",
597 "err.badForm": "ungültiges Formular",
598 "err.badCSRF": "ungültiges Formular, lade die Seite neu",
599 "err.groupMissing": "Gruppe nicht gefunden",
600 "err.gitInit": "git init: %s",
601 "err.confirmDelete": "tippe den Repositorynamen, um zu löschen",
602 "err.tokenMissing": "Token nicht gefunden",
603 "err.sshBad": "das ist kein öffentlicher OpenSSH-Schlüssel",
604 "err.sshMissing": "Schlüssel nicht gefunden",
605 "err.pickEvent": "wähle mindestens ein Ereignis",
606 "err.preset": "unbekannte Vorlage",
607 "err.header": "Header muss 'Name: Wert' sein",
608 "err.noStorageAdmin": "Du darfst den Speicher nicht einrichten.",
609 "err.storageSave": "Der Pfad konnte nicht gespeichert werden.",
610 "err.storageSame": "Wähle das Verzeichnis für die Repositories.",
611 "err.storageSet": "Speicher gesetzt auf %s. %s frei.",
612 "err.storageMoved": "Speicherpfad geändert zu %s. Vorhandene Daten wurden nicht verschoben. %s frei.",
613 "err.noStorage": "Der Speicher ist noch nicht eingerichtet. Ein Administrator wählt einen Pfad in der Weboberfläche.",
614 "err.logoType": "verwende PNG, JPEG, GIF oder SVG",
615 "err.logoBig": "die Datei ist zu groß",
616 "err.logoSVG": "dieses SVG wird nicht akzeptiert",
617 "err.logoStore": "das Logo konnte nicht gespeichert werden",
618 "err.logoRead": "das Logo konnte nicht gelesen werden",
619 "err.userName": "Benutzername %q ist hier nicht verwendbar",
620 "err.groupPath": "Gruppenpfad %q ist nicht verwendbar",
621 "err.repoName": "Repositoryname %q ist nicht verwendbar",
622 "err.slug": "der Name ist nicht verwendbar",
623 "err.tag": "Tag %q ist nicht verwendbar",
624 "err.tagChar": "Tag %q enthält ein verbotenes Zeichen",
625 "err.groupNeedsName": "die Gruppe braucht einen Namen",
626 "err.pathUser": "Pfad %s ist bereits ein Benutzer",
627 "err.pathGroup": "Pfad %s ist bereits eine Gruppe",
628 "err.ownerKind": "Eigentümer muss user oder group sein",
629 "err.visibility": "Sichtbarkeit muss public oder private sein",
630 "err.userGroupClash": "es gibt bereits eine Gruppe %s; persönliche Repositories wären dann nicht erreichbar",
631 "err.repoExists": "es gibt bereits ein Repository %s",
632 "err.scope": "Bereich muss repo oder group sein",
633 "err.pattern": "Muster %q ist nicht verwendbar",
634 "err.emptyValue": "der Wert ist leer",
635 "err.userTaken": "Benutzername %s ist bereits vergeben",
636 "err.tokenNeedsName": "gib dem Token einen Namen",
637 "err.sshDup": "dieser Schlüssel ist bereits registriert",
638 "err.notFound": "nicht gefunden",
639 "err.noteEmpty": "ein Kommentar ist leer",
640 "err.mrTitle": "ein Merge Request braucht einen Titel",
641 "err.tagExists": "Tag %s existiert bereits",
642 "err.roleMissing": "Rolle fehlt",
643 "err.roleUnknown": "unbekannte Rolle %q",
644 "err.hook.nowrite": "keine Schreibrechte auf %s",
645 "err.hook.branch": "ungültiger Branch %q",
646 "err.hook.protected": "Branch %s ist geschützt; nur ein Betreuer darf ihn ändern",
647 "err.hook.empty": "leerer Push",
648 "err.secretLen": "der Geheimnisname muss 1 bis 80 Zeichen haben",
649 "err.secretForm": "Geheimnisname %q muss [A-Z][A-Z0-9_]* entsprechen",
650 "err.mergeConflict": "Zusammenführen fehlgeschlagen, es gibt einen Konflikt oder der Branch fehlt",
651 "err.targetBranch": "Zielbranch %s: %s",
652 "err.pathMissing": "Pfad fehlt",
653 "err.pathNewline": "Pfad enthält einen Zeilenumbruch",
654 "err.pathAbsolute": "Pfad muss absolut sein",
655 "err.pathAbsent": "Pfad existiert nicht",
656 "err.pathRead": "Pfad nicht lesbar: %s",
657 "err.pathDir": "Pfad ist kein Verzeichnis",
658 "err.pathFree": "freier Speicher nicht ermittelbar: %s",
659 "err.pathWrite": "Pfad ist nicht beschreibbar",
660 "err.pathSpace": "zu wenig freier Speicher: %s frei, mindestens %s",
661 "err.whFilter": "branchfilter: %s",
662 "err.whEvent": "unbekanntes Ereignis %q",
663 "err.whTemplate": "nicht geschlossenes {{ in der Vorlage",
664 "err.whSecret": "Geheimnis %s existiert nicht",
665 "err.whField": "unbekanntes Feld event.%s",
666 "err.whPlaceholder": "unbekannter Platzhalter %q",
667 "err.whURL": "Webhook-URL ist ungültig",
668 "err.whScheme": "Webhook-URL muss http oder https sein",
669 "err.whHost": "Webhook-Host fehlt",
670 "err.whBlockedIP": "%s liegt in einem gesperrten Bereich",
671 "err.whDNS": "DNS für %s: %s",
672 "err.whNoAddr": "keine Adresse für %s",
673 "err.whBlockedHost": "%s zeigt auf %s in einem gesperrten Bereich",
674 "err.whRedirects": "zu viele Weiterleitungen",
675 "err.whRedirectHost": "Weiterleitung zu einem anderen Host mit dem ursprünglichen Body wurde abgelehnt",
676 "flash.welcome": "Willkommen, %s",
677 "flash.repoCreated": "Repository erstellt",
678 "flash.groupCreated": "Gruppe erstellt",
679 "flash.mrOpened": "Merge-Request geöffnet",
680 "flash.note": "Kommentar veröffentlicht",
681 "flash.merged": "Zusammengeführt",
682 "flash.closed": "Geschlossen",
683 "hook.push": "%s hat nach %s in %s gepusht",
684 "hook.mr": "Merge-Request !%s geöffnet: %s",
685 "hook.release": "Release %s von %s veröffentlicht",
686 "err.session": "Sitzung",
687 "err.oauth": "Anmeldung fehlgeschlagen: %s",
688 "err.oauthFail": "Anmeldung fehlgeschlagen",
689 "err.oauthState": "ungültiger Anmeldestatus",
690 "err.branchMissing": "Branch nicht gefunden",
691 "err.branches": "wähle zwei verschiedene Branches",
692 "err.targetAccess": "kein Zugriff auf den Zielbranch",
693 "err.commitMissing": "Commit ist nicht in diesem Repository",
694 "err.artifactMissing": "Artefakt nicht gefunden: %s %s",
695 "err.noWrite": "kein Schreibzugriff",
696 "err.noRead": "kein Lesezugriff",
697 "err.overview": "Übersicht",
698 "err.tokenAbsent": "Token fehlt",
699 "err.tokenBad": "Token ungültig",
700 "err.jobToken": "Job-Token ungültig",
701 "err.onlyAdmin": "nur ein Maintainer",
702 "err.commitAbsent": "Commit fehlt",
703 "err.assetsJob": "Assets gehören zu einem Job-Token",
704 "err.assetName": "Assetname",
705 "err.assetDisk": "Artefakt fehlt auf der Festplatte",
706 "err.assetCopy": "Asset konnte nicht kopiert werden",
707 "err.tagFail": "Tag: %s",
708 "err.json": "json",
709 }
710
711 var fr = map[string]string{
712 "nav.dashboard": "Aperçu",
713 "nav.new": "Nouveau",
714 "nav.storage": "Stockage",
715 "nav.signout": "Se déconnecter",
716 "nav.signin": "Se connecter",
717 "action.save": "Enregistrer",
718 "action.copy": "Copier",
719 "action.copied": "Copié",
720 "action.remove": "Retirer",
721 "action.open": "Ouvrir",
722 "action.close": "Fermer",
723 "action.merge": "Fusionner",
724 "action.start": "Démarrer",
725 "action.protect": "Protéger",
726 "action.post": "Publier",
727 "home.lead": "Connecte-toi pour voir les dépôts.",
728 "home.public": "Dépôts publics",
729 "home.storage": "Le stockage n’est pas encore configuré. Les dépôts sont temporairement indisponibles.",
730 "dash.repos": "Dépôts",
731 "dash.groups": "Groupes",
732 "dash.noRepos": "Pas encore de dépôts.",
733 "dash.noGroups": "Pas encore de groupes.",
734 "heat.title": "Activité",
735 "heat.less": "Moins",
736 "heat.more": "Plus",
737 "heat.note": "Commits, merge requests et commentaires.",
738 "heat.mon": "L",
739 "heat.wed": "M",
740 "heat.fri": "V",
741 "heat.none.year": "Aucune contribution au cours des 12 derniers mois",
742 "heat.one.year": "1 contribution au cours des 12 derniers mois",
743 "heat.many.year": "%d contributions au cours des 12 derniers mois",
744 "heat.none.day": "Aucune contribution le %s",
745 "heat.one.day": "1 contribution le %s",
746 "heat.many.day": "%d contributions le %s",
747 "month.1": "janvier",
748 "month.2": "février",
749 "month.3": "mars",
750 "month.4": "avril",
751 "month.5": "mai",
752 "month.6": "juin",
753 "month.7": "juillet",
754 "month.8": "août",
755 "month.9": "septembre",
756 "month.10": "octobre",
757 "month.11": "novembre",
758 "month.12": "décembre",
759 "month.s.1": "janv.",
760 "month.s.2": "févr.",
761 "month.s.3": "mars",
762 "month.s.4": "avr.",
763 "month.s.5": "mai",
764 "month.s.6": "juin",
765 "month.s.7": "juil.",
766 "month.s.8": "août",
767 "month.s.9": "sept.",
768 "month.s.10": "oct.",
769 "month.s.11": "nov.",
770 "month.s.12": "déc.",
771 "ago.just": "à l’instant",
772 "ago.minute": "il y a 1 minute",
773 "ago.minutes": "il y a %d minutes",
774 "ago.hour": "il y a 1 heure",
775 "ago.hours": "il y a %d heures",
776 "ago.day": "il y a 1 jour",
777 "ago.days": "il y a %d jours",
778 "ago.week": "il y a 1 semaine",
779 "ago.weeks": "il y a %d semaines",
780 "ago.month": "il y a 1 mois",
781 "ago.months": "il y a %d mois",
782 "ago.year": "il y a 1 an",
783 "ago.years": "il y a %d ans",
784 "title.new": "Nouveau",
785 "title.account": "Compte",
786 "title.storage": "Stockage",
787 "title.commits": "Commits",
788 "title.branches": "Branches",
789 "title.mrs": "Merge requests",
790 "title.pipelines": "Pipelines",
791 "title.pipeline": "Pipeline",
792 "title.releases": "Versions",
793 "title.tags": "Tags",
794 "title.settings": "Paramètres",
795 "new.group": "Nouveau groupe",
796 "new.repo": "Nouveau dépôt",
797 "new.name": "Nom",
798 "new.description": "Description",
799 "new.owner": "Propriétaire",
800 "new.me": "Moi",
801 "new.visibility": "Visibilité",
802 "new.role": "Rôle par défaut",
803 "new.roleHint": "Rôle des membres dans les nouveaux dépôts de ce groupe.",
804 "slug.bad": "Ce nom ne convient pas.",
805 "slug.free": "Disponible",
806 "slug.taken": "Pris",
807 "role.readonly": "Lecture seule",
808 "role.developer": "Développeur",
809 "role.maintainer": "Mainteneur",
810 "role.": "Aucun",
811 "vis.public": "Public",
812 "vis.private": "Privé",
813 "vis.protected": "Protégé",
814 "group.tab.repos": "Dépôts",
815 "group.tab.members": "Membres",
816 "group.tab.settings": "Paramètres",
817 "group.search": "Rechercher",
818 "group.sort": "Nom",
819 "group.direction": "Sens du tri",
820 "group.created": "Créé le %s",
821 "group.empty": "Pas encore de dépôts.",
822 "group.menu": "Menu",
823 "group.star": "Étoile",
824 "group.unstar": "Retirer l’étoile",
825 "group.secretsNote": "Uniquement les secrets de ce groupe.",
826 "group.defaultRole": "Rôle par défaut pour les nouveaux dépôts",
827 "tab.overview": "Aperçu",
828 "tab.files": "Fichiers",
829 "tab.commits": "Commits",
830 "tab.branches": "Branches",
831 "tab.mrs": "Merge requests",
832 "tab.pipelines": "Pipelines",
833 "tab.releases": "Versions",
834 "tab.settings": "Paramètres",
835 "repo.searchFile": "Chercher un fichier",
836 "repo.code": "Code",
837 "repo.ssh": "SSH",
838 "repo.https": "HTTPS",
839 "repo.cloneHint": "Nom d’utilisateur et un jeton comme mot de passe.",
840 "repo.name": "Nom",
841 "repo.lastCommit": "Dernier commit",
842 "repo.lastChange": "Dernière modification",
843 "repo.emptyDir": "Ce dossier est vide.",
844 "repo.noCommits": "Pas encore de commits.",
845 "repo.project": "Informations du projet",
846 "repo.created": "Créé le %s",
847 "repo.history": "Historique",
848 "repo.files": "Fichiers",
849 "repo.binary": "Fichier binaire.",
850 "repo.noTags": "Pas encore de tags.",
851 "repo.noBranches": "Pas encore de branches.",
852 "count.commit.one": "%d commit",
853 "count.commit.many": "%d commits",
854 "count.branch.one": "%d branche",
855 "count.branch.many": "%d branches",
856 "count.tag.one": "%d tag",
857 "count.tag.many": "%d tags",
858 "count.release.one": "%d version",
859 "count.release.many": "%d versions",
860 "mr.title": "Merge requests",
861 "mr.none": "Aucune merge request.",
862 "mr.new": "Nouveau",
863 "mr.titleField": "Titre",
864 "mr.description": "Description",
865 "mr.source": "Source",
866 "mr.target": "Cible",
867 "mr.commits": "Commits",
868 "mr.noDiff": "aucun commit avant la branche cible, ou la branche manque",
869 "mr.comments": "Commentaires",
870 "mr.noComments": "Pas encore de commentaires.",
871 "mr.comment": "Commentaire",
872 "pipe.title": "Pipelines",
873 "pipe.ref": "branche, vide pour la branche par défaut",
874 "pipe.none": "Pas encore de pipelines. Ajoute blue-ci-cd.yml à la racine.",
875 "pipe.one": "Pipeline",
876 "rel.none": "Pas encore de versions.",
877 "rel.bytes": "octets",
878 "set.onlyAdmin": "Seul un mainteneur modifie les paramètres, les secrets et les webhooks. Ton rôle : %s.",
879 "set.general": "Général",
880 "set.members": "Membres",
881 "set.branches": "Branches",
882 "set.secrets": "Secrets",
883 "set.webhooks": "Webhooks",
884 "set.username": "nom d’utilisateur",
885 "set.pending": "en attente de la première connexion",
886 "set.pattern": "master ou release/*",
887 "set.protectHint": "Les développeurs ne peuvent pas pousser vers ces branches.",
888 "set.secretName": "Nom",
889 "set.secretValue": "Valeur",
890 "set.protectedOnly": "N’envoyer que sur une branche protégée",
891 "set.valuesHidden": "Les valeurs ne sont pas réaffichées.",
892 "set.delete": "Supprimer",
893 "set.typeName": "Saisis %s",
894 "set.deleteRepo": "Supprimer le dépôt",
895 "set.whName": "Nom",
896 "set.preset": "Modèle",
897 "set.preset.generic": "JSON générique",
898 "set.preset.discord": "Discord",
899 "set.preset.grok": "Grok Bot",
900 "set.url": "URL",
901 "set.branchFilter": "Filtre de branche pour le push",
902 "set.filterHint": "vide, master, ou re:^release/.*",
903 "set.headers": "En-têtes, un par ligne",
904 "set.body": "Modèle du corps, vide envoie l’événement en JSON",
905 "set.ev.push": "push",
906 "set.ev.mr": "merge request",
907 "set.ev.ok": "pipeline réussie",
908 "set.ev.fail": "pipeline échouée",
909 "set.ev.release": "version publiée",
910 "set.saveWebhook": "Enregistrer le webhook",
911 "logo.file": "Logo",
912 "logo.hint": "PNG, JPEG, GIF ou SVG. Au-delà de 512×512, l’image est réduite.",
913 "acct.hint": "Pour git en HTTPS : ton nom d’utilisateur et un jeton comme mot de passe.",
914 "acct.tokens": "Jetons d’accès",
915 "acct.tokenName": "nom, par exemple ordinateur",
916 "acct.newToken": "Nouveau jeton",
917 "acct.revoke": "Révoquer",
918 "acct.ssh": "Clés SSH",
919 "acct.keyName": "Nom",
920 "acct.pubkey": "Clé publique",
921 "acct.add": "Ajouter",
922 "acct.remove": "Supprimer",
923 "acct.export": "Télécharger tes données (JSON)",
924 "acct.language": "Langue",
925 "setup.choose": "Choisir le stockage",
926 "setup.pathTitle": "Chemin de stockage",
927 "setup.changeWarn": "Changer le chemin ne déplace ni les dépôts, ni les artefacts, ni les versions.",
928 "setup.free": "Espace libre : %s sur %s.",
929 "setup.disk": "Chemin sur le disque",
930 "setup.rules": "Le chemin doit exister, être accessible en écriture et avoir au moins %s de libre.",
931 "flash.saved": "Enregistré",
932 "flash.memberSaved": "Membre enregistré",
933 "flash.memberRemoved": "Membre retiré",
934 "flash.branchOn": "Branche protégée",
935 "flash.patternOff": "Motif retiré",
936 "flash.secretSaved": "Secret enregistré",
937 "flash.secretRemoved": "Secret supprimé",
938 "flash.webhookSaved": "Webhook enregistré",
939 "flash.webhookRemoved": "Webhook supprimé",
940 "flash.repoDeleted": "Dépôt supprimé",
941 "flash.tokenCreated": "Jeton créé. Copie-le maintenant ; il ne sera plus affiché.",
942 "flash.tokenRevoked": "Jeton révoqué",
943 "flash.sshAdded": "Clé ajoutée",
944 "flash.sshRemoved": "Clé supprimée",
945 "flash.pipeline": "Pipeline démarrée",
946 "flash.language": "Langue enregistrée",
947 "flash.logo": "Logo enregistré",
948 "flash.star": "Étoile mise à jour",
949 "err.forbidden": "accès refusé",
950 "err.rights": "impossible de lire les droits",
951 "err.badForm": "formulaire invalide",
952 "err.badCSRF": "formulaire invalide, recharge la page",
953 "err.groupMissing": "groupe introuvable",
954 "err.gitInit": "git init : %s",
955 "err.confirmDelete": "saisis le nom du dépôt pour le supprimer",
956 "err.tokenMissing": "jeton introuvable",
957 "err.sshBad": "ce n’est pas une clé publique OpenSSH",
958 "err.sshMissing": "clé introuvable",
959 "err.pickEvent": "choisis au moins un événement",
960 "err.preset": "modèle inconnu",
961 "err.header": "un en-tête doit ressembler à Nom : valeur",
962 "err.noStorageAdmin": "Tu ne peux pas configurer le stockage.",
963 "err.storageSave": "Le chemin n’a pas pu être enregistré.",
964 "err.storageSame": "Choisis le dossier des dépôts.",
965 "err.storageSet": "Stockage défini sur %s. %s libres.",
966 "err.storageMoved": "Chemin de stockage changé pour %s. Les données existantes n’ont pas été déplacées. %s libres.",
967 "err.noStorage": "Le stockage n’est pas encore configuré. Un administrateur choisit un chemin dans l’interface.",
968 "err.logoType": "utilise un PNG, JPEG, GIF ou SVG",
969 "err.logoBig": "le fichier est trop grand",
970 "err.logoSVG": "ce SVG n’est pas accepté",
971 "err.logoStore": "le logo n’a pas pu être enregistré",
972 "err.logoRead": "le logo n’a pas pu être lu",
973 "err.userName": "le nom d’utilisateur %q n’est pas utilisable ici",
974 "err.groupPath": "le chemin de groupe %q n’est pas utilisable",
975 "err.repoName": "le nom de dépôt %q n’est pas utilisable",
976 "err.slug": "le nom n’est pas utilisable",
977 "err.tag": "le tag %q n’est pas utilisable",
978 "err.tagChar": "le tag %q contient un caractère interdit",
979 "err.groupNeedsName": "le groupe a besoin d’un nom",
980 "err.pathUser": "le chemin %s est déjà un utilisateur",
981 "err.pathGroup": "le chemin %s est déjà un groupe",
982 "err.ownerKind": "le propriétaire doit être user ou group",
983 "err.visibility": "la visibilité doit être public ou private",
984 "err.userGroupClash": "un groupe %s existe déjà ; les dépôts personnels seraient alors inaccessibles",
985 "err.repoExists": "le dépôt %s existe déjà",
986 "err.scope": "la portée doit être repo ou group",
987 "err.pattern": "le motif %q n’est pas utilisable",
988 "err.emptyValue": "la valeur est vide",
989 "err.userTaken": "le nom d’utilisateur %s est déjà utilisé",
990 "err.tokenNeedsName": "donne un nom au jeton",
991 "err.sshDup": "cette clé est déjà enregistrée",
992 "err.notFound": "introuvable",
993 "err.noteEmpty": "un commentaire est vide",
994 "err.mrTitle": "une merge request a besoin d’un titre",
995 "err.tagExists": "le tag %s existe déjà",
996 "err.roleMissing": "le rôle manque",
997 "err.roleUnknown": "rôle inconnu %q",
998 "err.hook.nowrite": "pas de droit d’écriture sur %s",
999 "err.hook.branch": "branche invalide %q",
1000 "err.hook.protected": "la branche %s est protégée ; seul un mainteneur peut la modifier",
1001 "err.hook.empty": "push vide",
1002 "err.secretLen": "le nom du secret doit faire de 1 à 80 caractères",
1003 "err.secretForm": "le nom de secret %q doit correspondre à [A-Z][A-Z0-9_]*",
1004 "err.mergeConflict": "la fusion a échoué, il y a un conflit ou la branche manque",
1005 "err.targetBranch": "branche cible %s : %s",
1006 "err.pathMissing": "chemin manquant",
1007 "err.pathNewline": "le chemin contient un saut de ligne",
1008 "err.pathAbsolute": "le chemin doit être absolu",
1009 "err.pathAbsent": "le chemin n’existe pas",
1010 "err.pathRead": "chemin illisible : %s",
1011 "err.pathDir": "le chemin n’est pas un dossier",
1012 "err.pathFree": "espace libre indéterminable : %s",
1013 "err.pathWrite": "le chemin n’est pas accessible en écriture",
1014 "err.pathSpace": "pas assez d’espace libre : %s libres, au moins %s",
1015 "err.whFilter": "branchfilter : %s",
1016 "err.whEvent": "événement inconnu %q",
1017 "err.whTemplate": "{{ non fermé dans le modèle",
1018 "err.whSecret": "le secret %s n’existe pas",
1019 "err.whField": "champ inconnu event.%s",
1020 "err.whPlaceholder": "espace réservé inconnu %q",
1021 "err.whURL": "l’URL du webhook est invalide",
1022 "err.whScheme": "l’URL du webhook doit être http ou https",
1023 "err.whHost": "l’hôte du webhook manque",
1024 "err.whBlockedIP": "%s est dans une plage bloquée",
1025 "err.whDNS": "dns pour %s : %s",
1026 "err.whNoAddr": "pas d’adresse pour %s",
1027 "err.whBlockedHost": "%s pointe vers %s dans une plage bloquée",
1028 "err.whRedirects": "trop de redirections",
1029 "err.whRedirectHost": "une redirection vers un autre hôte avec le corps d’origine a été refusée",
1030 "flash.welcome": "Bienvenue, %s",
1031 "flash.repoCreated": "Dépôt créé",
1032 "flash.groupCreated": "Groupe créé",
1033 "flash.mrOpened": "Merge request ouverte",
1034 "flash.note": "Commentaire publié",
1035 "flash.merged": "Fusionné",
1036 "flash.closed": "Fermé",
1037 "hook.push": "%s a poussé vers %s dans %s",
1038 "hook.mr": "merge request !%s ouverte : %s",
1039 "hook.release": "version %s de %s publiée",
1040 "err.session": "session",
1041 "err.oauth": "Connexion échouée : %s",
1042 "err.oauthFail": "La connexion a échoué",
1043 "err.oauthState": "état de connexion invalide",
1044 "err.branchMissing": "branche introuvable",
1045 "err.branches": "choisissez deux branches différentes",
1046 "err.targetAccess": "pas d’accès à la branche cible",
1047 "err.commitMissing": "le commit n’est pas dans ce dépôt",
1048 "err.artifactMissing": "artefact introuvable : %s %s",
1049 "err.noWrite": "pas de droit d’écriture",
1050 "err.noRead": "pas de droit de lecture",
1051 "err.overview": "aperçu",
1052 "err.tokenAbsent": "jeton manquant",
1053 "err.tokenBad": "jeton invalide",
1054 "err.jobToken": "jeton de job invalide",
1055 "err.onlyAdmin": "seul un mainteneur",
1056 "err.commitAbsent": "commit manquant",
1057 "err.assetsJob": "les artefacts appartiennent à un jeton de job",
1058 "err.assetName": "nom d’artefact",
1059 "err.assetDisk": "artefact absent du disque",
1060 "err.assetCopy": "impossible de copier l’artefact",
1061 "err.tagFail": "tag : %s",
1062 "err.json": "json",
1063 }
@@ -0,0 +1,1063 @@
1package i18n
2
3var nl = map[string]string{
4 "nav.dashboard": "Overzicht",
5 "nav.new": "Nieuw",
6 "nav.storage": "Opslag",
7 "nav.signout": "Afmelden",
8 "nav.signin": "Aanmelden",
9 "action.save": "Opslaan",
10 "action.copy": "Kopieer",
11 "action.copied": "Gekopieerd",
12 "action.remove": "Weg",
13 "action.open": "Openen",
14 "action.close": "Sluiten",
15 "action.merge": "Samenvoegen",
16 "action.start": "Starten",
17 "action.protect": "Beschermen",
18 "action.post": "Plaatsen",
19 "home.lead": "Meld je aan om repositories te bekijken.",
20 "home.public": "Openbare repositories",
21 "home.storage": "Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.",
22 "dash.repos": "Repositories",
23 "dash.groups": "Groepen",
24 "dash.noRepos": "Nog geen repositories.",
25 "dash.noGroups": "Nog geen groepen.",
26 "heat.title": "Activiteit",
27 "heat.less": "Minder",
28 "heat.more": "Meer",
29 "heat.note": "Commits, merge requests en reacties.",
30 "heat.mon": "M",
31 "heat.wed": "W",
32 "heat.fri": "V",
33 "heat.none.year": "Geen bijdragen in de laatste 12 maanden",
34 "heat.one.year": "1 bijdrage in de laatste 12 maanden",
35 "heat.many.year": "%d bijdragen in de laatste 12 maanden",
36 "heat.none.day": "Geen bijdragen op %s",
37 "heat.one.day": "1 bijdrage op %s",
38 "heat.many.day": "%d bijdragen op %s",
39 "month.1": "januari",
40 "month.2": "februari",
41 "month.3": "maart",
42 "month.4": "april",
43 "month.5": "mei",
44 "month.6": "juni",
45 "month.7": "juli",
46 "month.8": "augustus",
47 "month.9": "september",
48 "month.10": "oktober",
49 "month.11": "november",
50 "month.12": "december",
51 "month.s.1": "jan",
52 "month.s.2": "feb",
53 "month.s.3": "mrt",
54 "month.s.4": "apr",
55 "month.s.5": "mei",
56 "month.s.6": "jun",
57 "month.s.7": "jul",
58 "month.s.8": "aug",
59 "month.s.9": "sep",
60 "month.s.10": "okt",
61 "month.s.11": "nov",
62 "month.s.12": "dec",
63 "ago.just": "zojuist",
64 "ago.minute": "1 minuut geleden",
65 "ago.minutes": "%d minuten geleden",
66 "ago.hour": "1 uur geleden",
67 "ago.hours": "%d uur geleden",
68 "ago.day": "1 dag geleden",
69 "ago.days": "%d dagen geleden",
70 "ago.week": "1 week geleden",
71 "ago.weeks": "%d weken geleden",
72 "ago.month": "1 maand geleden",
73 "ago.months": "%d maanden geleden",
74 "ago.year": "1 jaar geleden",
75 "ago.years": "%d jaar geleden",
76 "title.new": "Nieuw",
77 "title.account": "Account",
78 "title.storage": "Opslag",
79 "title.commits": "Commits",
80 "title.branches": "Branches",
81 "title.mrs": "Merge requests",
82 "title.pipelines": "Pipelines",
83 "title.pipeline": "Pipeline",
84 "title.releases": "Releases",
85 "title.tags": "Tags",
86 "title.settings": "Instellingen",
87 "new.group": "Nieuwe groep",
88 "new.repo": "Nieuwe repository",
89 "new.name": "Naam",
90 "new.description": "Beschrijving",
91 "new.owner": "Eigenaar",
92 "new.me": "Ikzelf",
93 "new.visibility": "Zichtbaarheid",
94 "new.role": "Standaardrol",
95 "new.roleHint": "Rol voor leden in nieuwe repositories van deze groep.",
96 "slug.bad": "Deze naam kan niet.",
97 "slug.free": "Beschikbaar",
98 "slug.taken": "Bezet",
99 "role.readonly": "Alleen lezen",
100 "role.developer": "Ontwikkelaar",
101 "role.maintainer": "Beheerder",
102 "role.": "Geen",
103 "vis.public": "Openbaar",
104 "vis.private": "Privé",
105 "vis.protected": "Beschermd",
106 "group.tab.repos": "Repositories",
107 "group.tab.members": "Leden",
108 "group.tab.settings": "Instellingen",
109 "group.search": "Zoeken",
110 "group.sort": "Naam",
111 "group.direction": "Sorteerrichting",
112 "group.created": "Aangemaakt %s",
113 "group.empty": "Nog geen repositories.",
114 "group.menu": "Menu",
115 "group.star": "Ster",
116 "group.unstar": "Ster weg",
117 "group.secretsNote": "Alleen geheimen van deze groep.",
118 "group.defaultRole": "Standaardrol voor nieuwe repositories",
119 "tab.overview": "Overzicht",
120 "tab.files": "Bestanden",
121 "tab.commits": "Commits",
122 "tab.branches": "Branches",
123 "tab.mrs": "Merge requests",
124 "tab.pipelines": "Pipelines",
125 "tab.releases": "Releases",
126 "tab.settings": "Instellingen",
127 "repo.searchFile": "Bestand zoeken",
128 "repo.code": "Code",
129 "repo.ssh": "SSH",
130 "repo.https": "HTTPS",
131 "repo.cloneHint": "Gebruikersnaam en een token als wachtwoord.",
132 "repo.name": "Naam",
133 "repo.lastCommit": "Laatste commit",
134 "repo.lastChange": "Laatste wijziging",
135 "repo.emptyDir": "Deze map is leeg.",
136 "repo.noCommits": "Nog geen commits.",
137 "repo.project": "Projectinformatie",
138 "repo.created": "Aangemaakt op %s",
139 "repo.history": "Geschiedenis",
140 "repo.files": "Bestanden",
141 "repo.binary": "Binair bestand.",
142 "repo.noTags": "Nog geen tags.",
143 "repo.noBranches": "Nog geen branches.",
144 "count.commit.one": "%d commit",
145 "count.commit.many": "%d commits",
146 "count.branch.one": "%d branch",
147 "count.branch.many": "%d branches",
148 "count.tag.one": "%d tag",
149 "count.tag.many": "%d tags",
150 "count.release.one": "%d release",
151 "count.release.many": "%d releases",
152 "mr.title": "Merge requests",
153 "mr.none": "Geen merge requests.",
154 "mr.new": "Nieuw",
155 "mr.titleField": "Titel",
156 "mr.description": "Beschrijving",
157 "mr.source": "Bron",
158 "mr.target": "Doel",
159 "mr.commits": "Commits",
160 "mr.noDiff": "geen commits vóór de doelbranch, of de branch ontbreekt",
161 "mr.comments": "Reacties",
162 "mr.noComments": "Nog geen reacties.",
163 "mr.comment": "Reactie",
164 "pipe.title": "Pipelines",
165 "pipe.ref": "branch, leeg is de standaard",
166 "pipe.none": "Nog geen pipelines. Voeg blue-ci-cd.yml toe in de root.",
167 "pipe.one": "Pipeline",
168 "rel.none": "Nog geen releases.",
169 "rel.bytes": "bytes",
170 "set.onlyAdmin": "Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: %s.",
171 "set.general": "Algemeen",
172 "set.members": "Leden",
173 "set.branches": "Branches",
174 "set.secrets": "Geheimen",
175 "set.webhooks": "Webhooks",
176 "set.username": "gebruikersnaam",
177 "set.pending": "wacht op eerste aanmelding",
178 "set.pattern": "master of release/*",
179 "set.protectHint": "Ontwikkelaars kunnen niet naar deze branches pushen.",
180 "set.secretName": "Naam",
181 "set.secretValue": "Waarde",
182 "set.protectedOnly": "Alleen meesturen op een beschermde branch",
183 "set.valuesHidden": "Waarden worden niet teruggetoond.",
184 "set.delete": "Verwijderen",
185 "set.typeName": "Typ %s",
186 "set.deleteRepo": "Repository verwijderen",
187 "set.whName": "Naam",
188 "set.preset": "Preset",
189 "set.preset.generic": "Generieke JSON",
190 "set.preset.discord": "Discord",
191 "set.preset.grok": "Grok Bot",
192 "set.url": "URL",
193 "set.branchFilter": "Branchfilter voor push",
194 "set.filterHint": "leeg, master, of re:^release/.*",
195 "set.headers": "Headers, één per regel",
196 "set.body": "Body-sjabloon, leeg is de gebeurtenis als JSON",
197 "set.ev.push": "push",
198 "set.ev.mr": "merge request",
199 "set.ev.ok": "pipeline geslaagd",
200 "set.ev.fail": "pipeline mislukt",
201 "set.ev.release": "release gepubliceerd",
202 "set.saveWebhook": "Webhook opslaan",
203 "logo.file": "Logo",
204 "logo.hint": "PNG, JPEG, GIF of SVG. Groter dan 512×512 wordt teruggeschaald.",
205 "acct.hint": "Voor git via HTTPS: je gebruikersnaam en een token als wachtwoord.",
206 "acct.tokens": "Toegangstokens",
207 "acct.tokenName": "naam, bijvoorbeeld laptop",
208 "acct.newToken": "Nieuw token",
209 "acct.revoke": "Intrekken",
210 "acct.ssh": "SSH-sleutels",
211 "acct.keyName": "Naam",
212 "acct.pubkey": "Publieke sleutel",
213 "acct.add": "Toevoegen",
214 "acct.remove": "Verwijderen",
215 "acct.export": "Gegevens downloaden (JSON)",
216 "acct.language": "Taal",
217 "setup.choose": "Opslag kiezen",
218 "setup.pathTitle": "Opslagpad",
219 "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",
220 "setup.free": "Vrije ruimte: %s van %s.",
221 "setup.disk": "Pad op de schijf",
222 "setup.rules": "Het pad moet bestaan, beschrijfbaar zijn en minstens %s vrij hebben.",
223 "flash.saved": "Opgeslagen",
224 "flash.memberSaved": "Lid opgeslagen",
225 "flash.memberRemoved": "Lid verwijderd",
226 "flash.branchOn": "Branch beschermd",
227 "flash.patternOff": "Patroon verwijderd",
228 "flash.secretSaved": "Geheim opgeslagen",
229 "flash.secretRemoved": "Geheim verwijderd",
230 "flash.webhookSaved": "Webhook opgeslagen",
231 "flash.webhookRemoved": "Webhook verwijderd",
232 "flash.repoDeleted": "Repository verwijderd",
233 "flash.tokenCreated": "Token aangemaakt. Kopieer hem nu; hij wordt niet opnieuw getoond.",
234 "flash.tokenRevoked": "Token ingetrokken",
235 "flash.sshAdded": "Sleutel toegevoegd",
236 "flash.sshRemoved": "Sleutel verwijderd",
237 "flash.pipeline": "Pipeline gestart",
238 "flash.language": "Taal opgeslagen",
239 "flash.logo": "Logo opgeslagen",
240 "flash.star": "Ster bijgewerkt",
241 "err.forbidden": "geen toegang",
242 "err.rights": "rechten niet te lezen",
243 "err.badForm": "ongeldig formulier",
244 "err.badCSRF": "ongeldig formulier, vernieuw de pagina",
245 "err.groupMissing": "groep niet gevonden",
246 "err.gitInit": "git init: %s",
247 "err.confirmDelete": "typ de repositorynaam om te verwijderen",
248 "err.tokenMissing": "token niet gevonden",
249 "err.sshBad": "dat is geen OpenSSH-publieke sleutel",
250 "err.sshMissing": "sleutel niet gevonden",
251 "err.pickEvent": "kies minstens één gebeurtenis",
252 "err.preset": "onbekende preset",
253 "err.header": "header moet 'Naam: waarde' zijn",
254 "err.noStorageAdmin": "Je mag de opslag niet instellen.",
255 "err.storageSave": "Het pad kon niet bewaard worden.",
256 "err.storageSame": "Kies de map voor de repositories.",
257 "err.storageSet": "Opslag ingesteld op %s. %s vrij.",
258 "err.storageMoved": "Opslagpad gewijzigd naar %s. Bestaande data is niet verplaatst. %s vrij.",
259 "err.noStorage": "Opslag is nog niet ingesteld. De beheerder kiest een pad in de webinterface.",
260 "err.logoType": "gebruik een PNG, JPEG, GIF of SVG",
261 "err.logoBig": "het bestand is te groot",
262 "err.logoSVG": "deze SVG wordt niet geaccepteerd",
263 "err.logoStore": "het logo kon niet bewaard worden",
264 "err.logoRead": "het logo kon niet gelezen worden",
265 "err.userName": "gebruikersnaam %q is hier niet bruikbaar",
266 "err.groupPath": "groepspad %q is niet bruikbaar",
267 "err.repoName": "repositorynaam %q is niet bruikbaar",
268 "err.slug": "naam is niet bruikbaar",
269 "err.tag": "tag %q is niet bruikbaar",
270 "err.tagChar": "tag %q bevat een verboden teken",
271 "err.groupNeedsName": "de groep heeft een naam nodig",
272 "err.pathUser": "pad %s is al een gebruiker",
273 "err.pathGroup": "pad %s is al een groep",
274 "err.ownerKind": "eigenaar moet user of group zijn",
275 "err.visibility": "zichtbaarheid moet public of private zijn",
276 "err.userGroupClash": "er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar",
277 "err.repoExists": "er is al een repository %s",
278 "err.scope": "scope moet repo of group zijn",
279 "err.pattern": "patroon %q is niet bruikbaar",
280 "err.emptyValue": "de waarde is leeg",
281 "err.userTaken": "gebruikersnaam %s is al in gebruik",
282 "err.tokenNeedsName": "geef het token een naam",
283 "err.sshDup": "deze sleutel staat al geregistreerd",
284 "err.notFound": "niet gevonden",
285 "err.noteEmpty": "een reactie is leeg",
286 "err.mrTitle": "een merge request heeft een titel nodig",
287 "err.tagExists": "tag %s bestaat al",
288 "err.roleMissing": "rol ontbreekt",
289 "err.roleUnknown": "onbekende rol %q",
290 "err.hook.nowrite": "geen schrijfrechten op %s",
291 "err.hook.branch": "ongeldige branch %q",
292 "err.hook.protected": "branch %s is beschermd; alleen een beheerder mag die wijzigen",
293 "err.hook.empty": "lege push",
294 "err.secretLen": "geheimnaam moet 1 tot 80 tekens zijn",
295 "err.secretForm": "geheimnaam %q moet [A-Z][A-Z0-9_]* zijn",
296 "err.mergeConflict": "samenvoegen lukt niet, er is een conflict of de branch ontbreekt",
297 "err.targetBranch": "doelbranch %s: %s",
298 "err.pathMissing": "pad ontbreekt",
299 "err.pathNewline": "pad bevat een regeleinde",
300 "err.pathAbsolute": "pad moet absoluut zijn",
301 "err.pathAbsent": "pad bestaat niet",
302 "err.pathRead": "pad niet te lezen: %s",
303 "err.pathDir": "pad is geen map",
304 "err.pathFree": "vrije ruimte niet te bepalen: %s",
305 "err.pathWrite": "pad is niet beschrijfbaar",
306 "err.pathSpace": "te weinig vrije ruimte: %s vrij, minimaal %s",
307 "err.whFilter": "branchfilter: %s",
308 "err.whEvent": "onbekende gebeurtenis %q",
309 "err.whTemplate": "onafgesloten {{ in sjabloon",
310 "err.whSecret": "geheim %s bestaat niet",
311 "err.whField": "onbekend veld event.%s",
312 "err.whPlaceholder": "onbekende plaatsaanduiding %q",
313 "err.whURL": "webhook-URL is ongeldig",
314 "err.whScheme": "webhook-URL moet http of https zijn",
315 "err.whHost": "webhook-host ontbreekt",
316 "err.whBlockedIP": "%s ligt in een geblokkeerd bereik",
317 "err.whDNS": "dns voor %s: %s",
318 "err.whNoAddr": "geen adres voor %s",
319 "err.whBlockedHost": "%s wijst naar %s in een geblokkeerd bereik",
320 "err.whRedirects": "te veel redirects",
321 "err.whRedirectHost": "redirect naar een andere host met de oorspronkelijke body is geweigerd",
322 "flash.welcome": "Welkom, %s",
323 "flash.repoCreated": "Repository aangemaakt",
324 "flash.groupCreated": "Groep aangemaakt",
325 "flash.mrOpened": "Merge request geopend",
326 "flash.note": "Reactie geplaatst",
327 "flash.merged": "Samengevoegd",
328 "flash.closed": "Gesloten",
329 "hook.push": "%s pushte naar %s in %s",
330 "hook.mr": "merge request !%s geopend: %s",
331 "hook.release": "release %s van %s gepubliceerd",
332 "err.session": "sessie",
333 "err.oauth": "Aanmelden mislukt: %s",
334 "err.oauthFail": "Aanmelden is mislukt",
335 "err.oauthState": "ongeldige aanmeldstatus",
336 "err.branchMissing": "branch niet gevonden",
337 "err.branches": "kies twee verschillende branches",
338 "err.targetAccess": "geen toegang tot de doelbranch",
339 "err.commitMissing": "commit niet in deze repository",
340 "err.artifactMissing": "artifact niet gevonden: %s %s",
341 "err.noWrite": "geen schrijfrechten",
342 "err.noRead": "geen leesrechten",
343 "err.overview": "overzicht",
344 "err.tokenAbsent": "token ontbreekt",
345 "err.tokenBad": "token ongeldig",
346 "err.jobToken": "job-token ongeldig",
347 "err.onlyAdmin": "alleen een beheerder",
348 "err.commitAbsent": "commit ontbreekt",
349 "err.assetsJob": "assets horen bij een job-token",
350 "err.assetName": "assetnaam",
351 "err.assetDisk": "artifact ontbreekt op schijf",
352 "err.assetCopy": "asset kopiëren",
353 "err.tagFail": "tag: %s",
354 "err.json": "json",
355}
356
357var de = map[string]string{
358 "nav.dashboard": "Übersicht",
359 "nav.new": "Neu",
360 "nav.storage": "Speicher",
361 "nav.signout": "Abmelden",
362 "nav.signin": "Anmelden",
363 "action.save": "Speichern",
364 "action.copy": "Kopieren",
365 "action.copied": "Kopiert",
366 "action.remove": "Entfernen",
367 "action.open": "Öffnen",
368 "action.close": "Schließen",
369 "action.merge": "Zusammenführen",
370 "action.start": "Starten",
371 "action.protect": "Schützen",
372 "action.post": "Senden",
373 "home.lead": "Melde dich an, um Repositories zu sehen.",
374 "home.public": "Öffentliche Repositories",
375 "home.storage": "Der Speicher ist noch nicht eingerichtet. Repositories sind vorübergehend nicht verfügbar.",
376 "dash.repos": "Repositories",
377 "dash.groups": "Gruppen",
378 "dash.noRepos": "Noch keine Repositories.",
379 "dash.noGroups": "Noch keine Gruppen.",
380 "heat.title": "Aktivität",
381 "heat.less": "Weniger",
382 "heat.more": "Mehr",
383 "heat.note": "Commits, Merge Requests und Kommentare.",
384 "heat.mon": "M",
385 "heat.wed": "M",
386 "heat.fri": "F",
387 "heat.none.year": "Keine Beiträge in den letzten 12 Monaten",
388 "heat.one.year": "1 Beitrag in den letzten 12 Monaten",
389 "heat.many.year": "%d Beiträge in den letzten 12 Monaten",
390 "heat.none.day": "Keine Beiträge am %s",
391 "heat.one.day": "1 Beitrag am %s",
392 "heat.many.day": "%d Beiträge am %s",
393 "month.1": "Januar",
394 "month.2": "Februar",
395 "month.3": "März",
396 "month.4": "April",
397 "month.5": "Mai",
398 "month.6": "Juni",
399 "month.7": "Juli",
400 "month.8": "August",
401 "month.9": "September",
402 "month.10": "Oktober",
403 "month.11": "November",
404 "month.12": "Dezember",
405 "month.s.1": "Jan",
406 "month.s.2": "Feb",
407 "month.s.3": "Mär",
408 "month.s.4": "Apr",
409 "month.s.5": "Mai",
410 "month.s.6": "Jun",
411 "month.s.7": "Jul",
412 "month.s.8": "Aug",
413 "month.s.9": "Sep",
414 "month.s.10": "Okt",
415 "month.s.11": "Nov",
416 "month.s.12": "Dez",
417 "ago.just": "gerade eben",
418 "ago.minute": "vor 1 Minute",
419 "ago.minutes": "vor %d Minuten",
420 "ago.hour": "vor 1 Stunde",
421 "ago.hours": "vor %d Stunden",
422 "ago.day": "vor 1 Tag",
423 "ago.days": "vor %d Tagen",
424 "ago.week": "vor 1 Woche",
425 "ago.weeks": "vor %d Wochen",
426 "ago.month": "vor 1 Monat",
427 "ago.months": "vor %d Monaten",
428 "ago.year": "vor 1 Jahr",
429 "ago.years": "vor %d Jahren",
430 "title.new": "Neu",
431 "title.account": "Konto",
432 "title.storage": "Speicher",
433 "title.commits": "Commits",
434 "title.branches": "Branches",
435 "title.mrs": "Merge Requests",
436 "title.pipelines": "Pipelines",
437 "title.pipeline": "Pipeline",
438 "title.releases": "Releases",
439 "title.tags": "Tags",
440 "title.settings": "Einstellungen",
441 "new.group": "Neue Gruppe",
442 "new.repo": "Neues Repository",
443 "new.name": "Name",
444 "new.description": "Beschreibung",
445 "new.owner": "Eigentümer",
446 "new.me": "Ich",
447 "new.visibility": "Sichtbarkeit",
448 "new.role": "Standardrolle",
449 "new.roleHint": "Rolle für Mitglieder in neuen Repositories dieser Gruppe.",
450 "slug.bad": "Dieser Name geht nicht.",
451 "slug.free": "Verfügbar",
452 "slug.taken": "Belegt",
453 "role.readonly": "Nur lesen",
454 "role.developer": "Entwickler",
455 "role.maintainer": "Betreuer",
456 "role.": "Keine",
457 "vis.public": "Öffentlich",
458 "vis.private": "Privat",
459 "vis.protected": "Geschützt",
460 "group.tab.repos": "Repositories",
461 "group.tab.members": "Mitglieder",
462 "group.tab.settings": "Einstellungen",
463 "group.search": "Suchen",
464 "group.sort": "Name",
465 "group.direction": "Sortierrichtung",
466 "group.created": "Erstellt %s",
467 "group.empty": "Noch keine Repositories.",
468 "group.menu": "Menü",
469 "group.star": "Stern",
470 "group.unstar": "Stern entfernen",
471 "group.secretsNote": "Nur Geheimnisse dieser Gruppe.",
472 "group.defaultRole": "Standardrolle für neue Repositories",
473 "tab.overview": "Übersicht",
474 "tab.files": "Dateien",
475 "tab.commits": "Commits",
476 "tab.branches": "Branches",
477 "tab.mrs": "Merge Requests",
478 "tab.pipelines": "Pipelines",
479 "tab.releases": "Releases",
480 "tab.settings": "Einstellungen",
481 "repo.searchFile": "Datei suchen",
482 "repo.code": "Code",
483 "repo.ssh": "SSH",
484 "repo.https": "HTTPS",
485 "repo.cloneHint": "Benutzername und ein Token als Passwort.",
486 "repo.name": "Name",
487 "repo.lastCommit": "Letzter Commit",
488 "repo.lastChange": "Letzte Änderung",
489 "repo.emptyDir": "Dieses Verzeichnis ist leer.",
490 "repo.noCommits": "Noch keine Commits.",
491 "repo.project": "Projektinformationen",
492 "repo.created": "Erstellt am %s",
493 "repo.history": "Verlauf",
494 "repo.files": "Dateien",
495 "repo.binary": "Binäre Datei.",
496 "repo.noTags": "Noch keine Tags.",
497 "repo.noBranches": "Noch keine Branches.",
498 "count.commit.one": "%d Commit",
499 "count.commit.many": "%d Commits",
500 "count.branch.one": "%d Branch",
501 "count.branch.many": "%d Branches",
502 "count.tag.one": "%d Tag",
503 "count.tag.many": "%d Tags",
504 "count.release.one": "%d Release",
505 "count.release.many": "%d Releases",
506 "mr.title": "Merge Requests",
507 "mr.none": "Keine Merge Requests.",
508 "mr.new": "Neu",
509 "mr.titleField": "Titel",
510 "mr.description": "Beschreibung",
511 "mr.source": "Quelle",
512 "mr.target": "Ziel",
513 "mr.commits": "Commits",
514 "mr.noDiff": "keine Commits vor dem Zielbranch, oder der Branch fehlt",
515 "mr.comments": "Kommentare",
516 "mr.noComments": "Noch keine Kommentare.",
517 "mr.comment": "Kommentar",
518 "pipe.title": "Pipelines",
519 "pipe.ref": "Branch, leer ist der Standard",
520 "pipe.none": "Noch keine Pipelines. Lege blue-ci-cd.yml im Stammverzeichnis an.",
521 "pipe.one": "Pipeline",
522 "rel.none": "Noch keine Releases.",
523 "rel.bytes": "Bytes",
524 "set.onlyAdmin": "Nur ein Betreuer ändert Einstellungen, Geheimnisse und Webhooks. Deine Rolle: %s.",
525 "set.general": "Allgemein",
526 "set.members": "Mitglieder",
527 "set.branches": "Branches",
528 "set.secrets": "Geheimnisse",
529 "set.webhooks": "Webhooks",
530 "set.username": "Benutzername",
531 "set.pending": "wartet auf die erste Anmeldung",
532 "set.pattern": "master oder release/*",
533 "set.protectHint": "Entwickler können nicht auf diese Branches pushen.",
534 "set.secretName": "Name",
535 "set.secretValue": "Wert",
536 "set.protectedOnly": "Nur auf einem geschützten Branch mitsenden",
537 "set.valuesHidden": "Werte werden nicht erneut angezeigt.",
538 "set.delete": "Löschen",
539 "set.typeName": "Tippe %s",
540 "set.deleteRepo": "Repository löschen",
541 "set.whName": "Name",
542 "set.preset": "Vorlage",
543 "set.preset.generic": "Generisches JSON",
544 "set.preset.discord": "Discord",
545 "set.preset.grok": "Grok Bot",
546 "set.url": "URL",
547 "set.branchFilter": "Branchfilter für Push",
548 "set.filterHint": "leer, master oder re:^release/.*",
549 "set.headers": "Header, eine pro Zeile",
550 "set.body": "Body-Vorlage, leer sendet das Ereignis als JSON",
551 "set.ev.push": "Push",
552 "set.ev.mr": "Merge Request",
553 "set.ev.ok": "Pipeline erfolgreich",
554 "set.ev.fail": "Pipeline fehlgeschlagen",
555 "set.ev.release": "Release veröffentlicht",
556 "set.saveWebhook": "Webhook speichern",
557 "logo.file": "Logo",
558 "logo.hint": "PNG, JPEG, GIF oder SVG. Größer als 512×512 wird verkleinert.",
559 "acct.hint": "Für Git über HTTPS: dein Benutzername und ein Token als Passwort.",
560 "acct.tokens": "Zugriffstoken",
561 "acct.tokenName": "Name, zum Beispiel Laptop",
562 "acct.newToken": "Neues Token",
563 "acct.revoke": "Widerrufen",
564 "acct.ssh": "SSH-Schlüssel",
565 "acct.keyName": "Name",
566 "acct.pubkey": "Öffentlicher Schlüssel",
567 "acct.add": "Hinzufügen",
568 "acct.remove": "Entfernen",
569 "acct.export": "Daten herunterladen (JSON)",
570 "acct.language": "Sprache",
571 "setup.choose": "Speicher wählen",
572 "setup.pathTitle": "Speicherpfad",
573 "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",
574 "setup.free": "Freier Speicher: %s von %s.",
575 "setup.disk": "Pfad auf der Festplatte",
576 "setup.rules": "Der Pfad muss existieren, beschreibbar sein und mindestens %s frei haben.",
577 "flash.saved": "Gespeichert",
578 "flash.memberSaved": "Mitglied gespeichert",
579 "flash.memberRemoved": "Mitglied entfernt",
580 "flash.branchOn": "Branch geschützt",
581 "flash.patternOff": "Muster entfernt",
582 "flash.secretSaved": "Geheimnis gespeichert",
583 "flash.secretRemoved": "Geheimnis entfernt",
584 "flash.webhookSaved": "Webhook gespeichert",
585 "flash.webhookRemoved": "Webhook entfernt",
586 "flash.repoDeleted": "Repository gelöscht",
587 "flash.tokenCreated": "Token erstellt. Kopiere es jetzt; es wird nicht erneut angezeigt.",
588 "flash.tokenRevoked": "Token widerrufen",
589 "flash.sshAdded": "Schlüssel hinzugefügt",
590 "flash.sshRemoved": "Schlüssel entfernt",
591 "flash.pipeline": "Pipeline gestartet",
592 "flash.language": "Sprache gespeichert",
593 "flash.logo": "Logo gespeichert",
594 "flash.star": "Stern aktualisiert",
595 "err.forbidden": "kein Zugriff",
596 "err.rights": "Rechte nicht lesbar",
597 "err.badForm": "ungültiges Formular",
598 "err.badCSRF": "ungültiges Formular, lade die Seite neu",
599 "err.groupMissing": "Gruppe nicht gefunden",
600 "err.gitInit": "git init: %s",
601 "err.confirmDelete": "tippe den Repositorynamen, um zu löschen",
602 "err.tokenMissing": "Token nicht gefunden",
603 "err.sshBad": "das ist kein öffentlicher OpenSSH-Schlüssel",
604 "err.sshMissing": "Schlüssel nicht gefunden",
605 "err.pickEvent": "wähle mindestens ein Ereignis",
606 "err.preset": "unbekannte Vorlage",
607 "err.header": "Header muss 'Name: Wert' sein",
608 "err.noStorageAdmin": "Du darfst den Speicher nicht einrichten.",
609 "err.storageSave": "Der Pfad konnte nicht gespeichert werden.",
610 "err.storageSame": "Wähle das Verzeichnis für die Repositories.",
611 "err.storageSet": "Speicher gesetzt auf %s. %s frei.",
612 "err.storageMoved": "Speicherpfad geändert zu %s. Vorhandene Daten wurden nicht verschoben. %s frei.",
613 "err.noStorage": "Der Speicher ist noch nicht eingerichtet. Ein Administrator wählt einen Pfad in der Weboberfläche.",
614 "err.logoType": "verwende PNG, JPEG, GIF oder SVG",
615 "err.logoBig": "die Datei ist zu groß",
616 "err.logoSVG": "dieses SVG wird nicht akzeptiert",
617 "err.logoStore": "das Logo konnte nicht gespeichert werden",
618 "err.logoRead": "das Logo konnte nicht gelesen werden",
619 "err.userName": "Benutzername %q ist hier nicht verwendbar",
620 "err.groupPath": "Gruppenpfad %q ist nicht verwendbar",
621 "err.repoName": "Repositoryname %q ist nicht verwendbar",
622 "err.slug": "der Name ist nicht verwendbar",
623 "err.tag": "Tag %q ist nicht verwendbar",
624 "err.tagChar": "Tag %q enthält ein verbotenes Zeichen",
625 "err.groupNeedsName": "die Gruppe braucht einen Namen",
626 "err.pathUser": "Pfad %s ist bereits ein Benutzer",
627 "err.pathGroup": "Pfad %s ist bereits eine Gruppe",
628 "err.ownerKind": "Eigentümer muss user oder group sein",
629 "err.visibility": "Sichtbarkeit muss public oder private sein",
630 "err.userGroupClash": "es gibt bereits eine Gruppe %s; persönliche Repositories wären dann nicht erreichbar",
631 "err.repoExists": "es gibt bereits ein Repository %s",
632 "err.scope": "Bereich muss repo oder group sein",
633 "err.pattern": "Muster %q ist nicht verwendbar",
634 "err.emptyValue": "der Wert ist leer",
635 "err.userTaken": "Benutzername %s ist bereits vergeben",
636 "err.tokenNeedsName": "gib dem Token einen Namen",
637 "err.sshDup": "dieser Schlüssel ist bereits registriert",
638 "err.notFound": "nicht gefunden",
639 "err.noteEmpty": "ein Kommentar ist leer",
640 "err.mrTitle": "ein Merge Request braucht einen Titel",
641 "err.tagExists": "Tag %s existiert bereits",
642 "err.roleMissing": "Rolle fehlt",
643 "err.roleUnknown": "unbekannte Rolle %q",
644 "err.hook.nowrite": "keine Schreibrechte auf %s",
645 "err.hook.branch": "ungültiger Branch %q",
646 "err.hook.protected": "Branch %s ist geschützt; nur ein Betreuer darf ihn ändern",
647 "err.hook.empty": "leerer Push",
648 "err.secretLen": "der Geheimnisname muss 1 bis 80 Zeichen haben",
649 "err.secretForm": "Geheimnisname %q muss [A-Z][A-Z0-9_]* entsprechen",
650 "err.mergeConflict": "Zusammenführen fehlgeschlagen, es gibt einen Konflikt oder der Branch fehlt",
651 "err.targetBranch": "Zielbranch %s: %s",
652 "err.pathMissing": "Pfad fehlt",
653 "err.pathNewline": "Pfad enthält einen Zeilenumbruch",
654 "err.pathAbsolute": "Pfad muss absolut sein",
655 "err.pathAbsent": "Pfad existiert nicht",
656 "err.pathRead": "Pfad nicht lesbar: %s",
657 "err.pathDir": "Pfad ist kein Verzeichnis",
658 "err.pathFree": "freier Speicher nicht ermittelbar: %s",
659 "err.pathWrite": "Pfad ist nicht beschreibbar",
660 "err.pathSpace": "zu wenig freier Speicher: %s frei, mindestens %s",
661 "err.whFilter": "branchfilter: %s",
662 "err.whEvent": "unbekanntes Ereignis %q",
663 "err.whTemplate": "nicht geschlossenes {{ in der Vorlage",
664 "err.whSecret": "Geheimnis %s existiert nicht",
665 "err.whField": "unbekanntes Feld event.%s",
666 "err.whPlaceholder": "unbekannter Platzhalter %q",
667 "err.whURL": "Webhook-URL ist ungültig",
668 "err.whScheme": "Webhook-URL muss http oder https sein",
669 "err.whHost": "Webhook-Host fehlt",
670 "err.whBlockedIP": "%s liegt in einem gesperrten Bereich",
671 "err.whDNS": "DNS für %s: %s",
672 "err.whNoAddr": "keine Adresse für %s",
673 "err.whBlockedHost": "%s zeigt auf %s in einem gesperrten Bereich",
674 "err.whRedirects": "zu viele Weiterleitungen",
675 "err.whRedirectHost": "Weiterleitung zu einem anderen Host mit dem ursprünglichen Body wurde abgelehnt",
676 "flash.welcome": "Willkommen, %s",
677 "flash.repoCreated": "Repository erstellt",
678 "flash.groupCreated": "Gruppe erstellt",
679 "flash.mrOpened": "Merge-Request geöffnet",
680 "flash.note": "Kommentar veröffentlicht",
681 "flash.merged": "Zusammengeführt",
682 "flash.closed": "Geschlossen",
683 "hook.push": "%s hat nach %s in %s gepusht",
684 "hook.mr": "Merge-Request !%s geöffnet: %s",
685 "hook.release": "Release %s von %s veröffentlicht",
686 "err.session": "Sitzung",
687 "err.oauth": "Anmeldung fehlgeschlagen: %s",
688 "err.oauthFail": "Anmeldung fehlgeschlagen",
689 "err.oauthState": "ungültiger Anmeldestatus",
690 "err.branchMissing": "Branch nicht gefunden",
691 "err.branches": "wähle zwei verschiedene Branches",
692 "err.targetAccess": "kein Zugriff auf den Zielbranch",
693 "err.commitMissing": "Commit ist nicht in diesem Repository",
694 "err.artifactMissing": "Artefakt nicht gefunden: %s %s",
695 "err.noWrite": "kein Schreibzugriff",
696 "err.noRead": "kein Lesezugriff",
697 "err.overview": "Übersicht",
698 "err.tokenAbsent": "Token fehlt",
699 "err.tokenBad": "Token ungültig",
700 "err.jobToken": "Job-Token ungültig",
701 "err.onlyAdmin": "nur ein Maintainer",
702 "err.commitAbsent": "Commit fehlt",
703 "err.assetsJob": "Assets gehören zu einem Job-Token",
704 "err.assetName": "Assetname",
705 "err.assetDisk": "Artefakt fehlt auf der Festplatte",
706 "err.assetCopy": "Asset konnte nicht kopiert werden",
707 "err.tagFail": "Tag: %s",
708 "err.json": "json",
709}
710
711var fr = map[string]string{
712 "nav.dashboard": "Aperçu",
713 "nav.new": "Nouveau",
714 "nav.storage": "Stockage",
715 "nav.signout": "Se déconnecter",
716 "nav.signin": "Se connecter",
717 "action.save": "Enregistrer",
718 "action.copy": "Copier",
719 "action.copied": "Copié",
720 "action.remove": "Retirer",
721 "action.open": "Ouvrir",
722 "action.close": "Fermer",
723 "action.merge": "Fusionner",
724 "action.start": "Démarrer",
725 "action.protect": "Protéger",
726 "action.post": "Publier",
727 "home.lead": "Connecte-toi pour voir les dépôts.",
728 "home.public": "Dépôts publics",
729 "home.storage": "Le stockage n’est pas encore configuré. Les dépôts sont temporairement indisponibles.",
730 "dash.repos": "Dépôts",
731 "dash.groups": "Groupes",
732 "dash.noRepos": "Pas encore de dépôts.",
733 "dash.noGroups": "Pas encore de groupes.",
734 "heat.title": "Activité",
735 "heat.less": "Moins",
736 "heat.more": "Plus",
737 "heat.note": "Commits, merge requests et commentaires.",
738 "heat.mon": "L",
739 "heat.wed": "M",
740 "heat.fri": "V",
741 "heat.none.year": "Aucune contribution au cours des 12 derniers mois",
742 "heat.one.year": "1 contribution au cours des 12 derniers mois",
743 "heat.many.year": "%d contributions au cours des 12 derniers mois",
744 "heat.none.day": "Aucune contribution le %s",
745 "heat.one.day": "1 contribution le %s",
746 "heat.many.day": "%d contributions le %s",
747 "month.1": "janvier",
748 "month.2": "février",
749 "month.3": "mars",
750 "month.4": "avril",
751 "month.5": "mai",
752 "month.6": "juin",
753 "month.7": "juillet",
754 "month.8": "août",
755 "month.9": "septembre",
756 "month.10": "octobre",
757 "month.11": "novembre",
758 "month.12": "décembre",
759 "month.s.1": "janv.",
760 "month.s.2": "févr.",
761 "month.s.3": "mars",
762 "month.s.4": "avr.",
763 "month.s.5": "mai",
764 "month.s.6": "juin",
765 "month.s.7": "juil.",
766 "month.s.8": "août",
767 "month.s.9": "sept.",
768 "month.s.10": "oct.",
769 "month.s.11": "nov.",
770 "month.s.12": "déc.",
771 "ago.just": "à l’instant",
772 "ago.minute": "il y a 1 minute",
773 "ago.minutes": "il y a %d minutes",
774 "ago.hour": "il y a 1 heure",
775 "ago.hours": "il y a %d heures",
776 "ago.day": "il y a 1 jour",
777 "ago.days": "il y a %d jours",
778 "ago.week": "il y a 1 semaine",
779 "ago.weeks": "il y a %d semaines",
780 "ago.month": "il y a 1 mois",
781 "ago.months": "il y a %d mois",
782 "ago.year": "il y a 1 an",
783 "ago.years": "il y a %d ans",
784 "title.new": "Nouveau",
785 "title.account": "Compte",
786 "title.storage": "Stockage",
787 "title.commits": "Commits",
788 "title.branches": "Branches",
789 "title.mrs": "Merge requests",
790 "title.pipelines": "Pipelines",
791 "title.pipeline": "Pipeline",
792 "title.releases": "Versions",
793 "title.tags": "Tags",
794 "title.settings": "Paramètres",
795 "new.group": "Nouveau groupe",
796 "new.repo": "Nouveau dépôt",
797 "new.name": "Nom",
798 "new.description": "Description",
799 "new.owner": "Propriétaire",
800 "new.me": "Moi",
801 "new.visibility": "Visibilité",
802 "new.role": "Rôle par défaut",
803 "new.roleHint": "Rôle des membres dans les nouveaux dépôts de ce groupe.",
804 "slug.bad": "Ce nom ne convient pas.",
805 "slug.free": "Disponible",
806 "slug.taken": "Pris",
807 "role.readonly": "Lecture seule",
808 "role.developer": "Développeur",
809 "role.maintainer": "Mainteneur",
810 "role.": "Aucun",
811 "vis.public": "Public",
812 "vis.private": "Privé",
813 "vis.protected": "Protégé",
814 "group.tab.repos": "Dépôts",
815 "group.tab.members": "Membres",
816 "group.tab.settings": "Paramètres",
817 "group.search": "Rechercher",
818 "group.sort": "Nom",
819 "group.direction": "Sens du tri",
820 "group.created": "Créé le %s",
821 "group.empty": "Pas encore de dépôts.",
822 "group.menu": "Menu",
823 "group.star": "Étoile",
824 "group.unstar": "Retirer l’étoile",
825 "group.secretsNote": "Uniquement les secrets de ce groupe.",
826 "group.defaultRole": "Rôle par défaut pour les nouveaux dépôts",
827 "tab.overview": "Aperçu",
828 "tab.files": "Fichiers",
829 "tab.commits": "Commits",
830 "tab.branches": "Branches",
831 "tab.mrs": "Merge requests",
832 "tab.pipelines": "Pipelines",
833 "tab.releases": "Versions",
834 "tab.settings": "Paramètres",
835 "repo.searchFile": "Chercher un fichier",
836 "repo.code": "Code",
837 "repo.ssh": "SSH",
838 "repo.https": "HTTPS",
839 "repo.cloneHint": "Nom d’utilisateur et un jeton comme mot de passe.",
840 "repo.name": "Nom",
841 "repo.lastCommit": "Dernier commit",
842 "repo.lastChange": "Dernière modification",
843 "repo.emptyDir": "Ce dossier est vide.",
844 "repo.noCommits": "Pas encore de commits.",
845 "repo.project": "Informations du projet",
846 "repo.created": "Créé le %s",
847 "repo.history": "Historique",
848 "repo.files": "Fichiers",
849 "repo.binary": "Fichier binaire.",
850 "repo.noTags": "Pas encore de tags.",
851 "repo.noBranches": "Pas encore de branches.",
852 "count.commit.one": "%d commit",
853 "count.commit.many": "%d commits",
854 "count.branch.one": "%d branche",
855 "count.branch.many": "%d branches",
856 "count.tag.one": "%d tag",
857 "count.tag.many": "%d tags",
858 "count.release.one": "%d version",
859 "count.release.many": "%d versions",
860 "mr.title": "Merge requests",
861 "mr.none": "Aucune merge request.",
862 "mr.new": "Nouveau",
863 "mr.titleField": "Titre",
864 "mr.description": "Description",
865 "mr.source": "Source",
866 "mr.target": "Cible",
867 "mr.commits": "Commits",
868 "mr.noDiff": "aucun commit avant la branche cible, ou la branche manque",
869 "mr.comments": "Commentaires",
870 "mr.noComments": "Pas encore de commentaires.",
871 "mr.comment": "Commentaire",
872 "pipe.title": "Pipelines",
873 "pipe.ref": "branche, vide pour la branche par défaut",
874 "pipe.none": "Pas encore de pipelines. Ajoute blue-ci-cd.yml à la racine.",
875 "pipe.one": "Pipeline",
876 "rel.none": "Pas encore de versions.",
877 "rel.bytes": "octets",
878 "set.onlyAdmin": "Seul un mainteneur modifie les paramètres, les secrets et les webhooks. Ton rôle : %s.",
879 "set.general": "Général",
880 "set.members": "Membres",
881 "set.branches": "Branches",
882 "set.secrets": "Secrets",
883 "set.webhooks": "Webhooks",
884 "set.username": "nom d’utilisateur",
885 "set.pending": "en attente de la première connexion",
886 "set.pattern": "master ou release/*",
887 "set.protectHint": "Les développeurs ne peuvent pas pousser vers ces branches.",
888 "set.secretName": "Nom",
889 "set.secretValue": "Valeur",
890 "set.protectedOnly": "N’envoyer que sur une branche protégée",
891 "set.valuesHidden": "Les valeurs ne sont pas réaffichées.",
892 "set.delete": "Supprimer",
893 "set.typeName": "Saisis %s",
894 "set.deleteRepo": "Supprimer le dépôt",
895 "set.whName": "Nom",
896 "set.preset": "Modèle",
897 "set.preset.generic": "JSON générique",
898 "set.preset.discord": "Discord",
899 "set.preset.grok": "Grok Bot",
900 "set.url": "URL",
901 "set.branchFilter": "Filtre de branche pour le push",
902 "set.filterHint": "vide, master, ou re:^release/.*",
903 "set.headers": "En-têtes, un par ligne",
904 "set.body": "Modèle du corps, vide envoie l’événement en JSON",
905 "set.ev.push": "push",
906 "set.ev.mr": "merge request",
907 "set.ev.ok": "pipeline réussie",
908 "set.ev.fail": "pipeline échouée",
909 "set.ev.release": "version publiée",
910 "set.saveWebhook": "Enregistrer le webhook",
911 "logo.file": "Logo",
912 "logo.hint": "PNG, JPEG, GIF ou SVG. Au-delà de 512×512, l’image est réduite.",
913 "acct.hint": "Pour git en HTTPS : ton nom d’utilisateur et un jeton comme mot de passe.",
914 "acct.tokens": "Jetons d’accès",
915 "acct.tokenName": "nom, par exemple ordinateur",
916 "acct.newToken": "Nouveau jeton",
917 "acct.revoke": "Révoquer",
918 "acct.ssh": "Clés SSH",
919 "acct.keyName": "Nom",
920 "acct.pubkey": "Clé publique",
921 "acct.add": "Ajouter",
922 "acct.remove": "Supprimer",
923 "acct.export": "Télécharger tes données (JSON)",
924 "acct.language": "Langue",
925 "setup.choose": "Choisir le stockage",
926 "setup.pathTitle": "Chemin de stockage",
927 "setup.changeWarn": "Changer le chemin ne déplace ni les dépôts, ni les artefacts, ni les versions.",
928 "setup.free": "Espace libre : %s sur %s.",
929 "setup.disk": "Chemin sur le disque",
930 "setup.rules": "Le chemin doit exister, être accessible en écriture et avoir au moins %s de libre.",
931 "flash.saved": "Enregistré",
932 "flash.memberSaved": "Membre enregistré",
933 "flash.memberRemoved": "Membre retiré",
934 "flash.branchOn": "Branche protégée",
935 "flash.patternOff": "Motif retiré",
936 "flash.secretSaved": "Secret enregistré",
937 "flash.secretRemoved": "Secret supprimé",
938 "flash.webhookSaved": "Webhook enregistré",
939 "flash.webhookRemoved": "Webhook supprimé",
940 "flash.repoDeleted": "Dépôt supprimé",
941 "flash.tokenCreated": "Jeton créé. Copie-le maintenant ; il ne sera plus affiché.",
942 "flash.tokenRevoked": "Jeton révoqué",
943 "flash.sshAdded": "Clé ajoutée",
944 "flash.sshRemoved": "Clé supprimée",
945 "flash.pipeline": "Pipeline démarrée",
946 "flash.language": "Langue enregistrée",
947 "flash.logo": "Logo enregistré",
948 "flash.star": "Étoile mise à jour",
949 "err.forbidden": "accès refusé",
950 "err.rights": "impossible de lire les droits",
951 "err.badForm": "formulaire invalide",
952 "err.badCSRF": "formulaire invalide, recharge la page",
953 "err.groupMissing": "groupe introuvable",
954 "err.gitInit": "git init : %s",
955 "err.confirmDelete": "saisis le nom du dépôt pour le supprimer",
956 "err.tokenMissing": "jeton introuvable",
957 "err.sshBad": "ce n’est pas une clé publique OpenSSH",
958 "err.sshMissing": "clé introuvable",
959 "err.pickEvent": "choisis au moins un événement",
960 "err.preset": "modèle inconnu",
961 "err.header": "un en-tête doit ressembler à Nom : valeur",
962 "err.noStorageAdmin": "Tu ne peux pas configurer le stockage.",
963 "err.storageSave": "Le chemin n’a pas pu être enregistré.",
964 "err.storageSame": "Choisis le dossier des dépôts.",
965 "err.storageSet": "Stockage défini sur %s. %s libres.",
966 "err.storageMoved": "Chemin de stockage changé pour %s. Les données existantes n’ont pas été déplacées. %s libres.",
967 "err.noStorage": "Le stockage n’est pas encore configuré. Un administrateur choisit un chemin dans l’interface.",
968 "err.logoType": "utilise un PNG, JPEG, GIF ou SVG",
969 "err.logoBig": "le fichier est trop grand",
970 "err.logoSVG": "ce SVG n’est pas accepté",
971 "err.logoStore": "le logo n’a pas pu être enregistré",
972 "err.logoRead": "le logo n’a pas pu être lu",
973 "err.userName": "le nom d’utilisateur %q n’est pas utilisable ici",
974 "err.groupPath": "le chemin de groupe %q n’est pas utilisable",
975 "err.repoName": "le nom de dépôt %q n’est pas utilisable",
976 "err.slug": "le nom n’est pas utilisable",
977 "err.tag": "le tag %q n’est pas utilisable",
978 "err.tagChar": "le tag %q contient un caractère interdit",
979 "err.groupNeedsName": "le groupe a besoin d’un nom",
980 "err.pathUser": "le chemin %s est déjà un utilisateur",
981 "err.pathGroup": "le chemin %s est déjà un groupe",
982 "err.ownerKind": "le propriétaire doit être user ou group",
983 "err.visibility": "la visibilité doit être public ou private",
984 "err.userGroupClash": "un groupe %s existe déjà ; les dépôts personnels seraient alors inaccessibles",
985 "err.repoExists": "le dépôt %s existe déjà",
986 "err.scope": "la portée doit être repo ou group",
987 "err.pattern": "le motif %q n’est pas utilisable",
988 "err.emptyValue": "la valeur est vide",
989 "err.userTaken": "le nom d’utilisateur %s est déjà utilisé",
990 "err.tokenNeedsName": "donne un nom au jeton",
991 "err.sshDup": "cette clé est déjà enregistrée",
992 "err.notFound": "introuvable",
993 "err.noteEmpty": "un commentaire est vide",
994 "err.mrTitle": "une merge request a besoin d’un titre",
995 "err.tagExists": "le tag %s existe déjà",
996 "err.roleMissing": "le rôle manque",
997 "err.roleUnknown": "rôle inconnu %q",
998 "err.hook.nowrite": "pas de droit d’écriture sur %s",
999 "err.hook.branch": "branche invalide %q",
1000 "err.hook.protected": "la branche %s est protégée ; seul un mainteneur peut la modifier",
1001 "err.hook.empty": "push vide",
1002 "err.secretLen": "le nom du secret doit faire de 1 à 80 caractères",
1003 "err.secretForm": "le nom de secret %q doit correspondre à [A-Z][A-Z0-9_]*",
1004 "err.mergeConflict": "la fusion a échoué, il y a un conflit ou la branche manque",
1005 "err.targetBranch": "branche cible %s : %s",
1006 "err.pathMissing": "chemin manquant",
1007 "err.pathNewline": "le chemin contient un saut de ligne",
1008 "err.pathAbsolute": "le chemin doit être absolu",
1009 "err.pathAbsent": "le chemin n’existe pas",
1010 "err.pathRead": "chemin illisible : %s",
1011 "err.pathDir": "le chemin n’est pas un dossier",
1012 "err.pathFree": "espace libre indéterminable : %s",
1013 "err.pathWrite": "le chemin n’est pas accessible en écriture",
1014 "err.pathSpace": "pas assez d’espace libre : %s libres, au moins %s",
1015 "err.whFilter": "branchfilter : %s",
1016 "err.whEvent": "événement inconnu %q",
1017 "err.whTemplate": "{{ non fermé dans le modèle",
1018 "err.whSecret": "le secret %s n’existe pas",
1019 "err.whField": "champ inconnu event.%s",
1020 "err.whPlaceholder": "espace réservé inconnu %q",
1021 "err.whURL": "l’URL du webhook est invalide",
1022 "err.whScheme": "l’URL du webhook doit être http ou https",
1023 "err.whHost": "l’hôte du webhook manque",
1024 "err.whBlockedIP": "%s est dans une plage bloquée",
1025 "err.whDNS": "dns pour %s : %s",
1026 "err.whNoAddr": "pas d’adresse pour %s",
1027 "err.whBlockedHost": "%s pointe vers %s dans une plage bloquée",
1028 "err.whRedirects": "trop de redirections",
1029 "err.whRedirectHost": "une redirection vers un autre hôte avec le corps d’origine a été refusée",
1030 "flash.welcome": "Bienvenue, %s",
1031 "flash.repoCreated": "Dépôt créé",
1032 "flash.groupCreated": "Groupe créé",
1033 "flash.mrOpened": "Merge request ouverte",
1034 "flash.note": "Commentaire publié",
1035 "flash.merged": "Fusionné",
1036 "flash.closed": "Fermé",
1037 "hook.push": "%s a poussé vers %s dans %s",
1038 "hook.mr": "merge request !%s ouverte : %s",
1039 "hook.release": "version %s de %s publiée",
1040 "err.session": "session",
1041 "err.oauth": "Connexion échouée : %s",
1042 "err.oauthFail": "La connexion a échoué",
1043 "err.oauthState": "état de connexion invalide",
1044 "err.branchMissing": "branche introuvable",
1045 "err.branches": "choisissez deux branches différentes",
1046 "err.targetAccess": "pas d’accès à la branche cible",
1047 "err.commitMissing": "le commit n’est pas dans ce dépôt",
1048 "err.artifactMissing": "artefact introuvable : %s %s",
1049 "err.noWrite": "pas de droit d’écriture",
1050 "err.noRead": "pas de droit de lecture",
1051 "err.overview": "aperçu",
1052 "err.tokenAbsent": "jeton manquant",
1053 "err.tokenBad": "jeton invalide",
1054 "err.jobToken": "jeton de job invalide",
1055 "err.onlyAdmin": "seul un mainteneur",
1056 "err.commitAbsent": "commit manquant",
1057 "err.assetsJob": "les artefacts appartiennent à un jeton de job",
1058 "err.assetName": "nom d’artefact",
1059 "err.assetDisk": "artefact absent du disque",
1060 "err.assetCopy": "impossible de copier l’artefact",
1061 "err.tagFail": "tag : %s",
1062 "err.json": "json",
1063}
internal/i18n/cuneiform.go added +234 −0
@@ -0,0 +1,234 @@
1 package i18n
2
3 import "strings"
4
5 // Transliterate writes English phonetically in Sumero-Akkadian
6 // cuneiform (Unicode U+12000). Digits and punctuation stay, so a
7 // sentence keeps its shape. The spelling is syllabic: consonants
8 // without a following vowel take an inherent a, o is written u,
9 // and there is no separate sign for f, v or o.
10 func Transliterate(s string) string {
11 var b strings.Builder
12 word := strings.Builder{}
13 flush := func() {
14 if word.Len() == 0 {
15 return
16 }
17 b.WriteString(encodeWord(word.String()))
18 word.Reset()
19 }
20 for _, r := range s {
21 if isLetter(r) || r == '\'' {
22 word.WriteRune(r)
23 continue
24 }
25 flush()
26 b.WriteRune(r)
27 }
28 flush()
29 return b.String()
30 }
31
32 func isLetter(r rune) bool {
33 return (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z')
34 }
35
36 func encodeWord(raw string) string {
37 ph := phonemes(raw)
38 if len(ph) == 0 {
39 return ""
40 }
41 var out []rune
42 i := 0
43 for i < len(ph) {
44 if i+2 < len(ph) && isC(ph[i]) && isV(ph[i+1]) && isC(ph[i+2]) && (i+3 == len(ph) || isC(ph[i+3])) {
45 if sign, ok := signs[ph[i]+ph[i+1]+ph[i+2]]; ok {
46 out = append(out, sign)
47 i += 3
48 continue
49 }
50 }
51 if i+1 < len(ph) && isC(ph[i]) && isV(ph[i+1]) {
52 if sign, ok := cv(ph[i], ph[i+1]); ok {
53 out = append(out, sign)
54 i += 2
55 continue
56 }
57 }
58 if i+1 < len(ph) && isV(ph[i]) && isC(ph[i+1]) && (i+2 == len(ph) || isC(ph[i+2])) {
59 if sign, ok := signs[ph[i]+ph[i+1]]; ok {
60 out = append(out, sign)
61 i += 2
62 continue
63 }
64 }
65 if isV(ph[i]) {
66 if sign, ok := signs[ph[i]]; ok {
67 out = append(out, sign)
68 }
69 i++
70 continue
71 }
72 if sign, ok := cv(ph[i], "a"); ok {
73 out = append(out, sign)
74 }
75 i++
76 }
77 return string(out)
78 }
79
80 func cv(c, v string) (rune, bool) {
81 if v == "e" {
82 if sign, ok := signs[c+"e"]; ok {
83 return sign, true
84 }
85 if sign, ok := signs[c+"i"]; ok {
86 return sign, true
87 }
88 }
89 sign, ok := signs[c+v]
90 return sign, ok
91 }
92
93 func isC(s string) bool { return s != "a" && s != "e" && s != "i" && s != "u" }
94 func isV(s string) bool { return !isC(s) }
95
96 func phonemes(raw string) []string {
97 s := strings.ToLower(raw)
98 var out []string
99 for i := 0; i < len(s); i++ {
100 if i+1 < len(s) {
101 switch s[i : i+2] {
102 case "qu":
103 out = append(out, "k", "w")
104 i++
105 continue
106 case "ck":
107 out = append(out, "k")
108 i++
109 continue
110 case "ph":
111 out = append(out, "p")
112 i++
113 continue
114 case "th":
115 out = append(out, "t")
116 i++
117 continue
118 case "sh":
119 out = append(out, "š")
120 i++
121 continue
122 case "ch":
123 out = append(out, "š")
124 i++
125 continue
126 case "wh":
127 out = append(out, "w")
128 i++
129 continue
130 case "ng":
131 out = append(out, "n")
132 i++
133 continue
134 case "ee", "ea":
135 out = append(out, "i")
136 i++
137 continue
138 case "oo", "ou":
139 out = append(out, "u")
140 i++
141 continue
142 case "ai", "ay":
143 out = append(out, "e")
144 i++
145 continue
146 }
147 }
148 c := s[i]
149 switch c {
150 case 'a', 'e', 'i', 'u':
151 out = append(out, string(c))
152 case 'o':
153 out = append(out, "u")
154 case 'y':
155 if i == 0 || isVowelByte(s[i-1]) {
156 out = append(out, "y")
157 } else {
158 out = append(out, "i")
159 }
160 case 'c':
161 if i+1 < len(s) && (s[i+1] == 'e' || s[i+1] == 'i' || s[i+1] == 'y') {
162 out = append(out, "s")
163 } else {
164 out = append(out, "k")
165 }
166 case 'f':
167 out = append(out, "p")
168 case 'v':
169 out = append(out, "b")
170 case 'j':
171 out = append(out, "y")
172 case 'q':
173 out = append(out, "k")
174 case 'x':
175 out = append(out, "k", "s")
176 case 'b', 'd', 'g', 'h', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'w', 'z':
177 out = append(out, string(c))
178 }
179 }
180 compact := out[:0]
181 for _, p := range out {
182 if len(compact) > 0 && compact[len(compact)-1] == p && isC(p) {
183 continue
184 }
185 compact = append(compact, p)
186 }
187 return compact
188 }
189
190 func isVowelByte(c byte) bool {
191 return c == 'a' || c == 'e' || c == 'i' || c == 'o' || c == 'u' || c == 'y'
192 }
193
194 // signs maps a conventional Akkadian reading to one sign.
195 // pu is written with BU, and w+vowel with PI, which are the usual values.
196 var signs = map[string]rune{
197 "a": '𒀀', "e": '𒂊', "i": '𒄿', "u": '𒌋',
198 "ba": '𒁀', "bi": '𒁉', "bu": '𒁍', "pu": '𒁍',
199 "da": '𒁕', "di": '𒁲', "du": '𒁺',
200 "ga": '𒂵', "gi": '𒄀', "gu": '𒄖',
201 "ha": '𒄩', "hi": '𒄭', "hu": '𒄷',
202 "ka": '𒅗', "ki": '𒆠', "ku": '𒆪',
203 "la": '𒆷', "li": '𒇷', "lu": '𒇻',
204 "ma": '𒈠', "me": '𒈨', "mi": '𒈪', "mu": '𒈬',
205 "na": '𒈾', "ne": '𒉈', "ni": '𒉌', "nu": '𒉡',
206 "pa": '𒉺', "pi": '𒉿',
207 "ra": '𒊏', "ri": '𒊑', "ru": '𒊒',
208 "sa": '𒊓', "si": '𒋛', "su": '𒋢',
209 "ša": '𒊭', "še": '𒊺', "ši": '𒅆', "šu": '𒋗',
210 "ta": '𒋫', "te": '𒋼', "ti": '𒋾', "tu": '𒌅',
211 "wa": '𒉿', "we": '𒉿', "wi": '𒉿', "wu": '𒉿',
212 "ya": '𒅀', "za": '𒍝', "zi": '𒍣', "zu": '𒍪',
213 "ab": '𒀊', "ad": '𒀜', "ak": '𒀝', "al": '𒀠', "an": '𒀭', "aš": '𒀸',
214 "el": '𒂖', "en": '𒂗', "eš": '𒂠',
215 "ib": '𒅁', "ig": '𒅅', "il": '𒅋', "im": '𒅎', "in": '𒅔', "ir": '𒅕', "iš": '𒅖',
216 "ub": '𒌒', "ud": '𒌓', "um": '𒌝', "un": '𒌦', "ur": '𒌨', "uš": '𒍑',
217 "bad": '𒁁', "bal": '𒁄', "bar": '𒁇',
218 "dag": '𒁖', "dam": '𒁮', "dar": '𒁯',
219 "dib": '𒁳', "dim": '𒁴', "din": '𒁷',
220 "dub": '𒁾', "dug": '𒂁', "dun": '𒂄',
221 "gal": '𒃲', "gam": '𒃵', "gan": '𒃶', "gar": '𒃻',
222 "gul": '𒄢', "gur": '𒄥',
223 "hal": '𒄬',
224 "kal": '𒆗', "kin": '𒆥', "kul": '𒆰', "kur": '𒆳',
225 "lal": '𒇲', "lam": '𒇴', "lum": '𒈝',
226 "mar": '𒈥',
227 "nam": '𒉆', "nun": '𒉣',
228 "pad": '𒉻', "pap": '𒉽',
229 "rab": '𒊐',
230 "sag": '𒊕', "sar": '𒊬',
231 "tab": '𒋰', "tag": '𒋳', "tar": '𒋻',
232 "tum": '𒌈', "tur": '𒌉',
233 "zag": '𒍠',
234 }
@@ -0,0 +1,234 @@
1package i18n
2
3import "strings"
4
5// Transliterate writes English phonetically in Sumero-Akkadian
6// cuneiform (Unicode U+12000). Digits and punctuation stay, so a
7// sentence keeps its shape. The spelling is syllabic: consonants
8// without a following vowel take an inherent a, o is written u,
9// and there is no separate sign for f, v or o.
10func Transliterate(s string) string {
11 var b strings.Builder
12 word := strings.Builder{}
13 flush := func() {
14 if word.Len() == 0 {
15 return
16 }
17 b.WriteString(encodeWord(word.String()))
18 word.Reset()
19 }
20 for _, r := range s {
21 if isLetter(r) || r == '\'' {
22 word.WriteRune(r)
23 continue
24 }
25 flush()
26 b.WriteRune(r)
27 }
28 flush()
29 return b.String()
30}
31
32func isLetter(r rune) bool {
33 return (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z')
34}
35
36func encodeWord(raw string) string {
37 ph := phonemes(raw)
38 if len(ph) == 0 {
39 return ""
40 }
41 var out []rune
42 i := 0
43 for i < len(ph) {
44 if i+2 < len(ph) && isC(ph[i]) && isV(ph[i+1]) && isC(ph[i+2]) && (i+3 == len(ph) || isC(ph[i+3])) {
45 if sign, ok := signs[ph[i]+ph[i+1]+ph[i+2]]; ok {
46 out = append(out, sign)
47 i += 3
48 continue
49 }
50 }
51 if i+1 < len(ph) && isC(ph[i]) && isV(ph[i+1]) {
52 if sign, ok := cv(ph[i], ph[i+1]); ok {
53 out = append(out, sign)
54 i += 2
55 continue
56 }
57 }
58 if i+1 < len(ph) && isV(ph[i]) && isC(ph[i+1]) && (i+2 == len(ph) || isC(ph[i+2])) {
59 if sign, ok := signs[ph[i]+ph[i+1]]; ok {
60 out = append(out, sign)
61 i += 2
62 continue
63 }
64 }
65 if isV(ph[i]) {
66 if sign, ok := signs[ph[i]]; ok {
67 out = append(out, sign)
68 }
69 i++
70 continue
71 }
72 if sign, ok := cv(ph[i], "a"); ok {
73 out = append(out, sign)
74 }
75 i++
76 }
77 return string(out)
78}
79
80func cv(c, v string) (rune, bool) {
81 if v == "e" {
82 if sign, ok := signs[c+"e"]; ok {
83 return sign, true
84 }
85 if sign, ok := signs[c+"i"]; ok {
86 return sign, true
87 }
88 }
89 sign, ok := signs[c+v]
90 return sign, ok
91}
92
93func isC(s string) bool { return s != "a" && s != "e" && s != "i" && s != "u" }
94func isV(s string) bool { return !isC(s) }
95
96func phonemes(raw string) []string {
97 s := strings.ToLower(raw)
98 var out []string
99 for i := 0; i < len(s); i++ {
100 if i+1 < len(s) {
101 switch s[i : i+2] {
102 case "qu":
103 out = append(out, "k", "w")
104 i++
105 continue
106 case "ck":
107 out = append(out, "k")
108 i++
109 continue
110 case "ph":
111 out = append(out, "p")
112 i++
113 continue
114 case "th":
115 out = append(out, "t")
116 i++
117 continue
118 case "sh":
119 out = append(out, "š")
120 i++
121 continue
122 case "ch":
123 out = append(out, "š")
124 i++
125 continue
126 case "wh":
127 out = append(out, "w")
128 i++
129 continue
130 case "ng":
131 out = append(out, "n")
132 i++
133 continue
134 case "ee", "ea":
135 out = append(out, "i")
136 i++
137 continue
138 case "oo", "ou":
139 out = append(out, "u")
140 i++
141 continue
142 case "ai", "ay":
143 out = append(out, "e")
144 i++
145 continue
146 }
147 }
148 c := s[i]
149 switch c {
150 case 'a', 'e', 'i', 'u':
151 out = append(out, string(c))
152 case 'o':
153 out = append(out, "u")
154 case 'y':
155 if i == 0 || isVowelByte(s[i-1]) {
156 out = append(out, "y")
157 } else {
158 out = append(out, "i")
159 }
160 case 'c':
161 if i+1 < len(s) && (s[i+1] == 'e' || s[i+1] == 'i' || s[i+1] == 'y') {
162 out = append(out, "s")
163 } else {
164 out = append(out, "k")
165 }
166 case 'f':
167 out = append(out, "p")
168 case 'v':
169 out = append(out, "b")
170 case 'j':
171 out = append(out, "y")
172 case 'q':
173 out = append(out, "k")
174 case 'x':
175 out = append(out, "k", "s")
176 case 'b', 'd', 'g', 'h', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'w', 'z':
177 out = append(out, string(c))
178 }
179 }
180 compact := out[:0]
181 for _, p := range out {
182 if len(compact) > 0 && compact[len(compact)-1] == p && isC(p) {
183 continue
184 }
185 compact = append(compact, p)
186 }
187 return compact
188}
189
190func isVowelByte(c byte) bool {
191 return c == 'a' || c == 'e' || c == 'i' || c == 'o' || c == 'u' || c == 'y'
192}
193
194// signs maps a conventional Akkadian reading to one sign.
195// pu is written with BU, and w+vowel with PI, which are the usual values.
196var signs = map[string]rune{
197 "a": '𒀀', "e": '𒂊', "i": '𒄿', "u": '𒌋',
198 "ba": '𒁀', "bi": '𒁉', "bu": '𒁍', "pu": '𒁍',
199 "da": '𒁕', "di": '𒁲', "du": '𒁺',
200 "ga": '𒂵', "gi": '𒄀', "gu": '𒄖',
201 "ha": '𒄩', "hi": '𒄭', "hu": '𒄷',
202 "ka": '𒅗', "ki": '𒆠', "ku": '𒆪',
203 "la": '𒆷', "li": '𒇷', "lu": '𒇻',
204 "ma": '𒈠', "me": '𒈨', "mi": '𒈪', "mu": '𒈬',
205 "na": '𒈾', "ne": '𒉈', "ni": '𒉌', "nu": '𒉡',
206 "pa": '𒉺', "pi": '𒉿',
207 "ra": '𒊏', "ri": '𒊑', "ru": '𒊒',
208 "sa": '𒊓', "si": '𒋛', "su": '𒋢',
209 "ša": '𒊭', "še": '𒊺', "ši": '𒅆', "šu": '𒋗',
210 "ta": '𒋫', "te": '𒋼', "ti": '𒋾', "tu": '𒌅',
211 "wa": '𒉿', "we": '𒉿', "wi": '𒉿', "wu": '𒉿',
212 "ya": '𒅀', "za": '𒍝', "zi": '𒍣', "zu": '𒍪',
213 "ab": '𒀊', "ad": '𒀜', "ak": '𒀝', "al": '𒀠', "an": '𒀭', "aš": '𒀸',
214 "el": '𒂖', "en": '𒂗', "eš": '𒂠',
215 "ib": '𒅁', "ig": '𒅅', "il": '𒅋', "im": '𒅎', "in": '𒅔', "ir": '𒅕', "iš": '𒅖',
216 "ub": '𒌒', "ud": '𒌓', "um": '𒌝', "un": '𒌦', "ur": '𒌨', "uš": '𒍑',
217 "bad": '𒁁', "bal": '𒁄', "bar": '𒁇',
218 "dag": '𒁖', "dam": '𒁮', "dar": '𒁯',
219 "dib": '𒁳', "dim": '𒁴', "din": '𒁷',
220 "dub": '𒁾', "dug": '𒂁', "dun": '𒂄',
221 "gal": '𒃲', "gam": '𒃵', "gan": '𒃶', "gar": '𒃻',
222 "gul": '𒄢', "gur": '𒄥',
223 "hal": '𒄬',
224 "kal": '𒆗', "kin": '𒆥', "kul": '𒆰', "kur": '𒆳',
225 "lal": '𒇲', "lam": '𒇴', "lum": '𒈝',
226 "mar": '𒈥',
227 "nam": '𒉆', "nun": '𒉣',
228 "pad": '𒉻', "pap": '𒉽',
229 "rab": '𒊐',
230 "sag": '𒊕', "sar": '𒊬',
231 "tab": '𒋰', "tag": '𒋳', "tar": '𒋻',
232 "tum": '𒌈', "tur": '𒌉',
233 "zag": '𒍠',
234}
internal/i18n/i18n.go added +207 −0
@@ -0,0 +1,207 @@
1 // Package i18n is the language catalog for the web interface.
2 // English is the source text. Nederlands, Deutsch and Français are
3 // translations. Cuneiform is the English text written phonetically
4 // with Sumero-Akkadian signs.
5 package i18n
6
7 import (
8 "errors"
9 "fmt"
10 "strings"
11 "time"
12 )
13
14 // Lang is a choice stored on the user.
15 type Lang string
16
17 const (
18 EN Lang = "en"
19 NL Lang = "nl"
20 DE Lang = "de"
21 FR Lang = "fr"
22 Cuneiform Lang = "cuneiform"
23 )
24
25 // All is the order shown in the account settings.
26 func All() []Lang { return []Lang{EN, NL, DE, FR, Cuneiform} }
27
28 // Name is the label of the language in the picker.
29 // These stay in their own script so a cuneiform page can still be left.
30 func (l Lang) Name() string {
31 switch l {
32 case NL:
33 return "Nederlands"
34 case DE:
35 return "Deutsch"
36 case FR:
37 return "Français"
38 case Cuneiform:
39 return "Cuneiform"
40 default:
41 return "English"
42 }
43 }
44
45 // Parse accepts the five languages. Anything else is English.
46 func Parse(s string) Lang {
47 switch Lang(strings.ToLower(strings.TrimSpace(s))) {
48 case NL, DE, FR, Cuneiform:
49 return Lang(strings.ToLower(strings.TrimSpace(s)))
50 default:
51 return EN
52 }
53 }
54
55 // Error is a user-visible failure identified by a catalog key.
56 type Error struct {
57 Key string
58 Args []any
59 }
60
61 func (e Error) Error() string { return T(EN, e.Key, e.Args...) }
62
63 // E builds a translatable error.
64 func E(key string, args ...any) error { return Error{Key: key, Args: args} }
65
66 // Text renders err in lang. Unknown errors stay as they are.
67 func Text(lang Lang, err error) string {
68 if err == nil {
69 return ""
70 }
71 var e Error
72 if errors.As(err, &e) {
73 return T(lang, e.Key, e.Args...)
74 }
75 return err.Error()
76 }
77
78 // T looks up key and formats it. A missing translation falls back to English,
79 // then to the key itself. Cuneiform is the formatted English, written in signs.
80 func T(lang Lang, key string, args ...any) string {
81 msg := lookup(lang, key)
82 if lang == Cuneiform {
83 msg = lookup(EN, key)
84 }
85 out := msg
86 if len(args) > 0 {
87 out = fmt.Sprintf(msg, args...)
88 }
89 if lang == Cuneiform {
90 return Transliterate(out)
91 }
92 return out
93 }
94
95 func lookup(lang Lang, key string) string {
96 if lang != EN && lang != Cuneiform {
97 if m, ok := catalogs[lang][key]; ok && m != "" {
98 return m
99 }
100 }
101 if m, ok := catalogs[EN][key]; ok {
102 return m
103 }
104 return key
105 }
106
107 // FormatDate is "2 January 2006" in the active language.
108 func FormatDate(lang Lang, t time.Time) string {
109 if t.IsZero() {
110 return ""
111 }
112 month := T(lang, fmt.Sprintf("month.%d", int(t.Month())))
113 return fmt.Sprintf("%d %s %d", t.Day(), month, t.Year())
114 }
115
116 // MonthShort is the heatmap label, such as "Oct".
117 func MonthShort(lang Lang, m time.Month) string {
118 return T(lang, fmt.Sprintf("month.s.%d", int(m)))
119 }
120
121 // Ago is a short relative time.
122 func Ago(lang Lang, unix int64) string {
123 if unix <= 0 {
124 return ""
125 }
126 d := time.Since(time.Unix(unix, 0))
127 if d < time.Minute {
128 return T(lang, "ago.just")
129 }
130 if d < time.Hour {
131 n := int(d.Minutes())
132 if n < 1 {
133 n = 1
134 }
135 if n == 1 {
136 return T(lang, "ago.minute")
137 }
138 return T(lang, "ago.minutes", n)
139 }
140 if d < 24*time.Hour {
141 n := int(d.Hours())
142 if n < 1 {
143 n = 1
144 }
145 if n == 1 {
146 return T(lang, "ago.hour")
147 }
148 return T(lang, "ago.hours", n)
149 }
150 days := int(d.Hours() / 24)
151 if days < 1 {
152 days = 1
153 }
154 if days == 1 {
155 return T(lang, "ago.day")
156 }
157 if days < 14 {
158 return T(lang, "ago.days", days)
159 }
160 if days < 60 {
161 n := days / 7
162 if n < 1 {
163 n = 1
164 }
165 if n == 1 {
166 return T(lang, "ago.week")
167 }
168 return T(lang, "ago.weeks", n)
169 }
170 if days < 365 {
171 n := days / 30
172 if n < 1 {
173 n = 1
174 }
175 if n == 1 {
176 return T(lang, "ago.month")
177 }
178 return T(lang, "ago.months", n)
179 }
180 n := days / 365
181 if n < 1 {
182 n = 1
183 }
184 if n == 1 {
185 return T(lang, "ago.year")
186 }
187 return T(lang, "ago.years", n)
188 }
189
190 // Contrib is the heatmap sentence. year is the twelve-month total;
191 // otherwise date is the long date of one cell.
192 func Contrib(lang Lang, n int, date string, year bool) string {
193 switch {
194 case year && n <= 0:
195 return T(lang, "heat.none.year")
196 case year && n == 1:
197 return T(lang, "heat.one.year")
198 case year:
199 return T(lang, "heat.many.year", n)
200 case n <= 0:
201 return T(lang, "heat.none.day", date)
202 case n == 1:
203 return T(lang, "heat.one.day", date)
204 default:
205 return T(lang, "heat.many.day", n, date)
206 }
207 }
@@ -0,0 +1,207 @@
1// Package i18n is the language catalog for the web interface.
2// English is the source text. Nederlands, Deutsch and Français are
3// translations. Cuneiform is the English text written phonetically
4// with Sumero-Akkadian signs.
5package i18n
6
7import (
8 "errors"
9 "fmt"
10 "strings"
11 "time"
12)
13
14// Lang is a choice stored on the user.
15type Lang string
16
17const (
18 EN Lang = "en"
19 NL Lang = "nl"
20 DE Lang = "de"
21 FR Lang = "fr"
22 Cuneiform Lang = "cuneiform"
23)
24
25// All is the order shown in the account settings.
26func All() []Lang { return []Lang{EN, NL, DE, FR, Cuneiform} }
27
28// Name is the label of the language in the picker.
29// These stay in their own script so a cuneiform page can still be left.
30func (l Lang) Name() string {
31 switch l {
32 case NL:
33 return "Nederlands"
34 case DE:
35 return "Deutsch"
36 case FR:
37 return "Français"
38 case Cuneiform:
39 return "Cuneiform"
40 default:
41 return "English"
42 }
43}
44
45// Parse accepts the five languages. Anything else is English.
46func Parse(s string) Lang {
47 switch Lang(strings.ToLower(strings.TrimSpace(s))) {
48 case NL, DE, FR, Cuneiform:
49 return Lang(strings.ToLower(strings.TrimSpace(s)))
50 default:
51 return EN
52 }
53}
54
55// Error is a user-visible failure identified by a catalog key.
56type Error struct {
57 Key string
58 Args []any
59}
60
61func (e Error) Error() string { return T(EN, e.Key, e.Args...) }
62
63// E builds a translatable error.
64func E(key string, args ...any) error { return Error{Key: key, Args: args} }
65
66// Text renders err in lang. Unknown errors stay as they are.
67func Text(lang Lang, err error) string {
68 if err == nil {
69 return ""
70 }
71 var e Error
72 if errors.As(err, &e) {
73 return T(lang, e.Key, e.Args...)
74 }
75 return err.Error()
76}
77
78// T looks up key and formats it. A missing translation falls back to English,
79// then to the key itself. Cuneiform is the formatted English, written in signs.
80func T(lang Lang, key string, args ...any) string {
81 msg := lookup(lang, key)
82 if lang == Cuneiform {
83 msg = lookup(EN, key)
84 }
85 out := msg
86 if len(args) > 0 {
87 out = fmt.Sprintf(msg, args...)
88 }
89 if lang == Cuneiform {
90 return Transliterate(out)
91 }
92 return out
93}
94
95func lookup(lang Lang, key string) string {
96 if lang != EN && lang != Cuneiform {
97 if m, ok := catalogs[lang][key]; ok && m != "" {
98 return m
99 }
100 }
101 if m, ok := catalogs[EN][key]; ok {
102 return m
103 }
104 return key
105}
106
107// FormatDate is "2 January 2006" in the active language.
108func FormatDate(lang Lang, t time.Time) string {
109 if t.IsZero() {
110 return ""
111 }
112 month := T(lang, fmt.Sprintf("month.%d", int(t.Month())))
113 return fmt.Sprintf("%d %s %d", t.Day(), month, t.Year())
114}
115
116// MonthShort is the heatmap label, such as "Oct".
117func MonthShort(lang Lang, m time.Month) string {
118 return T(lang, fmt.Sprintf("month.s.%d", int(m)))
119}
120
121// Ago is a short relative time.
122func Ago(lang Lang, unix int64) string {
123 if unix <= 0 {
124 return ""
125 }
126 d := time.Since(time.Unix(unix, 0))
127 if d < time.Minute {
128 return T(lang, "ago.just")
129 }
130 if d < time.Hour {
131 n := int(d.Minutes())
132 if n < 1 {
133 n = 1
134 }
135 if n == 1 {
136 return T(lang, "ago.minute")
137 }
138 return T(lang, "ago.minutes", n)
139 }
140 if d < 24*time.Hour {
141 n := int(d.Hours())
142 if n < 1 {
143 n = 1
144 }
145 if n == 1 {
146 return T(lang, "ago.hour")
147 }
148 return T(lang, "ago.hours", n)
149 }
150 days := int(d.Hours() / 24)
151 if days < 1 {
152 days = 1
153 }
154 if days == 1 {
155 return T(lang, "ago.day")
156 }
157 if days < 14 {
158 return T(lang, "ago.days", days)
159 }
160 if days < 60 {
161 n := days / 7
162 if n < 1 {
163 n = 1
164 }
165 if n == 1 {
166 return T(lang, "ago.week")
167 }
168 return T(lang, "ago.weeks", n)
169 }
170 if days < 365 {
171 n := days / 30
172 if n < 1 {
173 n = 1
174 }
175 if n == 1 {
176 return T(lang, "ago.month")
177 }
178 return T(lang, "ago.months", n)
179 }
180 n := days / 365
181 if n < 1 {
182 n = 1
183 }
184 if n == 1 {
185 return T(lang, "ago.year")
186 }
187 return T(lang, "ago.years", n)
188}
189
190// Contrib is the heatmap sentence. year is the twelve-month total;
191// otherwise date is the long date of one cell.
192func Contrib(lang Lang, n int, date string, year bool) string {
193 switch {
194 case year && n <= 0:
195 return T(lang, "heat.none.year")
196 case year && n == 1:
197 return T(lang, "heat.one.year")
198 case year:
199 return T(lang, "heat.many.year", n)
200 case n <= 0:
201 return T(lang, "heat.none.day", date)
202 case n == 1:
203 return T(lang, "heat.one.day", date)
204 default:
205 return T(lang, "heat.many.day", n, date)
206 }
207}
internal/i18n/i18n_test.go added +62 −0
@@ -0,0 +1,62 @@
1 package i18n
2
3 import (
4 "strings"
5 "testing"
6 "unicode/utf8"
7 )
8
9 func TestCatalogsMatch(t *testing.T) {
10 for _, lang := range []Lang{NL, DE, FR} {
11 for key := range en {
12 if catalogs[lang][key] == "" {
13 t.Errorf("%s mist %s", lang, key)
14 }
15 }
16 if len(catalogs[lang]) != len(en) {
17 t.Errorf("%s heeft %d sleutels, engels %d", lang, len(catalogs[lang]), len(en))
18 }
19 }
20 }
21
22 func TestCuneiformIsSigns(t *testing.T) {
23 got := T(Cuneiform, "nav.dashboard")
24 if got == "" || got == "Overview" {
25 t.Fatal(got)
26 }
27 for _, r := range got {
28 if r < 0x12000 || r > 0x123FF {
29 t.Fatalf("geen spijkerschrift %q in %s", string(r), got)
30 }
31 }
32 phrase := T(Cuneiform, "heat.many.year", 5)
33 if !strings.Contains(phrase, "5") || !strings.Contains(phrase, " ") {
34 t.Fatalf("cijfers blijven: %s", phrase)
35 }
36 for _, r := range phrase {
37 if r == ' ' || (r >= '0' && r <= '9') {
38 continue
39 }
40 if r < 0x12000 || r > 0x123FF {
41 t.Fatalf("teken %U %q in %s", r, string(r), phrase)
42 }
43 }
44 if utf8.RuneCountInString(Transliterate("a")) != 1 || Transliterate("a") != "𒀀" {
45 t.Fatalf("a = %q", Transliterate("a"))
46 }
47 }
48
49 func TestFallback(t *testing.T) {
50 if T(NL, "nav.dashboard") != "Overzicht" {
51 t.Fatal(T(NL, "nav.dashboard"))
52 }
53 if T(DE, "nav.signin") != "Anmelden" {
54 t.Fatal(T(DE, "nav.signin"))
55 }
56 if T(FR, "acct.language") != "Langue" {
57 t.Fatal(T(FR, "acct.language"))
58 }
59 if Parse("nope") != EN || Parse(" NL ") != NL {
60 t.Fatal(Parse("nope"), Parse(" NL "))
61 }
62 }
@@ -0,0 +1,62 @@
1package i18n
2
3import (
4 "strings"
5 "testing"
6 "unicode/utf8"
7)
8
9func TestCatalogsMatch(t *testing.T) {
10 for _, lang := range []Lang{NL, DE, FR} {
11 for key := range en {
12 if catalogs[lang][key] == "" {
13 t.Errorf("%s mist %s", lang, key)
14 }
15 }
16 if len(catalogs[lang]) != len(en) {
17 t.Errorf("%s heeft %d sleutels, engels %d", lang, len(catalogs[lang]), len(en))
18 }
19 }
20}
21
22func TestCuneiformIsSigns(t *testing.T) {
23 got := T(Cuneiform, "nav.dashboard")
24 if got == "" || got == "Overview" {
25 t.Fatal(got)
26 }
27 for _, r := range got {
28 if r < 0x12000 || r > 0x123FF {
29 t.Fatalf("geen spijkerschrift %q in %s", string(r), got)
30 }
31 }
32 phrase := T(Cuneiform, "heat.many.year", 5)
33 if !strings.Contains(phrase, "5") || !strings.Contains(phrase, " ") {
34 t.Fatalf("cijfers blijven: %s", phrase)
35 }
36 for _, r := range phrase {
37 if r == ' ' || (r >= '0' && r <= '9') {
38 continue
39 }
40 if r < 0x12000 || r > 0x123FF {
41 t.Fatalf("teken %U %q in %s", r, string(r), phrase)
42 }
43 }
44 if utf8.RuneCountInString(Transliterate("a")) != 1 || Transliterate("a") != "𒀀" {
45 t.Fatalf("a = %q", Transliterate("a"))
46 }
47}
48
49func TestFallback(t *testing.T) {
50 if T(NL, "nav.dashboard") != "Overzicht" {
51 t.Fatal(T(NL, "nav.dashboard"))
52 }
53 if T(DE, "nav.signin") != "Anmelden" {
54 t.Fatal(T(DE, "nav.signin"))
55 }
56 if T(FR, "acct.language") != "Langue" {
57 t.Fatal(T(FR, "acct.language"))
58 }
59 if Parse("nope") != EN || Parse(" NL ") != NL {
60 t.Fatal(Parse("nope"), Parse(" NL "))
61 }
62}
internal/logo/logo.go added +187 −0
@@ -0,0 +1,187 @@
1 // Package logo normalizes an uploaded group or repository logo.
2 // Raster images larger than 512×512 are scaled down, keeping the
3 // aspect ratio. SVG is kept as text when it is small and has no script.
4 package logo
5
6 import (
7 "bytes"
8 "encoding/xml"
9 "fmt"
10 "image"
11 "image/color"
12 _ "image/gif"
13 _ "image/jpeg"
14 "image/png"
15 "io"
16 "math"
17 "strings"
18
19 "gitlab.com/Timfa/bluegit/internal/i18n"
20 )
21
22 const (
23 MaxEdge = 512
24 MaxSVG = 256 << 10
25 MaxUpload = 2 << 20
26 )
27
28 // Normalize returns bytes and a content type ready to store.
29 func Normalize(in []byte) ([]byte, string, error) {
30 if len(in) == 0 || len(in) > MaxUpload {
31 return nil, "", i18n.E("err.logoBig")
32 }
33 if looksSVG(in) {
34 if len(in) > MaxSVG {
35 return nil, "", i18n.E("err.logoBig")
36 }
37 if err := vetSVG(in); err != nil {
38 return nil, "", err
39 }
40 return in, "image/svg+xml", nil
41 }
42 img, _, err := image.Decode(bytes.NewReader(in))
43 if err != nil {
44 return nil, "", i18n.E("err.logoType")
45 }
46 b := img.Bounds()
47 w, h := b.Dx(), b.Dy()
48 if w < 1 || h < 1 {
49 return nil, "", i18n.E("err.logoType")
50 }
51 nw, nh := fit(w, h)
52 var src image.Image = img
53 if nw != w || nh != h {
54 src = scale(img, nw, nh)
55 }
56 var buf bytes.Buffer
57 if err := png.Encode(&buf, src); err != nil {
58 return nil, "", i18n.E("err.logoStore")
59 }
60 return buf.Bytes(), "image/png", nil
61 }
62
63 func fit(w, h int) (int, int) {
64 if w <= MaxEdge && h <= MaxEdge {
65 return w, h
66 }
67 s := float64(MaxEdge) / float64(w)
68 if float64(h)*s > MaxEdge {
69 s = float64(MaxEdge) / float64(h)
70 }
71 nw := int(math.Round(float64(w) * s))
72 nh := int(math.Round(float64(h) * s))
73 if nw < 1 {
74 nw = 1
75 }
76 if nh < 1 {
77 nh = 1
78 }
79 if nw > MaxEdge {
80 nw = MaxEdge
81 }
82 if nh > MaxEdge {
83 nh = MaxEdge
84 }
85 return nw, nh
86 }
87
88 func scale(src image.Image, nw, nh int) *image.NRGBA {
89 dst := image.NewNRGBA(image.Rect(0, 0, nw, nh))
90 sb := src.Bounds()
91 sw, sh := float64(sb.Dx()), float64(sb.Dy())
92 for y := 0; y < nh; y++ {
93 sy := (float64(y)+0.5)*sh/float64(nh) - 0.5
94 for x := 0; x < nw; x++ {
95 sx := (float64(x)+0.5)*sw/float64(nw) - 0.5
96 dst.SetNRGBA(x, y, bilinear(src, sb, sx, sy))
97 }
98 }
99 return dst
100 }
101
102 func bilinear(src image.Image, b image.Rectangle, x, y float64) color.NRGBA {
103 x0 := int(math.Floor(x))
104 y0 := int(math.Floor(y))
105 fx := x - float64(x0)
106 fy := y - float64(y0)
107 c00 := nrgbaAt(src, b, x0, y0)
108 c10 := nrgbaAt(src, b, x0+1, y0)
109 c01 := nrgbaAt(src, b, x0, y0+1)
110 c11 := nrgbaAt(src, b, x0+1, y0+1)
111 mix := func(a, b, c, d uint8) uint8 {
112 top := float64(a)*(1-fx) + float64(b)*fx
113 bot := float64(c)*(1-fx) + float64(d)*fx
114 return uint8(math.Round(top*(1-fy) + bot*fy))
115 }
116 return color.NRGBA{
117 R: mix(c00.R, c10.R, c01.R, c11.R),
118 G: mix(c00.G, c10.G, c01.G, c11.G),
119 B: mix(c00.B, c10.B, c01.B, c11.B),
120 A: mix(c00.A, c10.A, c01.A, c11.A),
121 }
122 }
123
124 func nrgbaAt(src image.Image, b image.Rectangle, x, y int) color.NRGBA {
125 if x < b.Min.X {
126 x = b.Min.X
127 }
128 if y < b.Min.Y {
129 y = b.Min.Y
130 }
131 if x >= b.Max.X {
132 x = b.Max.X - 1
133 }
134 if y >= b.Max.Y {
135 y = b.Max.Y - 1
136 }
137 r, g, bl, a := src.At(x, y).RGBA()
138 return color.NRGBA{R: uint8(r >> 8), G: uint8(g >> 8), B: uint8(bl >> 8), A: uint8(a >> 8)}
139 }
140
141 func looksSVG(in []byte) bool {
142 s := strings.ToLower(strings.TrimSpace(string(in)))
143 return strings.HasPrefix(s, "<svg") || strings.HasPrefix(s, "<?xml") || strings.HasPrefix(s, "<!doctype")
144 }
145
146 func vetSVG(in []byte) error {
147 low := strings.ToLower(string(in))
148 if !strings.Contains(low, "<svg") {
149 return i18n.E("err.logoType")
150 }
151 for _, bad := range []string{"<script", "foreignobject", "onload", "onerror", "javascript:", "<iframe", "<object", "<embed"} {
152 if strings.Contains(low, bad) {
153 return i18n.E("err.logoSVG")
154 }
155 }
156 dec := xml.NewDecoder(bytes.NewReader(in))
157 saw := false
158 for {
159 tok, err := dec.Token()
160 if err == io.EOF {
161 break
162 }
163 if err != nil {
164 return i18n.E("err.logoSVG")
165 }
166 se, ok := tok.(xml.StartElement)
167 if !ok {
168 continue
169 }
170 if strings.EqualFold(se.Name.Local, "svg") {
171 saw = true
172 }
173 }
174 if !saw {
175 return i18n.E("err.logoType")
176 }
177 return nil
178 }
179
180 // SizeOf decodes a PNG or other raster and returns its pixel size.
181 func SizeOf(in []byte) (int, int, error) {
182 cfg, _, err := image.DecodeConfig(bytes.NewReader(in))
183 if err != nil {
184 return 0, 0, fmt.Errorf("decode: %w", err)
185 }
186 return cfg.Width, cfg.Height, nil
187 }
@@ -0,0 +1,187 @@
1// Package logo normalizes an uploaded group or repository logo.
2// Raster images larger than 512×512 are scaled down, keeping the
3// aspect ratio. SVG is kept as text when it is small and has no script.
4package logo
5
6import (
7 "bytes"
8 "encoding/xml"
9 "fmt"
10 "image"
11 "image/color"
12 _ "image/gif"
13 _ "image/jpeg"
14 "image/png"
15 "io"
16 "math"
17 "strings"
18
19 "gitlab.com/Timfa/bluegit/internal/i18n"
20)
21
22const (
23 MaxEdge = 512
24 MaxSVG = 256 << 10
25 MaxUpload = 2 << 20
26)
27
28// Normalize returns bytes and a content type ready to store.
29func Normalize(in []byte) ([]byte, string, error) {
30 if len(in) == 0 || len(in) > MaxUpload {
31 return nil, "", i18n.E("err.logoBig")
32 }
33 if looksSVG(in) {
34 if len(in) > MaxSVG {
35 return nil, "", i18n.E("err.logoBig")
36 }
37 if err := vetSVG(in); err != nil {
38 return nil, "", err
39 }
40 return in, "image/svg+xml", nil
41 }
42 img, _, err := image.Decode(bytes.NewReader(in))
43 if err != nil {
44 return nil, "", i18n.E("err.logoType")
45 }
46 b := img.Bounds()
47 w, h := b.Dx(), b.Dy()
48 if w < 1 || h < 1 {
49 return nil, "", i18n.E("err.logoType")
50 }
51 nw, nh := fit(w, h)
52 var src image.Image = img
53 if nw != w || nh != h {
54 src = scale(img, nw, nh)
55 }
56 var buf bytes.Buffer
57 if err := png.Encode(&buf, src); err != nil {
58 return nil, "", i18n.E("err.logoStore")
59 }
60 return buf.Bytes(), "image/png", nil
61}
62
63func fit(w, h int) (int, int) {
64 if w <= MaxEdge && h <= MaxEdge {
65 return w, h
66 }
67 s := float64(MaxEdge) / float64(w)
68 if float64(h)*s > MaxEdge {
69 s = float64(MaxEdge) / float64(h)
70 }
71 nw := int(math.Round(float64(w) * s))
72 nh := int(math.Round(float64(h) * s))
73 if nw < 1 {
74 nw = 1
75 }
76 if nh < 1 {
77 nh = 1
78 }
79 if nw > MaxEdge {
80 nw = MaxEdge
81 }
82 if nh > MaxEdge {
83 nh = MaxEdge
84 }
85 return nw, nh
86}
87
88func scale(src image.Image, nw, nh int) *image.NRGBA {
89 dst := image.NewNRGBA(image.Rect(0, 0, nw, nh))
90 sb := src.Bounds()
91 sw, sh := float64(sb.Dx()), float64(sb.Dy())
92 for y := 0; y < nh; y++ {
93 sy := (float64(y)+0.5)*sh/float64(nh) - 0.5
94 for x := 0; x < nw; x++ {
95 sx := (float64(x)+0.5)*sw/float64(nw) - 0.5
96 dst.SetNRGBA(x, y, bilinear(src, sb, sx, sy))
97 }
98 }
99 return dst
100}
101
102func bilinear(src image.Image, b image.Rectangle, x, y float64) color.NRGBA {
103 x0 := int(math.Floor(x))
104 y0 := int(math.Floor(y))
105 fx := x - float64(x0)
106 fy := y - float64(y0)
107 c00 := nrgbaAt(src, b, x0, y0)
108 c10 := nrgbaAt(src, b, x0+1, y0)
109 c01 := nrgbaAt(src, b, x0, y0+1)
110 c11 := nrgbaAt(src, b, x0+1, y0+1)
111 mix := func(a, b, c, d uint8) uint8 {
112 top := float64(a)*(1-fx) + float64(b)*fx
113 bot := float64(c)*(1-fx) + float64(d)*fx
114 return uint8(math.Round(top*(1-fy) + bot*fy))
115 }
116 return color.NRGBA{
117 R: mix(c00.R, c10.R, c01.R, c11.R),
118 G: mix(c00.G, c10.G, c01.G, c11.G),
119 B: mix(c00.B, c10.B, c01.B, c11.B),
120 A: mix(c00.A, c10.A, c01.A, c11.A),
121 }
122}
123
124func nrgbaAt(src image.Image, b image.Rectangle, x, y int) color.NRGBA {
125 if x < b.Min.X {
126 x = b.Min.X
127 }
128 if y < b.Min.Y {
129 y = b.Min.Y
130 }
131 if x >= b.Max.X {
132 x = b.Max.X - 1
133 }
134 if y >= b.Max.Y {
135 y = b.Max.Y - 1
136 }
137 r, g, bl, a := src.At(x, y).RGBA()
138 return color.NRGBA{R: uint8(r >> 8), G: uint8(g >> 8), B: uint8(bl >> 8), A: uint8(a >> 8)}
139}
140
141func looksSVG(in []byte) bool {
142 s := strings.ToLower(strings.TrimSpace(string(in)))
143 return strings.HasPrefix(s, "<svg") || strings.HasPrefix(s, "<?xml") || strings.HasPrefix(s, "<!doctype")
144}
145
146func vetSVG(in []byte) error {
147 low := strings.ToLower(string(in))
148 if !strings.Contains(low, "<svg") {
149 return i18n.E("err.logoType")
150 }
151 for _, bad := range []string{"<script", "foreignobject", "onload", "onerror", "javascript:", "<iframe", "<object", "<embed"} {
152 if strings.Contains(low, bad) {
153 return i18n.E("err.logoSVG")
154 }
155 }
156 dec := xml.NewDecoder(bytes.NewReader(in))
157 saw := false
158 for {
159 tok, err := dec.Token()
160 if err == io.EOF {
161 break
162 }
163 if err != nil {
164 return i18n.E("err.logoSVG")
165 }
166 se, ok := tok.(xml.StartElement)
167 if !ok {
168 continue
169 }
170 if strings.EqualFold(se.Name.Local, "svg") {
171 saw = true
172 }
173 }
174 if !saw {
175 return i18n.E("err.logoType")
176 }
177 return nil
178}
179
180// SizeOf decodes a PNG or other raster and returns its pixel size.
181func SizeOf(in []byte) (int, int, error) {
182 cfg, _, err := image.DecodeConfig(bytes.NewReader(in))
183 if err != nil {
184 return 0, 0, fmt.Errorf("decode: %w", err)
185 }
186 return cfg.Width, cfg.Height, nil
187}
internal/logo/logo_test.go added +77 −0
@@ -0,0 +1,77 @@
1 package logo
2
3 import (
4 "bytes"
5 "image"
6 "image/color"
7 "image/png"
8 "strings"
9 "testing"
10 )
11
12 func TestScaleKeepsAspect(t *testing.T) {
13 wide := solid(800, 400, color.NRGBA{R: 20, G: 80, B: 200, A: 255})
14 out, mime, err := Normalize(wide)
15 if err != nil {
16 t.Fatal(err)
17 }
18 if mime != "image/png" {
19 t.Fatal(mime)
20 }
21 w, h, err := SizeOf(out)
22 if err != nil {
23 t.Fatal(err)
24 }
25 if w != 512 || h != 256 {
26 t.Fatalf("wide %dx%d", w, h)
27 }
28 tall := solid(100, 600, color.NRGBA{G: 180, A: 255})
29 out, _, err = Normalize(tall)
30 if err != nil {
31 t.Fatal(err)
32 }
33 w, h, err = SizeOf(out)
34 if err != nil {
35 t.Fatal(err)
36 }
37 if h != 512 || w > 512 || w < 80 {
38 t.Fatalf("tall %dx%d", w, h)
39 }
40 small := solid(40, 40, color.NRGBA{B: 255, A: 255})
41 out, _, err = Normalize(small)
42 if err != nil {
43 t.Fatal(err)
44 }
45 w, h, _ = SizeOf(out)
46 if w != 40 || h != 40 {
47 t.Fatalf("small %dx%d", w, h)
48 }
49 }
50
51 func TestSVG(t *testing.T) {
52 ok := []byte(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><circle cx="5" cy="5" r="4" fill="#1f6feb"/></svg>`)
53 out, mime, err := Normalize(ok)
54 if err != nil || mime != "image/svg+xml" || !bytes.Equal(out, ok) {
55 t.Fatalf("%s %v %d", mime, err, len(out))
56 }
57 bad := []byte(`<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>`)
58 if _, _, err := Normalize(bad); err == nil {
59 t.Fatal("script svg")
60 }
61 huge := []byte("<svg xmlns=\"http://www.w3.org/2000/svg\">" + strings.Repeat("a", MaxSVG) + "</svg>")
62 if _, _, err := Normalize(huge); err == nil {
63 t.Fatal("grote svg")
64 }
65 }
66
67 func solid(w, h int, c color.NRGBA) []byte {
68 img := image.NewNRGBA(image.Rect(0, 0, w, h))
69 for y := 0; y < h; y++ {
70 for x := 0; x < w; x++ {
71 img.SetNRGBA(x, y, c)
72 }
73 }
74 var buf bytes.Buffer
75 _ = png.Encode(&buf, img)
76 return buf.Bytes()
77 }
@@ -0,0 +1,77 @@
1package logo
2
3import (
4 "bytes"
5 "image"
6 "image/color"
7 "image/png"
8 "strings"
9 "testing"
10)
11
12func TestScaleKeepsAspect(t *testing.T) {
13 wide := solid(800, 400, color.NRGBA{R: 20, G: 80, B: 200, A: 255})
14 out, mime, err := Normalize(wide)
15 if err != nil {
16 t.Fatal(err)
17 }
18 if mime != "image/png" {
19 t.Fatal(mime)
20 }
21 w, h, err := SizeOf(out)
22 if err != nil {
23 t.Fatal(err)
24 }
25 if w != 512 || h != 256 {
26 t.Fatalf("wide %dx%d", w, h)
27 }
28 tall := solid(100, 600, color.NRGBA{G: 180, A: 255})
29 out, _, err = Normalize(tall)
30 if err != nil {
31 t.Fatal(err)
32 }
33 w, h, err = SizeOf(out)
34 if err != nil {
35 t.Fatal(err)
36 }
37 if h != 512 || w > 512 || w < 80 {
38 t.Fatalf("tall %dx%d", w, h)
39 }
40 small := solid(40, 40, color.NRGBA{B: 255, A: 255})
41 out, _, err = Normalize(small)
42 if err != nil {
43 t.Fatal(err)
44 }
45 w, h, _ = SizeOf(out)
46 if w != 40 || h != 40 {
47 t.Fatalf("small %dx%d", w, h)
48 }
49}
50
51func TestSVG(t *testing.T) {
52 ok := []byte(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10"><circle cx="5" cy="5" r="4" fill="#1f6feb"/></svg>`)
53 out, mime, err := Normalize(ok)
54 if err != nil || mime != "image/svg+xml" || !bytes.Equal(out, ok) {
55 t.Fatalf("%s %v %d", mime, err, len(out))
56 }
57 bad := []byte(`<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>`)
58 if _, _, err := Normalize(bad); err == nil {
59 t.Fatal("script svg")
60 }
61 huge := []byte("<svg xmlns=\"http://www.w3.org/2000/svg\">" + strings.Repeat("a", MaxSVG) + "</svg>")
62 if _, _, err := Normalize(huge); err == nil {
63 t.Fatal("grote svg")
64 }
65}
66
67func solid(w, h int, c color.NRGBA) []byte {
68 img := image.NewNRGBA(image.Rect(0, 0, w, h))
69 for y := 0; y < h; y++ {
70 for x := 0; x < w; x++ {
71 img.SetNRGBA(x, y, c)
72 }
73 }
74 var buf bytes.Buffer
75 _ = png.Encode(&buf, img)
76 return buf.Bytes()
77}
internal/names/names.go +10 −9
@@ -2,9 +2,10 @@
2 2 package names
3 3
4 4 import (
5 "fmt"
6 5 "regexp"
7 6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
8 9 )
9 10
10 11 // Reserved paths botsen met vaste routes van de webinterface.
@@ -24,7 +25,7 @@ var (
24 25 // ValidUsername volgt de auth-server: kleine letters.
25 26 func ValidUsername(s string) error {
26 27 if !userName.MatchString(s) || reserved[s] {
27 return fmt.Errorf("gebruikersnaam %q is hier niet bruikbaar", s)
28 return i18n.E("err.userName", s)
28 29 }
29 30 return nil
30 31 }
@@ -32,7 +33,7 @@ func ValidUsername(s string) error {
32 33 // ValidGroupPath is het pad van een groep in de URL.
33 34 func ValidGroupPath(s string) error {
34 35 if !groupPath.MatchString(s) || reserved[s] {
35 return fmt.Errorf("groepspad %q is niet bruikbaar", s)
36 return i18n.E("err.groupPath", s)
36 37 }
37 38 return nil
38 39 }
@@ -40,7 +41,7 @@ func ValidGroupPath(s string) error {
40 41 // ValidRepoName is de repositorynaam zonder .git.
41 42 func ValidRepoName(s string) error {
42 43 if !repoName.MatchString(s) || strings.HasSuffix(strings.ToLower(s), ".git") || s == "." || s == ".." {
43 return fmt.Errorf("repositorynaam %q is niet bruikbaar", s)
44 return i18n.E("err.repoName", s)
44 45 }
45 46 return nil
46 47 }
@@ -70,14 +71,14 @@ func Slug(kind, raw string) (string, error) {
70 71 switch kind {
71 72 case "repo":
72 73 if err := ValidRepoName(out); err != nil {
73 return "", fmt.Errorf("naam is niet bruikbaar")
74 return "", i18n.E("err.slug")
74 75 }
75 76 case "group":
76 77 if err := ValidGroupPath(out); err != nil {
77 return "", fmt.Errorf("naam is niet bruikbaar")
78 return "", i18n.E("err.slug")
78 79 }
79 80 default:
80 return "", fmt.Errorf("naam is niet bruikbaar")
81 return "", i18n.E("err.slug")
81 82 }
82 83 return out, nil
83 84 }
@@ -104,12 +105,12 @@ func foldLatin(s string) string {
104 105 // ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
105 106 func ValidTag(s string) error {
106 107 if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
107 return fmt.Errorf("tag %q is niet bruikbaar", s)
108 return i18n.E("err.tag", s)
108 109 }
109 110 for _, c := range s {
110 111 ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'
111 112 if !ok {
112 return fmt.Errorf("tag %q bevat een verboden teken", s)
113 return i18n.E("err.tagChar", s)
113 114 }
114 115 }
115 116 return nil
@@ -2,9 +2,10 @@
2package names
2package names
3
3
4import (
4import (
5 "fmt"
6 "regexp"
5 "regexp"
7 "strings"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
8)
9)
9
10
10// Reserved paths botsen met vaste routes van de webinterface.
11// Reserved paths botsen met vaste routes van de webinterface.
@@ -24,7 +25,7 @@ var (
24// ValidUsername volgt de auth-server: kleine letters.
25// ValidUsername volgt de auth-server: kleine letters.
25func ValidUsername(s string) error {
26func ValidUsername(s string) error {
26 if !userName.MatchString(s) || reserved[s] {
27 if !userName.MatchString(s) || reserved[s] {
27 return fmt.Errorf("gebruikersnaam %q is hier niet bruikbaar", s)
28 return i18n.E("err.userName", s)
28 }
29 }
29 return nil
30 return nil
30}
31}
@@ -32,7 +33,7 @@ func ValidUsername(s string) error {
32// ValidGroupPath is het pad van een groep in de URL.
33// ValidGroupPath is het pad van een groep in de URL.
33func ValidGroupPath(s string) error {
34func ValidGroupPath(s string) error {
34 if !groupPath.MatchString(s) || reserved[s] {
35 if !groupPath.MatchString(s) || reserved[s] {
35 return fmt.Errorf("groepspad %q is niet bruikbaar", s)
36 return i18n.E("err.groupPath", s)
36 }
37 }
37 return nil
38 return nil
38}
39}
@@ -40,7 +41,7 @@ func ValidGroupPath(s string) error {
40// ValidRepoName is de repositorynaam zonder .git.
41// ValidRepoName is de repositorynaam zonder .git.
41func ValidRepoName(s string) error {
42func ValidRepoName(s string) error {
42 if !repoName.MatchString(s) || strings.HasSuffix(strings.ToLower(s), ".git") || s == "." || s == ".." {
43 if !repoName.MatchString(s) || strings.HasSuffix(strings.ToLower(s), ".git") || s == "." || s == ".." {
43 return fmt.Errorf("repositorynaam %q is niet bruikbaar", s)
44 return i18n.E("err.repoName", s)
44 }
45 }
45 return nil
46 return nil
46}
47}
@@ -70,14 +71,14 @@ func Slug(kind, raw string) (string, error) {
70 switch kind {
71 switch kind {
71 case "repo":
72 case "repo":
72 if err := ValidRepoName(out); err != nil {
73 if err := ValidRepoName(out); err != nil {
73 return "", fmt.Errorf("naam is niet bruikbaar")
74 return "", i18n.E("err.slug")
74 }
75 }
75 case "group":
76 case "group":
76 if err := ValidGroupPath(out); err != nil {
77 if err := ValidGroupPath(out); err != nil {
77 return "", fmt.Errorf("naam is niet bruikbaar")
78 return "", i18n.E("err.slug")
78 }
79 }
79 default:
80 default:
80 return "", fmt.Errorf("naam is niet bruikbaar")
81 return "", i18n.E("err.slug")
81 }
82 }
82 return out, nil
83 return out, nil
83}
84}
@@ -104,12 +105,12 @@ func foldLatin(s string) string {
104// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
105// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
105func ValidTag(s string) error {
106func ValidTag(s string) error {
106 if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
107 if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
107 return fmt.Errorf("tag %q is niet bruikbaar", s)
108 return i18n.E("err.tag", s)
108 }
109 }
109 for _, c := range s {
110 for _, c := range s {
110 ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'
111 ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'
111 if !ok {
112 if !ok {
112 return fmt.Errorf("tag %q bevat een verboden teken", s)
113 return i18n.E("err.tagChar", s)
113 }
114 }
114 }
115 }
115 return nil
116 return nil
internal/server/activity.go +3 −2
@@ -7,10 +7,11 @@ import (
7 7
8 8 "gitlab.com/Timfa/bluegit/internal/activity"
9 9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
10 11 "gitlab.com/Timfa/bluegit/internal/store"
11 12 )
12 13
13 func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64) *activity.Calendar {
14 func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64, lang i18n.Lang) *activity.Calendar {
14 15 s.syncRepos(ctx, repoIDs)
15 16 loc := activity.Location()
16 17 since := time.Now().In(loc).AddDate(-1, 0, -3)
@@ -21,7 +22,7 @@ func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64) *ac
21 22 counts[ts.In(loc).Format("2006-01-02")]++
22 23 }
23 24 }
24 cal := activity.Build(time.Now(), counts)
25 cal := activity.Build(time.Now(), counts, lang)
25 26 return &cal
26 27 }
27 28
@@ -7,10 +7,11 @@ import (
7
7
8 "gitlab.com/Timfa/bluegit/internal/activity"
8 "gitlab.com/Timfa/bluegit/internal/activity"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/store"
11 "gitlab.com/Timfa/bluegit/internal/store"
11)
12)
12
13
13func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64) *activity.Calendar {
14func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64, lang i18n.Lang) *activity.Calendar {
14 s.syncRepos(ctx, repoIDs)
15 s.syncRepos(ctx, repoIDs)
15 loc := activity.Location()
16 loc := activity.Location()
16 since := time.Now().In(loc).AddDate(-1, 0, -3)
17 since := time.Now().In(loc).AddDate(-1, 0, -3)
@@ -21,7 +22,7 @@ func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64) *ac
21 counts[ts.In(loc).Format("2006-01-02")]++
22 counts[ts.In(loc).Format("2006-01-02")]++
22 }
23 }
23 }
24 }
24 cal := activity.Build(time.Now(), counts)
25 cal := activity.Build(time.Now(), counts, lang)
25 return &cal
26 return &cal
26}
27}
27
28
internal/server/activity_test.go +17 −17
@@ -51,7 +51,7 @@ func TestActivityHeatmap(t *testing.T) {
51 51 t.Fatal(err)
52 52 }
53 53 page = read(t, res)
54 if !strings.Contains(page, "Activiteit") || strings.Index(page, "Activiteit") > strings.Index(page, "<h2>Repositories</h2>") {
54 if !strings.Contains(page, "Activity") || strings.Index(page, "Activity") > strings.Index(page, `class="repolist"`) {
55 55 t.Fatalf("groep zonder heatmap boven de lijst:\n%s", page)
56 56 }
57 57 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
@@ -162,27 +162,27 @@ func TestActivityHeatmap(t *testing.T) {
162 162 }
163 163 dash := read(t, res)
164 164 for _, want := range []string{
165 "Activiteit",
166 "5 bijdragen in de laatste 12 maanden",
167 `title="1 bijdrage op 3 maart 2026"`,
168 `title="1 bijdrage op 5 mei 2026"`,
169 `title="1 bijdrage op 15 mei 2026"`,
165 "Activity",
166 "5 contributions in the last 12 months",
167 `title="1 contribution on 3 March 2026"`,
168 `title="1 contribution on 5 May 2026"`,
169 `title="1 contribution on 15 May 2026"`,
170 170 ">M</span>",
171 171 ">W</span>",
172 172 ">F</span>",
173 "Minder",
174 "Meer",
173 "Less",
174 "More",
175 175 `class="sq lv4"`,
176 "Commits, merge requests en reacties.",
176 "Commits, merge requests and comments.",
177 177 } {
178 178 if !strings.Contains(dash, want) {
179 179 t.Fatalf("dashboard mist %q", want)
180 180 }
181 181 }
182 if strings.Contains(dash, `title="1 bijdrage op 6 juni 2026"`) {
182 if strings.Contains(dash, `title="1 contribution on 6 June 2026"`) {
183 183 t.Fatal("dashboard toont Ada's commit")
184 184 }
185 if strings.Index(dash, "Activiteit") > strings.Index(dash, "<h2>Repositories</h2>") {
185 if strings.Index(dash, "Activity") > strings.Index(dash, "<h2>Repositories</h2>") {
186 186 t.Fatal("heatmap staat onder de repositorylijst")
187 187 }
188 188
@@ -191,7 +191,7 @@ func TestActivityHeatmap(t *testing.T) {
191 191 t.Fatal(err)
192 192 }
193 193 group := read(t, res)
194 if !strings.Contains(group, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(group, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(group, `title="1 bijdrage op 3 maart 2026"`) {
194 if !strings.Contains(group, "5 contributions in the last 12 months") || !strings.Contains(group, `title="1 contribution on 6 June 2026"`) || strings.Contains(group, `title="1 contribution on 3 March 2026"`) {
195 195 t.Fatalf("groep heatmap klopt niet")
196 196 }
197 197
@@ -200,10 +200,10 @@ func TestActivityHeatmap(t *testing.T) {
200 200 t.Fatal(err)
201 201 }
202 202 repoPage := read(t, res)
203 if !strings.Contains(repoPage, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(repoPage, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(repoPage, `title="1 bijdrage op 3 maart 2026"`) {
203 if !strings.Contains(repoPage, "5 contributions in the last 12 months") || !strings.Contains(repoPage, `title="1 contribution on 6 June 2026"`) || strings.Contains(repoPage, `title="1 contribution on 3 March 2026"`) {
204 204 t.Fatalf("repo-heatmap klopt niet")
205 205 }
206 if strings.Index(repoPage, "Activiteit") > strings.Index(repoPage, "Projectinformatie") {
206 if strings.Index(repoPage, "Activity") > strings.Index(repoPage, "Project information") {
207 207 t.Fatal("heatmap staat onder de projectinformatie")
208 208 }
209 209
@@ -220,7 +220,7 @@ func TestActivityHeatmap(t *testing.T) {
220 220 t.Fatal(err)
221 221 }
222 222 adaDash := read(t, res)
223 if !strings.Contains(adaDash, "1 bijdrage in de laatste 12 maanden") || !strings.Contains(adaDash, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 3 maart 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 5 mei 2026"`) {
223 if !strings.Contains(adaDash, "1 contribution in the last 12 months") || !strings.Contains(adaDash, `title="1 contribution on 6 June 2026"`) || strings.Contains(adaDash, `title="1 contribution on 3 March 2026"`) || strings.Contains(adaDash, `title="1 contribution on 5 May 2026"`) {
224 224 t.Fatalf("ada-heatmap klopt niet")
225 225 }
226 226
@@ -250,7 +250,7 @@ func TestActivityHeatmap(t *testing.T) {
250 250 t.Fatal(err)
251 251 }
252 252 pub := read(t, res)
253 if res.StatusCode != 200 || !strings.Contains(pub, "5 bijdragen in de laatste 12 maanden") || strings.Contains(pub, `title="1 bijdrage op 3 maart 2026"`) {
253 if res.StatusCode != 200 || !strings.Contains(pub, "5 contributions in the last 12 months") || strings.Contains(pub, `title="1 contribution on 3 March 2026"`) {
254 254 t.Fatalf("openbaar %d, heatmap klopt niet", res.StatusCode)
255 255 }
256 256
@@ -266,7 +266,7 @@ func TestActivityHeatmap(t *testing.T) {
266 266 t.Fatal(err)
267 267 }
268 268 again := read(t, res)
269 if !strings.Contains(again, `title="1 bijdrage op 5 mei 2026"`) || strings.Contains(again, "5 bijdragen in de laatste 12 maanden") {
269 if !strings.Contains(again, `title="1 contribution on 5 May 2026"`) || strings.Contains(again, "5 contributions in the last 12 months") {
270 270 t.Fatal("bestaande commits zijn niet opnieuw geteld")
271 271 }
272 272 }
@@ -51,7 +51,7 @@ func TestActivityHeatmap(t *testing.T) {
51 t.Fatal(err)
51 t.Fatal(err)
52 }
52 }
53 page = read(t, res)
53 page = read(t, res)
54 if !strings.Contains(page, "Activiteit") || strings.Index(page, "Activiteit") > strings.Index(page, "<h2>Repositories</h2>") {
54 if !strings.Contains(page, "Activity") || strings.Index(page, "Activity") > strings.Index(page, `class="repolist"`) {
55 t.Fatalf("groep zonder heatmap boven de lijst:\n%s", page)
55 t.Fatalf("groep zonder heatmap boven de lijst:\n%s", page)
56 }
56 }
57 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
57 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
@@ -162,27 +162,27 @@ func TestActivityHeatmap(t *testing.T) {
162 }
162 }
163 dash := read(t, res)
163 dash := read(t, res)
164 for _, want := range []string{
164 for _, want := range []string{
165 "Activiteit",
165 "Activity",
166 "5 bijdragen in de laatste 12 maanden",
166 "5 contributions in the last 12 months",
167 `title="1 bijdrage op 3 maart 2026"`,
167 `title="1 contribution on 3 March 2026"`,
168 `title="1 bijdrage op 5 mei 2026"`,
168 `title="1 contribution on 5 May 2026"`,
169 `title="1 bijdrage op 15 mei 2026"`,
169 `title="1 contribution on 15 May 2026"`,
170 ">M</span>",
170 ">M</span>",
171 ">W</span>",
171 ">W</span>",
172 ">F</span>",
172 ">F</span>",
173 "Minder",
173 "Less",
174 "Meer",
174 "More",
175 `class="sq lv4"`,
175 `class="sq lv4"`,
176 "Commits, merge requests en reacties.",
176 "Commits, merge requests and comments.",
177 } {
177 } {
178 if !strings.Contains(dash, want) {
178 if !strings.Contains(dash, want) {
179 t.Fatalf("dashboard mist %q", want)
179 t.Fatalf("dashboard mist %q", want)
180 }
180 }
181 }
181 }
182 if strings.Contains(dash, `title="1 bijdrage op 6 juni 2026"`) {
182 if strings.Contains(dash, `title="1 contribution on 6 June 2026"`) {
183 t.Fatal("dashboard toont Ada's commit")
183 t.Fatal("dashboard toont Ada's commit")
184 }
184 }
185 if strings.Index(dash, "Activiteit") > strings.Index(dash, "<h2>Repositories</h2>") {
185 if strings.Index(dash, "Activity") > strings.Index(dash, "<h2>Repositories</h2>") {
186 t.Fatal("heatmap staat onder de repositorylijst")
186 t.Fatal("heatmap staat onder de repositorylijst")
187 }
187 }
188
188
@@ -191,7 +191,7 @@ func TestActivityHeatmap(t *testing.T) {
191 t.Fatal(err)
191 t.Fatal(err)
192 }
192 }
193 group := read(t, res)
193 group := read(t, res)
194 if !strings.Contains(group, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(group, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(group, `title="1 bijdrage op 3 maart 2026"`) {
194 if !strings.Contains(group, "5 contributions in the last 12 months") || !strings.Contains(group, `title="1 contribution on 6 June 2026"`) || strings.Contains(group, `title="1 contribution on 3 March 2026"`) {
195 t.Fatalf("groep heatmap klopt niet")
195 t.Fatalf("groep heatmap klopt niet")
196 }
196 }
197
197
@@ -200,10 +200,10 @@ func TestActivityHeatmap(t *testing.T) {
200 t.Fatal(err)
200 t.Fatal(err)
201 }
201 }
202 repoPage := read(t, res)
202 repoPage := read(t, res)
203 if !strings.Contains(repoPage, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(repoPage, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(repoPage, `title="1 bijdrage op 3 maart 2026"`) {
203 if !strings.Contains(repoPage, "5 contributions in the last 12 months") || !strings.Contains(repoPage, `title="1 contribution on 6 June 2026"`) || strings.Contains(repoPage, `title="1 contribution on 3 March 2026"`) {
204 t.Fatalf("repo-heatmap klopt niet")
204 t.Fatalf("repo-heatmap klopt niet")
205 }
205 }
206 if strings.Index(repoPage, "Activiteit") > strings.Index(repoPage, "Projectinformatie") {
206 if strings.Index(repoPage, "Activity") > strings.Index(repoPage, "Project information") {
207 t.Fatal("heatmap staat onder de projectinformatie")
207 t.Fatal("heatmap staat onder de projectinformatie")
208 }
208 }
209
209
@@ -220,7 +220,7 @@ func TestActivityHeatmap(t *testing.T) {
220 t.Fatal(err)
220 t.Fatal(err)
221 }
221 }
222 adaDash := read(t, res)
222 adaDash := read(t, res)
223 if !strings.Contains(adaDash, "1 bijdrage in de laatste 12 maanden") || !strings.Contains(adaDash, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 3 maart 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 5 mei 2026"`) {
223 if !strings.Contains(adaDash, "1 contribution in the last 12 months") || !strings.Contains(adaDash, `title="1 contribution on 6 June 2026"`) || strings.Contains(adaDash, `title="1 contribution on 3 March 2026"`) || strings.Contains(adaDash, `title="1 contribution on 5 May 2026"`) {
224 t.Fatalf("ada-heatmap klopt niet")
224 t.Fatalf("ada-heatmap klopt niet")
225 }
225 }
226
226
@@ -250,7 +250,7 @@ func TestActivityHeatmap(t *testing.T) {
250 t.Fatal(err)
250 t.Fatal(err)
251 }
251 }
252 pub := read(t, res)
252 pub := read(t, res)
253 if res.StatusCode != 200 || !strings.Contains(pub, "5 bijdragen in de laatste 12 maanden") || strings.Contains(pub, `title="1 bijdrage op 3 maart 2026"`) {
253 if res.StatusCode != 200 || !strings.Contains(pub, "5 contributions in the last 12 months") || strings.Contains(pub, `title="1 contribution on 3 March 2026"`) {
254 t.Fatalf("openbaar %d, heatmap klopt niet", res.StatusCode)
254 t.Fatalf("openbaar %d, heatmap klopt niet", res.StatusCode)
255 }
255 }
256
256
@@ -266,7 +266,7 @@ func TestActivityHeatmap(t *testing.T) {
266 t.Fatal(err)
266 t.Fatal(err)
267 }
267 }
268 again := read(t, res)
268 again := read(t, res)
269 if !strings.Contains(again, `title="1 bijdrage op 5 mei 2026"`) || strings.Contains(again, "5 bijdragen in de laatste 12 maanden") {
269 if !strings.Contains(again, `title="1 contribution on 5 May 2026"`) || strings.Contains(again, "5 contributions in the last 12 months") {
270 t.Fatal("bestaande commits zijn niet opnieuw geteld")
270 t.Fatal("bestaande commits zijn niet opnieuw geteld")
271 }
271 }
272}
272}
internal/server/api.go +19 −18
@@ -10,6 +10,7 @@ import (
10 10
11 11 "gitlab.com/Timfa/bluegit/internal/access"
12 12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
13 14 "gitlab.com/Timfa/bluegit/internal/names"
14 15 "gitlab.com/Timfa/bluegit/internal/store"
15 16 "gitlab.com/Timfa/bluegit/internal/webhook"
@@ -29,7 +30,7 @@ type releaseRequest struct {
29 30
30 31 func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
31 32 if s.StoragePath() == "" {
32 http.Error(w, noStorageMsg, http.StatusServiceUnavailable)
33 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
33 34 return
34 35 }
35 36 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
@@ -43,48 +44,48 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
43 44 if strings.HasPrefix(token, "bgj_") {
44 45 job, err = s.Store.JobByToken(r.Context(), token)
45 46 if err != nil || job.RepoID != repo.ID || job.Status != "running" {
46 http.Error(w, "job-token ongeldig", http.StatusUnauthorized)
47 http.Error(w, s.tr(r, "err.jobToken"), http.StatusUnauthorized)
47 48 return
48 49 }
49 50 } else if strings.HasPrefix(token, "bg_") {
50 51 u, err := s.Store.UserByToken(r.Context(), token)
51 52 if err != nil {
52 http.Error(w, "token ongeldig", http.StatusUnauthorized)
53 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
53 54 return
54 55 }
55 56 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
56 57 if err != nil || !role.AtLeast(access.RoleMaintainer) {
57 http.Error(w, "alleen een beheerder", http.StatusForbidden)
58 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
58 59 return
59 60 }
60 61 author = u.ID
61 62 } else {
62 http.Error(w, "token ontbreekt", http.StatusUnauthorized)
63 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
63 64 return
64 65 }
65 66 var req releaseRequest
66 67 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&req); err != nil {
67 http.Error(w, "json", http.StatusBadRequest)
68 http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
68 69 return
69 70 }
70 71 if err := names.ValidTag(req.Tag); err != nil {
71 http.Error(w, err.Error(), http.StatusBadRequest)
72 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
72 73 return
73 74 }
74 75 if !safeSHA(req.Commit) {
75 http.Error(w, "commit ontbreekt", http.StatusBadRequest)
76 http.Error(w, s.tr(r, "err.commitAbsent"), http.StatusBadRequest)
76 77 return
77 78 }
78 79 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
79 80 if !gitrepo.HasCommit(r.Context(), s.Git, dir, req.Commit) {
80 http.Error(w, "commit niet in deze repository", http.StatusBadRequest)
81 http.Error(w, s.tr(r, "err.commitMissing"), http.StatusBadRequest)
81 82 return
82 83 }
83 84 if req.Name == "" {
84 85 req.Name = req.Tag
85 86 }
86 87 if job.ID == 0 && len(req.Assets) > 0 {
87 http.Error(w, "assets horen bij een job-token", http.StatusBadRequest)
88 http.Error(w, s.tr(r, "err.assetsJob"), http.StatusBadRequest)
88 89 return
89 90 }
90 91 var assets []store.ReleaseAsset
@@ -93,42 +94,42 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
93 94 a.Name = filepath.Base(a.Path)
94 95 }
95 96 if err := names.ValidRepoName(strings.ReplaceAll(a.Name, ".", "x")); err != nil && strings.Contains(a.Name, "..") {
96 http.Error(w, "assetnaam", http.StatusBadRequest)
97 http.Error(w, s.tr(r, "err.assetName"), http.StatusBadRequest)
97 98 return
98 99 }
99 100 if strings.Contains(a.Name, "/") || strings.Contains(a.Name, "..") || a.Path == "" {
100 http.Error(w, "assetnaam", http.StatusBadRequest)
101 http.Error(w, s.tr(r, "err.assetName"), http.StatusBadRequest)
101 102 return
102 103 }
103 104 src, err := s.Store.ArtifactPath(r.Context(), job.PipelineID, a.Job, a.Path)
104 105 if err != nil {
105 http.Error(w, "artifact niet gevonden: "+a.Job+" "+a.Path, http.StatusBadRequest)
106 http.Error(w, s.tr(r, "err.artifactMissing", a.Job, a.Path), http.StatusBadRequest)
106 107 return
107 108 }
108 109 info, err := os.Stat(src)
109 110 if err != nil {
110 http.Error(w, "artifact ontbreekt op schijf", http.StatusBadRequest)
111 http.Error(w, s.tr(r, "err.assetDisk"), http.StatusBadRequest)
111 112 return
112 113 }
113 114 dst := filepath.Join(s.StoragePath(), "releases", repo.OwnerPath, repo.Name, req.Tag, a.Name)
114 115 if err := copyRelease(src, dst); err != nil {
115 http.Error(w, "asset kopiëren", http.StatusInternalServerError)
116 http.Error(w, s.tr(r, "err.assetCopy"), http.StatusInternalServerError)
116 117 return
117 118 }
118 119 assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
119 120 }
120 121 if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {
121 http.Error(w, "tag: "+err.Error(), http.StatusBadRequest)
122 http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)
122 123 return
123 124 }
124 125 id, err := s.Store.CreateRelease(r.Context(), repo.ID, req.Tag, req.Commit, req.Name, req.Body, author, job.ID, assets)
125 126 if err != nil {
126 http.Error(w, err.Error(), http.StatusBadRequest)
127 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
127 128 return
128 129 }
129 130 s.Dispatch(repo.ID, webhook.Event{
130 131 Type: webhook.EventRelease, Project: repo.FullPath(), Commit: req.Commit,
131 ReleaseTag: req.Tag, Summary: "release " + req.Tag + " van " + repo.FullPath() + " gepubliceerd",
132 ReleaseTag: req.Tag, Summary: i18n.T(i18n.EN, "hook.release", req.Tag, repo.FullPath()),
132 133 URL: strings.TrimRight(s.Cfg.BaseURL, "/") + repoURL(repo) + "/-/releases",
133 134 })
134 135 w.Header().Set("Content-Type", "application/json")
@@ -10,6 +10,7 @@ import (
10
10
11 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
13 "gitlab.com/Timfa/bluegit/internal/names"
14 "gitlab.com/Timfa/bluegit/internal/names"
14 "gitlab.com/Timfa/bluegit/internal/store"
15 "gitlab.com/Timfa/bluegit/internal/store"
15 "gitlab.com/Timfa/bluegit/internal/webhook"
16 "gitlab.com/Timfa/bluegit/internal/webhook"
@@ -29,7 +30,7 @@ type releaseRequest struct {
29
30
30func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
31func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
31 if s.StoragePath() == "" {
32 if s.StoragePath() == "" {
32 http.Error(w, noStorageMsg, http.StatusServiceUnavailable)
33 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
33 return
34 return
34 }
35 }
35 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
36 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
@@ -43,48 +44,48 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
43 if strings.HasPrefix(token, "bgj_") {
44 if strings.HasPrefix(token, "bgj_") {
44 job, err = s.Store.JobByToken(r.Context(), token)
45 job, err = s.Store.JobByToken(r.Context(), token)
45 if err != nil || job.RepoID != repo.ID || job.Status != "running" {
46 if err != nil || job.RepoID != repo.ID || job.Status != "running" {
46 http.Error(w, "job-token ongeldig", http.StatusUnauthorized)
47 http.Error(w, s.tr(r, "err.jobToken"), http.StatusUnauthorized)
47 return
48 return
48 }
49 }
49 } else if strings.HasPrefix(token, "bg_") {
50 } else if strings.HasPrefix(token, "bg_") {
50 u, err := s.Store.UserByToken(r.Context(), token)
51 u, err := s.Store.UserByToken(r.Context(), token)
51 if err != nil {
52 if err != nil {
52 http.Error(w, "token ongeldig", http.StatusUnauthorized)
53 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
53 return
54 return
54 }
55 }
55 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
56 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
56 if err != nil || !role.AtLeast(access.RoleMaintainer) {
57 if err != nil || !role.AtLeast(access.RoleMaintainer) {
57 http.Error(w, "alleen een beheerder", http.StatusForbidden)
58 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
58 return
59 return
59 }
60 }
60 author = u.ID
61 author = u.ID
61 } else {
62 } else {
62 http.Error(w, "token ontbreekt", http.StatusUnauthorized)
63 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
63 return
64 return
64 }
65 }
65 var req releaseRequest
66 var req releaseRequest
66 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&req); err != nil {
67 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&req); err != nil {
67 http.Error(w, "json", http.StatusBadRequest)
68 http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
68 return
69 return
69 }
70 }
70 if err := names.ValidTag(req.Tag); err != nil {
71 if err := names.ValidTag(req.Tag); err != nil {
71 http.Error(w, err.Error(), http.StatusBadRequest)
72 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
72 return
73 return
73 }
74 }
74 if !safeSHA(req.Commit) {
75 if !safeSHA(req.Commit) {
75 http.Error(w, "commit ontbreekt", http.StatusBadRequest)
76 http.Error(w, s.tr(r, "err.commitAbsent"), http.StatusBadRequest)
76 return
77 return
77 }
78 }
78 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
79 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
79 if !gitrepo.HasCommit(r.Context(), s.Git, dir, req.Commit) {
80 if !gitrepo.HasCommit(r.Context(), s.Git, dir, req.Commit) {
80 http.Error(w, "commit niet in deze repository", http.StatusBadRequest)
81 http.Error(w, s.tr(r, "err.commitMissing"), http.StatusBadRequest)
81 return
82 return
82 }
83 }
83 if req.Name == "" {
84 if req.Name == "" {
84 req.Name = req.Tag
85 req.Name = req.Tag
85 }
86 }
86 if job.ID == 0 && len(req.Assets) > 0 {
87 if job.ID == 0 && len(req.Assets) > 0 {
87 http.Error(w, "assets horen bij een job-token", http.StatusBadRequest)
88 http.Error(w, s.tr(r, "err.assetsJob"), http.StatusBadRequest)
88 return
89 return
89 }
90 }
90 var assets []store.ReleaseAsset
91 var assets []store.ReleaseAsset
@@ -93,42 +94,42 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
93 a.Name = filepath.Base(a.Path)
94 a.Name = filepath.Base(a.Path)
94 }
95 }
95 if err := names.ValidRepoName(strings.ReplaceAll(a.Name, ".", "x")); err != nil && strings.Contains(a.Name, "..") {
96 if err := names.ValidRepoName(strings.ReplaceAll(a.Name, ".", "x")); err != nil && strings.Contains(a.Name, "..") {
96 http.Error(w, "assetnaam", http.StatusBadRequest)
97 http.Error(w, s.tr(r, "err.assetName"), http.StatusBadRequest)
97 return
98 return
98 }
99 }
99 if strings.Contains(a.Name, "/") || strings.Contains(a.Name, "..") || a.Path == "" {
100 if strings.Contains(a.Name, "/") || strings.Contains(a.Name, "..") || a.Path == "" {
100 http.Error(w, "assetnaam", http.StatusBadRequest)
101 http.Error(w, s.tr(r, "err.assetName"), http.StatusBadRequest)
101 return
102 return
102 }
103 }
103 src, err := s.Store.ArtifactPath(r.Context(), job.PipelineID, a.Job, a.Path)
104 src, err := s.Store.ArtifactPath(r.Context(), job.PipelineID, a.Job, a.Path)
104 if err != nil {
105 if err != nil {
105 http.Error(w, "artifact niet gevonden: "+a.Job+" "+a.Path, http.StatusBadRequest)
106 http.Error(w, s.tr(r, "err.artifactMissing", a.Job, a.Path), http.StatusBadRequest)
106 return
107 return
107 }
108 }
108 info, err := os.Stat(src)
109 info, err := os.Stat(src)
109 if err != nil {
110 if err != nil {
110 http.Error(w, "artifact ontbreekt op schijf", http.StatusBadRequest)
111 http.Error(w, s.tr(r, "err.assetDisk"), http.StatusBadRequest)
111 return
112 return
112 }
113 }
113 dst := filepath.Join(s.StoragePath(), "releases", repo.OwnerPath, repo.Name, req.Tag, a.Name)
114 dst := filepath.Join(s.StoragePath(), "releases", repo.OwnerPath, repo.Name, req.Tag, a.Name)
114 if err := copyRelease(src, dst); err != nil {
115 if err := copyRelease(src, dst); err != nil {
115 http.Error(w, "asset kopiëren", http.StatusInternalServerError)
116 http.Error(w, s.tr(r, "err.assetCopy"), http.StatusInternalServerError)
116 return
117 return
117 }
118 }
118 assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
119 assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
119 }
120 }
120 if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {
121 if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {
121 http.Error(w, "tag: "+err.Error(), http.StatusBadRequest)
122 http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)
122 return
123 return
123 }
124 }
124 id, err := s.Store.CreateRelease(r.Context(), repo.ID, req.Tag, req.Commit, req.Name, req.Body, author, job.ID, assets)
125 id, err := s.Store.CreateRelease(r.Context(), repo.ID, req.Tag, req.Commit, req.Name, req.Body, author, job.ID, assets)
125 if err != nil {
126 if err != nil {
126 http.Error(w, err.Error(), http.StatusBadRequest)
127 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
127 return
128 return
128 }
129 }
129 s.Dispatch(repo.ID, webhook.Event{
130 s.Dispatch(repo.ID, webhook.Event{
130 Type: webhook.EventRelease, Project: repo.FullPath(), Commit: req.Commit,
131 Type: webhook.EventRelease, Project: repo.FullPath(), Commit: req.Commit,
131 ReleaseTag: req.Tag, Summary: "release " + req.Tag + " van " + repo.FullPath() + " gepubliceerd",
132 ReleaseTag: req.Tag, Summary: i18n.T(i18n.EN, "hook.release", req.Tag, repo.FullPath()),
132 URL: strings.TrimRight(s.Cfg.BaseURL, "/") + repoURL(repo) + "/-/releases",
133 URL: strings.TrimRight(s.Cfg.BaseURL, "/") + repoURL(repo) + "/-/releases",
133 })
134 })
134 w.Header().Set("Content-Type", "application/json")
135 w.Header().Set("Content-Type", "application/json")
internal/server/auth_handlers.go +22 −22
@@ -26,7 +26,7 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request) {
26 26 }
27 27 state, err := randomState()
28 28 if err != nil {
29 http.Error(w, "sessie", http.StatusInternalServerError)
29 http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
30 30 return
31 31 }
32 32 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
@@ -43,19 +43,19 @@ func (s *Server) callback(w http.ResponseWriter, r *http.Request) {
43 43 return
44 44 }
45 45 if msg := r.URL.Query().Get("error"); msg != "" {
46 s.redirect(w, r, "/login", "", "Aanmelden mislukt: "+msg)
46 s.redirect(w, r, "/login", "", s.tr(r, "err.oauth", msg))
47 47 return
48 48 }
49 49 stateCookie, err := r.Cookie("bluegit_oauth_state")
50 50 if err != nil || stateCookie.Value == "" || stateCookie.Value != r.URL.Query().Get("state") {
51 http.Error(w, "ongeldige aanmeldstatus", http.StatusBadRequest)
51 http.Error(w, s.tr(r, "err.oauthState"), http.StatusBadRequest)
52 52 return
53 53 }
54 54 http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_state", Value: "", Path: "/", MaxAge: -1})
55 55 id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI())
56 56 if err != nil {
57 57 s.Log.Error("oauth", "err", err)
58 s.redirect(w, r, "/", "", "Aanmelden is mislukt")
58 s.redirect(w, r, "/", "", s.tr(r, "err.oauthFail"))
59 59 return
60 60 }
61 61 s.finishLogin(w, r, id.AuthID, id.Username, id.AvatarURL, id.IsAdmin, id.AccessToken, id.ExpiresIn)
@@ -73,11 +73,11 @@ func (s *Server) finishLogin(w http.ResponseWriter, r *http.Request, authID int6
73 73 exp := time.Now().Add(time.Duration(expiresIn) * time.Second)
74 74 sess, err := s.Store.CreateSession(r.Context(), user.ID, token, exp)
75 75 if err != nil {
76 http.Error(w, "sessie", http.StatusInternalServerError)
76 http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
77 77 return
78 78 }
79 79 s.setSessionCookie(w, sess.ID, exp)
80 s.redirect(w, r, "/", "Welkom, "+user.Username, "")
80 s.redirect(w, r, "/", s.tr(r, "flash.welcome", user.Username), "")
81 81 }
82 82
83 83 func (s *Server) logout(w http.ResponseWriter, r *http.Request) {
@@ -98,23 +98,23 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
98 98 if v.User != nil {
99 99 ids, err := s.Store.ListRepoIDs(r.Context(), v.User.ID)
100 100 if err != nil {
101 http.Error(w, "overzicht", http.StatusInternalServerError)
101 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
102 102 return
103 103 }
104 104 repos, err := s.Store.ReposByIDs(r.Context(), ids)
105 105 if err != nil {
106 http.Error(w, "overzicht", http.StatusInternalServerError)
106 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
107 107 return
108 108 }
109 109 v.Repos = repos
110 110 groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
111 111 if err != nil {
112 http.Error(w, "overzicht", http.StatusInternalServerError)
112 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
113 113 return
114 114 }
115 115 v.Groups = groups
116 v.Title = "Overzicht"
117 v.Heat = s.heatmap(r.Context(), v.User.ID, ids)
116 v.Title = s.tr(r, "nav.dashboard")
117 v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r))
118 118 s.render(w, "dashboard", v)
119 119 return
120 120 }
@@ -130,7 +130,7 @@ func (s *Server) newPage(w http.ResponseWriter, r *http.Request) {
130 130 if _, ok := s.loginRequired(w, r); !ok {
131 131 return
132 132 }
133 v := s.view(w, r, "Nieuw")
133 v := s.view(w, r, "title.new")
134 134 v.Groups, _ = s.Store.ListGroups(r.Context(), v.User.ID)
135 135 s.render(w, "new", v)
136 136 }
@@ -140,7 +140,7 @@ func (s *Server) account(w http.ResponseWriter, r *http.Request) {
140 140 if !ok {
141 141 return
142 142 }
143 v := s.view(w, r, "Account")
143 v := s.view(w, r, "title.account")
144 144 v.Tokens, _ = s.Store.ListTokens(r.Context(), u.ID)
145 145 v.Keys, _ = s.Store.ListSSHKeys(r.Context(), u.ID)
146 146 v.NewToken = cookieVal(r, "bluegit_token_once")
@@ -157,12 +157,12 @@ func (s *Server) createToken(w http.ResponseWriter, r *http.Request) {
157 157 }
158 158 plain, err := s.Store.CreateToken(r.Context(), u.ID, r.FormValue("name"))
159 159 if err != nil {
160 s.redirect(w, r, "/settings", "", err.Error())
160 s.redirect(w, r, "/settings", "", s.trErr(r, err))
161 161 return
162 162 }
163 163 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
164 164 http.SetCookie(w, &http.Cookie{Name: "bluegit_token_once", Value: plain, Path: "/settings", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
165 s.redirect(w, r, "/settings", "Token aangemaakt. Kopieer hem nu; hij wordt niet opnieuw getoond.", "")
165 s.redirect(w, r, "/settings", s.tr(r, "flash.tokenCreated"), "")
166 166 }
167 167
168 168 func (s *Server) deleteToken(w http.ResponseWriter, r *http.Request) {
@@ -173,10 +173,10 @@ func (s *Server) deleteToken(w http.ResponseWriter, r *http.Request) {
173 173 var id int64
174 174 _, _ = parseID(r.FormValue("id"), &id)
175 175 if err := s.Store.DeleteToken(r.Context(), u.ID, id); err != nil {
176 s.redirect(w, r, "/settings", "", "token niet gevonden")
176 s.redirect(w, r, "/settings", "", s.tr(r, "err.tokenMissing"))
177 177 return
178 178 }
179 s.redirect(w, r, "/settings", "Token ingetrokken", "")
179 s.redirect(w, r, "/settings", s.tr(r, "flash.tokenRevoked"), "")
180 180 }
181 181
182 182 func (s *Server) addSSH(w http.ResponseWriter, r *http.Request) {
@@ -187,16 +187,16 @@ func (s *Server) addSSH(w http.ResponseWriter, r *http.Request) {
187 187 line := strings.TrimSpace(r.FormValue("key"))
188 188 pub, _, _, _, err := ssh.ParseAuthorizedKey([]byte(line))
189 189 if err != nil {
190 s.redirect(w, r, "/settings", "", "dat is geen OpenSSH-publieke sleutel")
190 s.redirect(w, r, "/settings", "", s.tr(r, "err.sshBad"))
191 191 return
192 192 }
193 193 stored := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(pub)))
194 194 fp := ssh.FingerprintSHA256(pub)
195 195 if err := s.Store.AddSSHKey(r.Context(), u.ID, r.FormValue("name"), stored, fp); err != nil {
196 s.redirect(w, r, "/settings", "", err.Error())
196 s.redirect(w, r, "/settings", "", s.trErr(r, err))
197 197 return
198 198 }
199 s.redirect(w, r, "/settings", "Sleutel toegevoegd", "")
199 s.redirect(w, r, "/settings", s.tr(r, "flash.sshAdded"), "")
200 200 }
201 201
202 202 func (s *Server) deleteSSH(w http.ResponseWriter, r *http.Request) {
@@ -207,10 +207,10 @@ func (s *Server) deleteSSH(w http.ResponseWriter, r *http.Request) {
207 207 var id int64
208 208 _, _ = parseID(r.FormValue("id"), &id)
209 209 if err := s.Store.DeleteSSHKey(r.Context(), u.ID, id); err != nil {
210 s.redirect(w, r, "/settings", "", "sleutel niet gevonden")
210 s.redirect(w, r, "/settings", "", s.tr(r, "err.sshMissing"))
211 211 return
212 212 }
213 s.redirect(w, r, "/settings", "Sleutel verwijderd", "")
213 s.redirect(w, r, "/settings", s.tr(r, "flash.sshRemoved"), "")
214 214 }
215 215
216 216 func (s *Server) export(w http.ResponseWriter, r *http.Request) {
@@ -26,7 +26,7 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request) {
26 }
26 }
27 state, err := randomState()
27 state, err := randomState()
28 if err != nil {
28 if err != nil {
29 http.Error(w, "sessie", http.StatusInternalServerError)
29 http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
30 return
30 return
31 }
31 }
32 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
32 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
@@ -43,19 +43,19 @@ func (s *Server) callback(w http.ResponseWriter, r *http.Request) {
43 return
43 return
44 }
44 }
45 if msg := r.URL.Query().Get("error"); msg != "" {
45 if msg := r.URL.Query().Get("error"); msg != "" {
46 s.redirect(w, r, "/login", "", "Aanmelden mislukt: "+msg)
46 s.redirect(w, r, "/login", "", s.tr(r, "err.oauth", msg))
47 return
47 return
48 }
48 }
49 stateCookie, err := r.Cookie("bluegit_oauth_state")
49 stateCookie, err := r.Cookie("bluegit_oauth_state")
50 if err != nil || stateCookie.Value == "" || stateCookie.Value != r.URL.Query().Get("state") {
50 if err != nil || stateCookie.Value == "" || stateCookie.Value != r.URL.Query().Get("state") {
51 http.Error(w, "ongeldige aanmeldstatus", http.StatusBadRequest)
51 http.Error(w, s.tr(r, "err.oauthState"), http.StatusBadRequest)
52 return
52 return
53 }
53 }
54 http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_state", Value: "", Path: "/", MaxAge: -1})
54 http.SetCookie(w, &http.Cookie{Name: "bluegit_oauth_state", Value: "", Path: "/", MaxAge: -1})
55 id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI())
55 id, err := s.Auth.Exchange(r.Context(), r.URL.Query().Get("code"), s.Cfg.RedirectURI())
56 if err != nil {
56 if err != nil {
57 s.Log.Error("oauth", "err", err)
57 s.Log.Error("oauth", "err", err)
58 s.redirect(w, r, "/", "", "Aanmelden is mislukt")
58 s.redirect(w, r, "/", "", s.tr(r, "err.oauthFail"))
59 return
59 return
60 }
60 }
61 s.finishLogin(w, r, id.AuthID, id.Username, id.AvatarURL, id.IsAdmin, id.AccessToken, id.ExpiresIn)
61 s.finishLogin(w, r, id.AuthID, id.Username, id.AvatarURL, id.IsAdmin, id.AccessToken, id.ExpiresIn)
@@ -73,11 +73,11 @@ func (s *Server) finishLogin(w http.ResponseWriter, r *http.Request, authID int6
73 exp := time.Now().Add(time.Duration(expiresIn) * time.Second)
73 exp := time.Now().Add(time.Duration(expiresIn) * time.Second)
74 sess, err := s.Store.CreateSession(r.Context(), user.ID, token, exp)
74 sess, err := s.Store.CreateSession(r.Context(), user.ID, token, exp)
75 if err != nil {
75 if err != nil {
76 http.Error(w, "sessie", http.StatusInternalServerError)
76 http.Error(w, s.tr(r, "err.session"), http.StatusInternalServerError)
77 return
77 return
78 }
78 }
79 s.setSessionCookie(w, sess.ID, exp)
79 s.setSessionCookie(w, sess.ID, exp)
80 s.redirect(w, r, "/", "Welkom, "+user.Username, "")
80 s.redirect(w, r, "/", s.tr(r, "flash.welcome", user.Username), "")
81}
81}
82
82
83func (s *Server) logout(w http.ResponseWriter, r *http.Request) {
83func (s *Server) logout(w http.ResponseWriter, r *http.Request) {
@@ -98,23 +98,23 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
98 if v.User != nil {
98 if v.User != nil {
99 ids, err := s.Store.ListRepoIDs(r.Context(), v.User.ID)
99 ids, err := s.Store.ListRepoIDs(r.Context(), v.User.ID)
100 if err != nil {
100 if err != nil {
101 http.Error(w, "overzicht", http.StatusInternalServerError)
101 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
102 return
102 return
103 }
103 }
104 repos, err := s.Store.ReposByIDs(r.Context(), ids)
104 repos, err := s.Store.ReposByIDs(r.Context(), ids)
105 if err != nil {
105 if err != nil {
106 http.Error(w, "overzicht", http.StatusInternalServerError)
106 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
107 return
107 return
108 }
108 }
109 v.Repos = repos
109 v.Repos = repos
110 groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
110 groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
111 if err != nil {
111 if err != nil {
112 http.Error(w, "overzicht", http.StatusInternalServerError)
112 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
113 return
113 return
114 }
114 }
115 v.Groups = groups
115 v.Groups = groups
116 v.Title = "Overzicht"
116 v.Title = s.tr(r, "nav.dashboard")
117 v.Heat = s.heatmap(r.Context(), v.User.ID, ids)
117 v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r))
118 s.render(w, "dashboard", v)
118 s.render(w, "dashboard", v)
119 return
119 return
120 }
120 }
@@ -130,7 +130,7 @@ func (s *Server) newPage(w http.ResponseWriter, r *http.Request) {
130 if _, ok := s.loginRequired(w, r); !ok {
130 if _, ok := s.loginRequired(w, r); !ok {
131 return
131 return
132 }
132 }
133 v := s.view(w, r, "Nieuw")
133 v := s.view(w, r, "title.new")
134 v.Groups, _ = s.Store.ListGroups(r.Context(), v.User.ID)
134 v.Groups, _ = s.Store.ListGroups(r.Context(), v.User.ID)
135 s.render(w, "new", v)
135 s.render(w, "new", v)
136}
136}
@@ -140,7 +140,7 @@ func (s *Server) account(w http.ResponseWriter, r *http.Request) {
140 if !ok {
140 if !ok {
141 return
141 return
142 }
142 }
143 v := s.view(w, r, "Account")
143 v := s.view(w, r, "title.account")
144 v.Tokens, _ = s.Store.ListTokens(r.Context(), u.ID)
144 v.Tokens, _ = s.Store.ListTokens(r.Context(), u.ID)
145 v.Keys, _ = s.Store.ListSSHKeys(r.Context(), u.ID)
145 v.Keys, _ = s.Store.ListSSHKeys(r.Context(), u.ID)
146 v.NewToken = cookieVal(r, "bluegit_token_once")
146 v.NewToken = cookieVal(r, "bluegit_token_once")
@@ -157,12 +157,12 @@ func (s *Server) createToken(w http.ResponseWriter, r *http.Request) {
157 }
157 }
158 plain, err := s.Store.CreateToken(r.Context(), u.ID, r.FormValue("name"))
158 plain, err := s.Store.CreateToken(r.Context(), u.ID, r.FormValue("name"))
159 if err != nil {
159 if err != nil {
160 s.redirect(w, r, "/settings", "", err.Error())
160 s.redirect(w, r, "/settings", "", s.trErr(r, err))
161 return
161 return
162 }
162 }
163 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
163 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
164 http.SetCookie(w, &http.Cookie{Name: "bluegit_token_once", Value: plain, Path: "/settings", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
164 http.SetCookie(w, &http.Cookie{Name: "bluegit_token_once", Value: plain, Path: "/settings", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
165 s.redirect(w, r, "/settings", "Token aangemaakt. Kopieer hem nu; hij wordt niet opnieuw getoond.", "")
165 s.redirect(w, r, "/settings", s.tr(r, "flash.tokenCreated"), "")
166}
166}
167
167
168func (s *Server) deleteToken(w http.ResponseWriter, r *http.Request) {
168func (s *Server) deleteToken(w http.ResponseWriter, r *http.Request) {
@@ -173,10 +173,10 @@ func (s *Server) deleteToken(w http.ResponseWriter, r *http.Request) {
173 var id int64
173 var id int64
174 _, _ = parseID(r.FormValue("id"), &id)
174 _, _ = parseID(r.FormValue("id"), &id)
175 if err := s.Store.DeleteToken(r.Context(), u.ID, id); err != nil {
175 if err := s.Store.DeleteToken(r.Context(), u.ID, id); err != nil {
176 s.redirect(w, r, "/settings", "", "token niet gevonden")
176 s.redirect(w, r, "/settings", "", s.tr(r, "err.tokenMissing"))
177 return
177 return
178 }
178 }
179 s.redirect(w, r, "/settings", "Token ingetrokken", "")
179 s.redirect(w, r, "/settings", s.tr(r, "flash.tokenRevoked"), "")
180}
180}
181
181
182func (s *Server) addSSH(w http.ResponseWriter, r *http.Request) {
182func (s *Server) addSSH(w http.ResponseWriter, r *http.Request) {
@@ -187,16 +187,16 @@ func (s *Server) addSSH(w http.ResponseWriter, r *http.Request) {
187 line := strings.TrimSpace(r.FormValue("key"))
187 line := strings.TrimSpace(r.FormValue("key"))
188 pub, _, _, _, err := ssh.ParseAuthorizedKey([]byte(line))
188 pub, _, _, _, err := ssh.ParseAuthorizedKey([]byte(line))
189 if err != nil {
189 if err != nil {
190 s.redirect(w, r, "/settings", "", "dat is geen OpenSSH-publieke sleutel")
190 s.redirect(w, r, "/settings", "", s.tr(r, "err.sshBad"))
191 return
191 return
192 }
192 }
193 stored := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(pub)))
193 stored := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(pub)))
194 fp := ssh.FingerprintSHA256(pub)
194 fp := ssh.FingerprintSHA256(pub)
195 if err := s.Store.AddSSHKey(r.Context(), u.ID, r.FormValue("name"), stored, fp); err != nil {
195 if err := s.Store.AddSSHKey(r.Context(), u.ID, r.FormValue("name"), stored, fp); err != nil {
196 s.redirect(w, r, "/settings", "", err.Error())
196 s.redirect(w, r, "/settings", "", s.trErr(r, err))
197 return
197 return
198 }
198 }
199 s.redirect(w, r, "/settings", "Sleutel toegevoegd", "")
199 s.redirect(w, r, "/settings", s.tr(r, "flash.sshAdded"), "")
200}
200}
201
201
202func (s *Server) deleteSSH(w http.ResponseWriter, r *http.Request) {
202func (s *Server) deleteSSH(w http.ResponseWriter, r *http.Request) {
@@ -207,10 +207,10 @@ func (s *Server) deleteSSH(w http.ResponseWriter, r *http.Request) {
207 var id int64
207 var id int64
208 _, _ = parseID(r.FormValue("id"), &id)
208 _, _ = parseID(r.FormValue("id"), &id)
209 if err := s.Store.DeleteSSHKey(r.Context(), u.ID, id); err != nil {
209 if err := s.Store.DeleteSSHKey(r.Context(), u.ID, id); err != nil {
210 s.redirect(w, r, "/settings", "", "sleutel niet gevonden")
210 s.redirect(w, r, "/settings", "", s.tr(r, "err.sshMissing"))
211 return
211 return
212 }
212 }
213 s.redirect(w, r, "/settings", "Sleutel verwijderd", "")
213 s.redirect(w, r, "/settings", s.tr(r, "flash.sshRemoved"), "")
214}
214}
215
215
216func (s *Server) export(w http.ResponseWriter, r *http.Request) {
216func (s *Server) export(w http.ResponseWriter, r *http.Request) {
internal/server/events.go +3 −3
@@ -3,7 +3,6 @@ package server
3 3 import (
4 4 "bytes"
5 5 "context"
6 "fmt"
7 6 "io"
8 7 "net/http"
9 8 "net/url"
@@ -14,6 +13,7 @@ import (
14 13 "gitlab.com/Timfa/bluegit/internal/access"
15 14 "gitlab.com/Timfa/bluegit/internal/ci"
16 15 "gitlab.com/Timfa/bluegit/internal/gitrepo"
16 "gitlab.com/Timfa/bluegit/internal/i18n"
17 17 "gitlab.com/Timfa/bluegit/internal/ssrf"
18 18 "gitlab.com/Timfa/bluegit/internal/store"
19 19 "gitlab.com/Timfa/bluegit/internal/webhook"
@@ -40,7 +40,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
40 40 Project: repo.FullPath(),
41 41 Branch: branch,
42 42 Commit: sha,
43 Summary: fmt.Sprintf("%s pushte naar %s in %s", actor, branch, repo.FullPath()),
43 Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),
44 44 URL: web,
45 45 Actor: actor,
46 46 })
@@ -212,7 +212,7 @@ func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev web
212 212 func urlParse(raw string) (*url.URL, error) {
213 213 u, err := url.Parse(raw)
214 214 if err != nil {
215 return nil, fmt.Errorf("webhook-URL is ongeldig")
215 return nil, i18n.E("err.whURL")
216 216 }
217 217 return u, nil
218 218 }
@@ -3,7 +3,6 @@ package server
3import (
3import (
4 "bytes"
4 "bytes"
5 "context"
5 "context"
6 "fmt"
7 "io"
6 "io"
8 "net/http"
7 "net/http"
9 "net/url"
8 "net/url"
@@ -14,6 +13,7 @@ import (
14 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/access"
15 "gitlab.com/Timfa/bluegit/internal/ci"
14 "gitlab.com/Timfa/bluegit/internal/ci"
16 "gitlab.com/Timfa/bluegit/internal/gitrepo"
15 "gitlab.com/Timfa/bluegit/internal/gitrepo"
16 "gitlab.com/Timfa/bluegit/internal/i18n"
17 "gitlab.com/Timfa/bluegit/internal/ssrf"
17 "gitlab.com/Timfa/bluegit/internal/ssrf"
18 "gitlab.com/Timfa/bluegit/internal/store"
18 "gitlab.com/Timfa/bluegit/internal/store"
19 "gitlab.com/Timfa/bluegit/internal/webhook"
19 "gitlab.com/Timfa/bluegit/internal/webhook"
@@ -40,7 +40,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
40 Project: repo.FullPath(),
40 Project: repo.FullPath(),
41 Branch: branch,
41 Branch: branch,
42 Commit: sha,
42 Commit: sha,
43 Summary: fmt.Sprintf("%s pushte naar %s in %s", actor, branch, repo.FullPath()),
43 Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),
44 URL: web,
44 URL: web,
45 Actor: actor,
45 Actor: actor,
46 })
46 })
@@ -212,7 +212,7 @@ func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev web
212func urlParse(raw string) (*url.URL, error) {
212func urlParse(raw string) (*url.URL, error) {
213 u, err := url.Parse(raw)
213 u, err := url.Parse(raw)
214 if err != nil {
214 if err != nil {
215 return nil, fmt.Errorf("webhook-URL is ongeldig")
215 return nil, i18n.E("err.whURL")
216 }
216 }
217 return u, nil
217 return u, nil
218}
218}
internal/server/extra_test.go added +344 −0
@@ -0,0 +1,344 @@
1 package server
2
3 import (
4 "bytes"
5 "context"
6 "image"
7 "image/color"
8 "image/png"
9 "io"
10 "mime/multipart"
11 "net/http"
12 "net/http/cookiejar"
13 "net/http/httptest"
14 "net/url"
15 "os/exec"
16 "path/filepath"
17 "strings"
18 "testing"
19 "unicode/utf8"
20
21 "gitlab.com/Timfa/bluegit/internal/access"
22 "gitlab.com/Timfa/bluegit/internal/auth"
23 "gitlab.com/Timfa/bluegit/internal/config"
24 "gitlab.com/Timfa/bluegit/internal/store"
25 )
26
27 func TestSlugAvailabilityDefaultRoleLogoAndLanguage(t *testing.T) {
28 if _, err := exec.LookPath("git"); err != nil {
29 t.Skip("git ontbreekt")
30 }
31 storage := t.TempDir()
32 stateDir := t.TempDir()
33 st, err := store.Open(filepath.Join(stateDir, "bluegit.db"), bytes32())
34 if err != nil {
35 t.Fatal(err)
36 }
37 t.Cleanup(func() { _ = st.Close() })
38 cfg := config.Config{
39 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
40 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
41 Git: config.Git{Binary: "git", DefaultBranch: "master"},
42 }
43 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: stateDir}
44 ts := httptest.NewServer(srv.Handler())
45 t.Cleanup(ts.Close)
46 jar, _ := cookiejar.New(nil)
47 client := &http.Client{Jar: jar}
48 res, err := client.Get(ts.URL + "/login")
49 if err != nil {
50 t.Fatal(err)
51 }
52 page := read(t, res)
53 ctx := context.Background()
54
55 res, err = client.PostForm(ts.URL+"/new/group", url.Values{
56 "csrf": {csrfOf(t, page)}, "name": {"Studio"}, "default_role": {"readonly"},
57 })
58 if err != nil {
59 t.Fatal(err)
60 }
61 page = read(t, res)
62 if !strings.Contains(page, ">Studio<") || !strings.Contains(page, "Repositories") {
63 t.Fatalf("groepspagina:\n%s", page)
64 }
65 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
66 if err != nil {
67 t.Fatal(err)
68 }
69 g, err := st.GroupByPath(ctx, "studio")
70 if err != nil {
71 t.Fatal(err)
72 }
73 if g.DefaultRole != access.RoleReadonly {
74 t.Fatalf("standaardrol %s", g.DefaultRole)
75 }
76 if err := st.SetMember(ctx, "group", g.ID, "ada", access.RoleDeveloper); err != nil {
77 t.Fatal(err)
78 }
79 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
80 "csrf": {csrfOf(t, page)}, "name": {"alpha"}, "group": {"studio"}, "visibility": {"private"},
81 })
82 if err != nil {
83 t.Fatal(err)
84 }
85 page = read(t, res)
86 if !strings.Contains(page, "studio/alpha") {
87 t.Fatalf("repo:\n%s", page)
88 }
89 alpha, err := st.RepoByPath(ctx, "studio", "alpha")
90 if err != nil {
91 t.Fatal(err)
92 }
93 role, err := st.EffectiveRole(ctx, ada.ID, alpha.ID)
94 if err != nil || role != access.RoleReadonly {
95 t.Fatalf("snapshot rol %s %v", role, err)
96 }
97
98 free, err := client.Get(ts.URL + "/new/slug?kind=repo&name=gamma&owner=studio")
99 if err != nil {
100 t.Fatal(err)
101 }
102 freeBody := read(t, free)
103 if !strings.Contains(freeBody, `"available":true`) {
104 t.Fatalf("vrij: %s", freeBody)
105 }
106 taken, err := client.Get(ts.URL + "/new/slug?kind=repo&name=alpha&owner=studio")
107 if err != nil {
108 t.Fatal(err)
109 }
110 takenBody := read(t, taken)
111 if !strings.Contains(takenBody, `"available":false`) || !strings.Contains(takenBody, "studio/alpha") {
112 t.Fatalf("bezet: %s", takenBody)
113 }
114
115 res, err = client.Get(ts.URL + "/groups/studio?tab=settings")
116 if err != nil {
117 t.Fatal(err)
118 }
119 settings := read(t, res)
120 res, err = client.PostForm(ts.URL+"/groups/studio/settings", url.Values{
121 "csrf": {csrfOf(t, settings)}, "visibility": {"public"}, "default_role": {"maintainer"}, "description": {"Werk"},
122 })
123 if err != nil {
124 t.Fatal(err)
125 }
126 _ = read(t, res)
127 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
128 "csrf": {csrfOf(t, settings)}, "name": {"beta"}, "group": {"studio"}, "visibility": {"public"},
129 })
130 if err != nil {
131 t.Fatal(err)
132 }
133 if res.StatusCode >= 400 {
134 t.Fatalf("beta %d %s", res.StatusCode, read(t, res))
135 }
136 _ = res.Body.Close()
137 beta, err := st.RepoByPath(ctx, "studio", "beta")
138 if err != nil {
139 t.Fatal(err)
140 }
141 role, err = st.EffectiveRole(ctx, ada.ID, beta.ID)
142 if err != nil || role != access.RoleMaintainer {
143 t.Fatalf("nieuwe repo %s %v", role, err)
144 }
145 role, err = st.EffectiveRole(ctx, ada.ID, alpha.ID)
146 if err != nil || role != access.RoleReadonly {
147 t.Fatalf("oude repo veranderde naar %s %v", role, err)
148 }
149 bob, err := st.UpsertUser(ctx, 3, "bob", "", false)
150 if err != nil {
151 t.Fatal(err)
152 }
153 if err := st.SetMember(ctx, "group", g.ID, "bob", access.RoleDeveloper); err != nil {
154 t.Fatal(err)
155 }
156 role, err = st.EffectiveRole(ctx, bob.ID, alpha.ID)
157 if err != nil || role != access.RoleDeveloper {
158 t.Fatalf("later lid %s %v", role, err)
159 }
160
161 anon := &http.Client{}
162 res, err = anon.Get(ts.URL + "/groups/studio")
163 if err != nil {
164 t.Fatal(err)
165 }
166 pub := read(t, res)
167 if res.StatusCode != 200 || strings.Contains(pub, "alpha") || !strings.Contains(pub, "beta") {
168 t.Fatalf("openbare groep %d\n%s", res.StatusCode, pub)
169 }
170
171 res, err = client.Get(ts.URL + "/groups/studio")
172 if err != nil {
173 t.Fatal(err)
174 }
175 list := read(t, res)
176 if !strings.Contains(list, "Activity") || !strings.Contains(list, "Created ") || !strings.Contains(list, "★") {
177 t.Fatalf("lijst:\n%s", list)
178 }
179 res, err = client.PostForm(ts.URL+"/studio/beta/-/star", url.Values{
180 "csrf": {csrfOf(t, list)}, "back": {"/groups/studio"},
181 })
182 if err != nil {
183 t.Fatal(err)
184 }
185 starred := read(t, res)
186 if !strings.Contains(starred, "★ 1") {
187 t.Fatalf("ster:\n%s", starred)
188 }
189 res, err = client.Get(ts.URL + "/groups/studio?q=alp&dir=desc")
190 if err != nil {
191 t.Fatal(err)
192 }
193 filtered := read(t, res)
194 if !strings.Contains(filtered, "alpha") || strings.Contains(filtered, "beta") {
195 t.Fatalf("zoeken:\n%s", filtered)
196 }
197
198 var buf bytes.Buffer
199 img := image.NewRGBA(image.Rect(0, 0, 800, 400))
200 for y := 0; y < 400; y++ {
201 for x := 0; x < 800; x++ {
202 img.Set(x, y, color.RGBA{R: 20, G: 80, B: 200, A: 255})
203 }
204 }
205 if err := png.Encode(&buf, img); err != nil {
206 t.Fatal(err)
207 }
208 body, contentType := multipartLogo(t, csrfOf(t, settings), buf.Bytes(), "wide.png")
209 req, err := http.NewRequest(http.MethodPost, ts.URL+"/groups/studio/logo", body)
210 if err != nil {
211 t.Fatal(err)
212 }
213 req.Header.Set("Content-Type", contentType)
214 res, err = client.Do(req)
215 if err != nil {
216 t.Fatal(err)
217 }
218 if res.StatusCode >= 400 {
219 t.Fatalf("upload %d %s", res.StatusCode, read(t, res))
220 }
221 _ = res.Body.Close()
222 res, err = client.Get(ts.URL + "/groups/studio")
223 if err != nil {
224 t.Fatal(err)
225 }
226 withLogo := read(t, res)
227 if !strings.Contains(withLogo, `/groups/studio/logo`) {
228 t.Fatalf("logo ontbreekt:\n%s", withLogo)
229 }
230 res, err = client.Get(ts.URL + "/groups/studio/logo")
231 if err != nil {
232 t.Fatal(err)
233 }
234 raw, err := io.ReadAll(res.Body)
235 res.Body.Close()
236 if err != nil {
237 t.Fatal(err)
238 }
239 got, _, err := image.Decode(bytes.NewReader(raw))
240 if err != nil {
241 t.Fatal(err)
242 }
243 if got.Bounds().Dx() != 512 || got.Bounds().Dy() != 256 {
244 t.Fatalf("geschalen %dx%d", got.Bounds().Dx(), got.Bounds().Dy())
245 }
246 res, err = client.Get(ts.URL + "/studio/beta")
247 if err != nil {
248 t.Fatal(err)
249 }
250 repoPage := read(t, res)
251 repoBody, repoType := multipartLogo(t, csrfOf(t, repoPage), buf.Bytes(), "wide.png")
252 req, err = http.NewRequest(http.MethodPost, ts.URL+"/studio/beta/-/logo", repoBody)
253 if err != nil {
254 t.Fatal(err)
255 }
256 req.Header.Set("Content-Type", repoType)
257 res, err = client.Do(req)
258 if err != nil {
259 t.Fatal(err)
260 }
261 _ = read(t, res)
262 res, err = client.Get(ts.URL + "/studio/beta")
263 if err != nil {
264 t.Fatal(err)
265 }
266 repoPage = read(t, res)
267 if !strings.Contains(repoPage, `/studio/beta/-/logo`) || strings.Contains(repoPage, `class="tile">B`) {
268 t.Fatalf("repo-logo:\n%s", repoPage)
269 }
270
271 res, err = client.Get(ts.URL + "/settings")
272 if err != nil {
273 t.Fatal(err)
274 }
275 account := read(t, res)
276 for _, lang := range []string{"nl", "de", "fr", "cuneiform"} {
277 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{
278 "csrf": {csrfOf(t, account)}, "language": {lang},
279 })
280 if err != nil {
281 t.Fatal(err)
282 }
283 switched := read(t, res)
284 account = switched
285 switch lang {
286 case "nl":
287 if !strings.Contains(switched, "Overzicht") || !strings.Contains(switched, "Taal opgeslagen") {
288 t.Fatalf("nl:\n%s", switched)
289 }
290 case "de":
291 if !strings.Contains(switched, "Übersicht") || !strings.Contains(switched, "Sprache gespeichert") {
292 t.Fatalf("de:\n%s", switched)
293 }
294 case "fr":
295 if !strings.Contains(switched, "Aperçu") || !strings.Contains(switched, "Langue enregistrée") {
296 t.Fatalf("fr:\n%s", switched)
297 }
298 case "cuneiform":
299 if !strings.Contains(switched, `class="cunei"`) {
300 t.Fatalf("lettertype:\n%s", switched)
301 }
302 found := false
303 for _, r := range switched {
304 if r >= 0x12000 && r <= 0x123FF {
305 found = true
306 break
307 }
308 }
309 if !found || !utf8.ValidString(switched) {
310 t.Fatal("geen spijkerschrift op de pagina")
311 }
312 }
313 }
314 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{
315 "csrf": {csrfOf(t, account)}, "language": {"en"},
316 })
317 if err != nil {
318 t.Fatal(err)
319 }
320 back := read(t, res)
321 if !strings.Contains(back, "Overview") || !strings.Contains(back, "Language saved") {
322 t.Fatalf("en:\n%s", back)
323 }
324 }
325
326 func multipartLogo(t *testing.T, csrf string, data []byte, name string) (*bytes.Buffer, string) {
327 t.Helper()
328 var buf bytes.Buffer
329 w := multipart.NewWriter(&buf)
330 if err := w.WriteField("csrf", csrf); err != nil {
331 t.Fatal(err)
332 }
333 part, err := w.CreateFormFile("logo", name)
334 if err != nil {
335 t.Fatal(err)
336 }
337 if _, err := part.Write(data); err != nil {
338 t.Fatal(err)
339 }
340 if err := w.Close(); err != nil {
341 t.Fatal(err)
342 }
343 return &buf, w.FormDataContentType()
344 }
@@ -0,0 +1,344 @@
1package server
2
3import (
4 "bytes"
5 "context"
6 "image"
7 "image/color"
8 "image/png"
9 "io"
10 "mime/multipart"
11 "net/http"
12 "net/http/cookiejar"
13 "net/http/httptest"
14 "net/url"
15 "os/exec"
16 "path/filepath"
17 "strings"
18 "testing"
19 "unicode/utf8"
20
21 "gitlab.com/Timfa/bluegit/internal/access"
22 "gitlab.com/Timfa/bluegit/internal/auth"
23 "gitlab.com/Timfa/bluegit/internal/config"
24 "gitlab.com/Timfa/bluegit/internal/store"
25)
26
27func TestSlugAvailabilityDefaultRoleLogoAndLanguage(t *testing.T) {
28 if _, err := exec.LookPath("git"); err != nil {
29 t.Skip("git ontbreekt")
30 }
31 storage := t.TempDir()
32 stateDir := t.TempDir()
33 st, err := store.Open(filepath.Join(stateDir, "bluegit.db"), bytes32())
34 if err != nil {
35 t.Fatal(err)
36 }
37 t.Cleanup(func() { _ = st.Close() })
38 cfg := config.Config{
39 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
40 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
41 Git: config.Git{Binary: "git", DefaultBranch: "master"},
42 }
43 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: stateDir}
44 ts := httptest.NewServer(srv.Handler())
45 t.Cleanup(ts.Close)
46 jar, _ := cookiejar.New(nil)
47 client := &http.Client{Jar: jar}
48 res, err := client.Get(ts.URL + "/login")
49 if err != nil {
50 t.Fatal(err)
51 }
52 page := read(t, res)
53 ctx := context.Background()
54
55 res, err = client.PostForm(ts.URL+"/new/group", url.Values{
56 "csrf": {csrfOf(t, page)}, "name": {"Studio"}, "default_role": {"readonly"},
57 })
58 if err != nil {
59 t.Fatal(err)
60 }
61 page = read(t, res)
62 if !strings.Contains(page, ">Studio<") || !strings.Contains(page, "Repositories") {
63 t.Fatalf("groepspagina:\n%s", page)
64 }
65 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
66 if err != nil {
67 t.Fatal(err)
68 }
69 g, err := st.GroupByPath(ctx, "studio")
70 if err != nil {
71 t.Fatal(err)
72 }
73 if g.DefaultRole != access.RoleReadonly {
74 t.Fatalf("standaardrol %s", g.DefaultRole)
75 }
76 if err := st.SetMember(ctx, "group", g.ID, "ada", access.RoleDeveloper); err != nil {
77 t.Fatal(err)
78 }
79 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
80 "csrf": {csrfOf(t, page)}, "name": {"alpha"}, "group": {"studio"}, "visibility": {"private"},
81 })
82 if err != nil {
83 t.Fatal(err)
84 }
85 page = read(t, res)
86 if !strings.Contains(page, "studio/alpha") {
87 t.Fatalf("repo:\n%s", page)
88 }
89 alpha, err := st.RepoByPath(ctx, "studio", "alpha")
90 if err != nil {
91 t.Fatal(err)
92 }
93 role, err := st.EffectiveRole(ctx, ada.ID, alpha.ID)
94 if err != nil || role != access.RoleReadonly {
95 t.Fatalf("snapshot rol %s %v", role, err)
96 }
97
98 free, err := client.Get(ts.URL + "/new/slug?kind=repo&name=gamma&owner=studio")
99 if err != nil {
100 t.Fatal(err)
101 }
102 freeBody := read(t, free)
103 if !strings.Contains(freeBody, `"available":true`) {
104 t.Fatalf("vrij: %s", freeBody)
105 }
106 taken, err := client.Get(ts.URL + "/new/slug?kind=repo&name=alpha&owner=studio")
107 if err != nil {
108 t.Fatal(err)
109 }
110 takenBody := read(t, taken)
111 if !strings.Contains(takenBody, `"available":false`) || !strings.Contains(takenBody, "studio/alpha") {
112 t.Fatalf("bezet: %s", takenBody)
113 }
114
115 res, err = client.Get(ts.URL + "/groups/studio?tab=settings")
116 if err != nil {
117 t.Fatal(err)
118 }
119 settings := read(t, res)
120 res, err = client.PostForm(ts.URL+"/groups/studio/settings", url.Values{
121 "csrf": {csrfOf(t, settings)}, "visibility": {"public"}, "default_role": {"maintainer"}, "description": {"Werk"},
122 })
123 if err != nil {
124 t.Fatal(err)
125 }
126 _ = read(t, res)
127 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
128 "csrf": {csrfOf(t, settings)}, "name": {"beta"}, "group": {"studio"}, "visibility": {"public"},
129 })
130 if err != nil {
131 t.Fatal(err)
132 }
133 if res.StatusCode >= 400 {
134 t.Fatalf("beta %d %s", res.StatusCode, read(t, res))
135 }
136 _ = res.Body.Close()
137 beta, err := st.RepoByPath(ctx, "studio", "beta")
138 if err != nil {
139 t.Fatal(err)
140 }
141 role, err = st.EffectiveRole(ctx, ada.ID, beta.ID)
142 if err != nil || role != access.RoleMaintainer {
143 t.Fatalf("nieuwe repo %s %v", role, err)
144 }
145 role, err = st.EffectiveRole(ctx, ada.ID, alpha.ID)
146 if err != nil || role != access.RoleReadonly {
147 t.Fatalf("oude repo veranderde naar %s %v", role, err)
148 }
149 bob, err := st.UpsertUser(ctx, 3, "bob", "", false)
150 if err != nil {
151 t.Fatal(err)
152 }
153 if err := st.SetMember(ctx, "group", g.ID, "bob", access.RoleDeveloper); err != nil {
154 t.Fatal(err)
155 }
156 role, err = st.EffectiveRole(ctx, bob.ID, alpha.ID)
157 if err != nil || role != access.RoleDeveloper {
158 t.Fatalf("later lid %s %v", role, err)
159 }
160
161 anon := &http.Client{}
162 res, err = anon.Get(ts.URL + "/groups/studio")
163 if err != nil {
164 t.Fatal(err)
165 }
166 pub := read(t, res)
167 if res.StatusCode != 200 || strings.Contains(pub, "alpha") || !strings.Contains(pub, "beta") {
168 t.Fatalf("openbare groep %d\n%s", res.StatusCode, pub)
169 }
170
171 res, err = client.Get(ts.URL + "/groups/studio")
172 if err != nil {
173 t.Fatal(err)
174 }
175 list := read(t, res)
176 if !strings.Contains(list, "Activity") || !strings.Contains(list, "Created ") || !strings.Contains(list, "★") {
177 t.Fatalf("lijst:\n%s", list)
178 }
179 res, err = client.PostForm(ts.URL+"/studio/beta/-/star", url.Values{
180 "csrf": {csrfOf(t, list)}, "back": {"/groups/studio"},
181 })
182 if err != nil {
183 t.Fatal(err)
184 }
185 starred := read(t, res)
186 if !strings.Contains(starred, "★ 1") {
187 t.Fatalf("ster:\n%s", starred)
188 }
189 res, err = client.Get(ts.URL + "/groups/studio?q=alp&dir=desc")
190 if err != nil {
191 t.Fatal(err)
192 }
193 filtered := read(t, res)
194 if !strings.Contains(filtered, "alpha") || strings.Contains(filtered, "beta") {
195 t.Fatalf("zoeken:\n%s", filtered)
196 }
197
198 var buf bytes.Buffer
199 img := image.NewRGBA(image.Rect(0, 0, 800, 400))
200 for y := 0; y < 400; y++ {
201 for x := 0; x < 800; x++ {
202 img.Set(x, y, color.RGBA{R: 20, G: 80, B: 200, A: 255})
203 }
204 }
205 if err := png.Encode(&buf, img); err != nil {
206 t.Fatal(err)
207 }
208 body, contentType := multipartLogo(t, csrfOf(t, settings), buf.Bytes(), "wide.png")
209 req, err := http.NewRequest(http.MethodPost, ts.URL+"/groups/studio/logo", body)
210 if err != nil {
211 t.Fatal(err)
212 }
213 req.Header.Set("Content-Type", contentType)
214 res, err = client.Do(req)
215 if err != nil {
216 t.Fatal(err)
217 }
218 if res.StatusCode >= 400 {
219 t.Fatalf("upload %d %s", res.StatusCode, read(t, res))
220 }
221 _ = res.Body.Close()
222 res, err = client.Get(ts.URL + "/groups/studio")
223 if err != nil {
224 t.Fatal(err)
225 }
226 withLogo := read(t, res)
227 if !strings.Contains(withLogo, `/groups/studio/logo`) {
228 t.Fatalf("logo ontbreekt:\n%s", withLogo)
229 }
230 res, err = client.Get(ts.URL + "/groups/studio/logo")
231 if err != nil {
232 t.Fatal(err)
233 }
234 raw, err := io.ReadAll(res.Body)
235 res.Body.Close()
236 if err != nil {
237 t.Fatal(err)
238 }
239 got, _, err := image.Decode(bytes.NewReader(raw))
240 if err != nil {
241 t.Fatal(err)
242 }
243 if got.Bounds().Dx() != 512 || got.Bounds().Dy() != 256 {
244 t.Fatalf("geschalen %dx%d", got.Bounds().Dx(), got.Bounds().Dy())
245 }
246 res, err = client.Get(ts.URL + "/studio/beta")
247 if err != nil {
248 t.Fatal(err)
249 }
250 repoPage := read(t, res)
251 repoBody, repoType := multipartLogo(t, csrfOf(t, repoPage), buf.Bytes(), "wide.png")
252 req, err = http.NewRequest(http.MethodPost, ts.URL+"/studio/beta/-/logo", repoBody)
253 if err != nil {
254 t.Fatal(err)
255 }
256 req.Header.Set("Content-Type", repoType)
257 res, err = client.Do(req)
258 if err != nil {
259 t.Fatal(err)
260 }
261 _ = read(t, res)
262 res, err = client.Get(ts.URL + "/studio/beta")
263 if err != nil {
264 t.Fatal(err)
265 }
266 repoPage = read(t, res)
267 if !strings.Contains(repoPage, `/studio/beta/-/logo`) || strings.Contains(repoPage, `class="tile">B`) {
268 t.Fatalf("repo-logo:\n%s", repoPage)
269 }
270
271 res, err = client.Get(ts.URL + "/settings")
272 if err != nil {
273 t.Fatal(err)
274 }
275 account := read(t, res)
276 for _, lang := range []string{"nl", "de", "fr", "cuneiform"} {
277 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{
278 "csrf": {csrfOf(t, account)}, "language": {lang},
279 })
280 if err != nil {
281 t.Fatal(err)
282 }
283 switched := read(t, res)
284 account = switched
285 switch lang {
286 case "nl":
287 if !strings.Contains(switched, "Overzicht") || !strings.Contains(switched, "Taal opgeslagen") {
288 t.Fatalf("nl:\n%s", switched)
289 }
290 case "de":
291 if !strings.Contains(switched, "Übersicht") || !strings.Contains(switched, "Sprache gespeichert") {
292 t.Fatalf("de:\n%s", switched)
293 }
294 case "fr":
295 if !strings.Contains(switched, "Aperçu") || !strings.Contains(switched, "Langue enregistrée") {
296 t.Fatalf("fr:\n%s", switched)
297 }
298 case "cuneiform":
299 if !strings.Contains(switched, `class="cunei"`) {
300 t.Fatalf("lettertype:\n%s", switched)
301 }
302 found := false
303 for _, r := range switched {
304 if r >= 0x12000 && r <= 0x123FF {
305 found = true
306 break
307 }
308 }
309 if !found || !utf8.ValidString(switched) {
310 t.Fatal("geen spijkerschrift op de pagina")
311 }
312 }
313 }
314 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{
315 "csrf": {csrfOf(t, account)}, "language": {"en"},
316 })
317 if err != nil {
318 t.Fatal(err)
319 }
320 back := read(t, res)
321 if !strings.Contains(back, "Overview") || !strings.Contains(back, "Language saved") {
322 t.Fatalf("en:\n%s", back)
323 }
324}
325
326func multipartLogo(t *testing.T, csrf string, data []byte, name string) (*bytes.Buffer, string) {
327 t.Helper()
328 var buf bytes.Buffer
329 w := multipart.NewWriter(&buf)
330 if err := w.WriteField("csrf", csrf); err != nil {
331 t.Fatal(err)
332 }
333 part, err := w.CreateFormFile("logo", name)
334 if err != nil {
335 t.Fatal(err)
336 }
337 if _, err := part.Write(data); err != nil {
338 t.Fatal(err)
339 }
340 if err := w.Close(); err != nil {
341 t.Fatal(err)
342 }
343 return &buf, w.FormDataContentType()
344}
internal/server/git_http.go +4 −4
@@ -11,7 +11,7 @@ import (
11 11
12 12 func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
13 13 if s.StoragePath() == "" {
14 http.Error(w, noStorageMsg, http.StatusServiceUnavailable)
14 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
15 15 return
16 16 }
17 17 owner := r.PathValue("owner")
@@ -33,7 +33,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
33 33 if authed {
34 34 role, err = s.Store.EffectiveRole(r.Context(), user.ID, repo.ID)
35 35 if err != nil {
36 http.Error(w, "rechten", http.StatusInternalServerError)
36 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
37 37 return
38 38 }
39 39 }
@@ -43,7 +43,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
43 43 return
44 44 }
45 45 if !role.CanWriteCode() {
46 http.Error(w, "geen schrijfrechten", http.StatusForbidden)
46 http.Error(w, s.tr(r, "err.noWrite"), http.StatusForbidden)
47 47 return
48 48 }
49 49 } else if !role.CanRead() && repo.Visibility != "public" {
@@ -51,7 +51,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
51 51 s.askAuth(w)
52 52 return
53 53 }
54 http.Error(w, "geen leesrechten", http.StatusForbidden)
54 http.Error(w, s.tr(r, "err.noRead"), http.StatusForbidden)
55 55 return
56 56 }
57 57 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
@@ -11,7 +11,7 @@ import (
11
11
12func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
12func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
13 if s.StoragePath() == "" {
13 if s.StoragePath() == "" {
14 http.Error(w, noStorageMsg, http.StatusServiceUnavailable)
14 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
15 return
15 return
16 }
16 }
17 owner := r.PathValue("owner")
17 owner := r.PathValue("owner")
@@ -33,7 +33,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
33 if authed {
33 if authed {
34 role, err = s.Store.EffectiveRole(r.Context(), user.ID, repo.ID)
34 role, err = s.Store.EffectiveRole(r.Context(), user.ID, repo.ID)
35 if err != nil {
35 if err != nil {
36 http.Error(w, "rechten", http.StatusInternalServerError)
36 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
37 return
37 return
38 }
38 }
39 }
39 }
@@ -43,7 +43,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
43 return
43 return
44 }
44 }
45 if !role.CanWriteCode() {
45 if !role.CanWriteCode() {
46 http.Error(w, "geen schrijfrechten", http.StatusForbidden)
46 http.Error(w, s.tr(r, "err.noWrite"), http.StatusForbidden)
47 return
47 return
48 }
48 }
49 } else if !role.CanRead() && repo.Visibility != "public" {
49 } else if !role.CanRead() && repo.Visibility != "public" {
@@ -51,7 +51,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
51 s.askAuth(w)
51 s.askAuth(w)
52 return
52 return
53 }
53 }
54 http.Error(w, "geen leesrechten", http.StatusForbidden)
54 http.Error(w, s.tr(r, "err.noRead"), http.StatusForbidden)
55 return
55 return
56 }
56 }
57 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
57 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
internal/server/media.go added +223 −0
@@ -0,0 +1,223 @@
1 package server
2
3 import (
4 "bytes"
5 "encoding/json"
6 "io"
7 "net/http"
8 "os"
9 "path/filepath"
10 "strconv"
11 "strings"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/access"
15 "gitlab.com/Timfa/bluegit/internal/i18n"
16 "gitlab.com/Timfa/bluegit/internal/logo"
17 )
18
19 func wantsModal(r *http.Request) bool {
20 return r.Header.Get("X-BlueGit") == "modal"
21 }
22
23 func writeModal(w http.ResponseWriter, ok bool, url, problem string, status int) {
24 if status == 0 {
25 status = http.StatusOK
26 }
27 w.Header().Set("Content-Type", "application/json; charset=utf-8")
28 w.WriteHeader(status)
29 _ = json.NewEncoder(w).Encode(map[string]any{"ok": ok, "url": url, "error": problem})
30 }
31
32 func (s *Server) finishCreate(w http.ResponseWriter, r *http.Request, path, notice string) {
33 if wantsModal(r) {
34 writeModal(w, true, path, "", http.StatusOK)
35 return
36 }
37 s.redirect(w, r, path, notice, "")
38 }
39
40 func (s *Server) failCreate(w http.ResponseWriter, r *http.Request, problem string) {
41 if wantsModal(r) {
42 writeModal(w, false, "", problem, http.StatusBadRequest)
43 return
44 }
45 s.redirect(w, r, "/new", "", problem)
46 }
47
48 func (s *Server) csrfValue(w http.ResponseWriter, r *http.Request) bool {
49 p := s.who(r)
50 if !p.OK || r.FormValue("csrf") == "" || r.FormValue("csrf") != p.Session.CSRF {
51 http.Error(w, s.tr(r, "err.badCSRF"), http.StatusBadRequest)
52 return false
53 }
54 return true
55 }
56
57 func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {
58 u, ok := s.loginRequired(w, r)
59 if !ok || !s.csrfOK(w, r) {
60 return
61 }
62 lang := i18n.Parse(r.FormValue("language"))
63 if err := s.Store.SetLanguage(r.Context(), u.ID, string(lang)); err != nil {
64 s.redirect(w, r, "/settings", "", s.trErr(r, err))
65 return
66 }
67 s.redirect(w, r, "/settings", i18n.T(lang, "flash.language"), "")
68 }
69
70 func (s *Server) saveGroup(w http.ResponseWriter, r *http.Request) {
71 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
72 if !ok || !s.csrfOK(w, r) {
73 return
74 }
75 vis := r.FormValue("visibility")
76 if vis != "public" {
77 vis = "private"
78 }
79 role := g.DefaultRole
80 if raw := strings.TrimSpace(r.FormValue("default_role")); raw != "" {
81 parsed, err := access.ParseRole(raw)
82 if err != nil {
83 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
84 return
85 }
86 role = parsed
87 }
88 if err := s.Store.UpdateGroup(r.Context(), g.ID, r.FormValue("description"), vis, role); err != nil {
89 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
90 return
91 }
92 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", s.tr(r, "flash.saved"), "")
93 }
94
95 func (s *Server) toggleStar(w http.ResponseWriter, r *http.Request) {
96 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
97 if !ok || !s.csrfOK(w, r) {
98 return
99 }
100 if u.ID == 0 {
101 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
102 return
103 }
104 _, mine, err := s.Store.StarInfo(r.Context(), u.ID, []int64{repo.ID})
105 if err != nil {
106 s.redirect(w, r, repoURL(repo), "", s.trErr(r, err))
107 return
108 }
109 if err := s.Store.SetStar(r.Context(), u.ID, repo.ID, !mine[repo.ID]); err != nil {
110 s.redirect(w, r, repoURL(repo), "", s.trErr(r, err))
111 return
112 }
113 back := r.FormValue("back")
114 if !strings.HasPrefix(back, "/") || strings.HasPrefix(back, "//") || strings.Contains(back, "://") {
115 back = repoURL(repo)
116 }
117 s.redirect(w, r, back, s.tr(r, "flash.star"), "")
118 }
119
120 func (s *Server) repoLogo(w http.ResponseWriter, r *http.Request) {
121 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
122 if !ok {
123 return
124 }
125 s.serveLogo(w, r, "repo", repo.ID, repo.LogoMIME)
126 }
127
128 func (s *Server) groupLogo(w http.ResponseWriter, r *http.Request) {
129 g, _, ok := s.guardGroup(w, r, access.RoleReadonly)
130 if !ok {
131 return
132 }
133 s.serveLogo(w, r, "group", g.ID, g.LogoMIME)
134 }
135
136 func (s *Server) uploadRepoLogo(w http.ResponseWriter, r *http.Request) {
137 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
138 if !ok || !s.readUpload(w, r) {
139 return
140 }
141 if err := s.storeLogo(r, "repo", repo.ID); err != nil {
142 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.trErr(r, err))
143 return
144 }
145 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.logo"), "")
146 }
147
148 func (s *Server) uploadGroupLogo(w http.ResponseWriter, r *http.Request) {
149 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
150 if !ok || !s.readUpload(w, r) {
151 return
152 }
153 if err := s.storeLogo(r, "group", g.ID); err != nil {
154 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
155 return
156 }
157 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", s.tr(r, "flash.logo"), "")
158 }
159
160 func (s *Server) readUpload(w http.ResponseWriter, r *http.Request) bool {
161 if err := r.ParseMultipartForm(logo.MaxUpload + 4096); err != nil {
162 http.Error(w, s.tr(r, "err.badForm"), http.StatusBadRequest)
163 return false
164 }
165 return s.csrfValue(w, r)
166 }
167
168 func (s *Server) storeLogo(r *http.Request, kind string, id int64) error {
169 f, hdr, err := r.FormFile("logo")
170 if err != nil {
171 return i18n.E("err.logoRead")
172 }
173 defer f.Close()
174 if hdr.Size > logo.MaxUpload {
175 return i18n.E("err.logoBig")
176 }
177 raw, err := io.ReadAll(io.LimitReader(f, logo.MaxUpload+1))
178 if err != nil {
179 return i18n.E("err.logoRead")
180 }
181 data, mime, err := logo.Normalize(raw)
182 if err != nil {
183 return err
184 }
185 path, err := s.logoPath(kind, id)
186 if err != nil {
187 return err
188 }
189 if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
190 return i18n.E("err.logoStore")
191 }
192 if err := os.WriteFile(path, data, 0o644); err != nil {
193 return i18n.E("err.logoStore")
194 }
195 return s.Store.SetLogoMIME(r.Context(), kind, id, mime)
196 }
197
198 func (s *Server) serveLogo(w http.ResponseWriter, r *http.Request, kind string, id int64, mime string) {
199 if mime == "" {
200 http.NotFound(w, r)
201 return
202 }
203 path, err := s.logoPath(kind, id)
204 if err != nil {
205 http.NotFound(w, r)
206 return
207 }
208 data, err := os.ReadFile(path)
209 if err != nil {
210 http.NotFound(w, r)
211 return
212 }
213 w.Header().Set("Content-Type", mime)
214 w.Header().Set("Cache-Control", "private, max-age=60")
215 http.ServeContent(w, r, "", time.Time{}, bytes.NewReader(data))
216 }
217
218 func (s *Server) logoPath(kind string, id int64) (string, error) {
219 if s.StateDir == "" {
220 return "", i18n.E("err.logoStore")
221 }
222 return filepath.Join(s.StateDir, "logos", kind+"-"+strconv.FormatInt(id, 10)), nil
223 }
@@ -0,0 +1,223 @@
1package server
2
3import (
4 "bytes"
5 "encoding/json"
6 "io"
7 "net/http"
8 "os"
9 "path/filepath"
10 "strconv"
11 "strings"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/access"
15 "gitlab.com/Timfa/bluegit/internal/i18n"
16 "gitlab.com/Timfa/bluegit/internal/logo"
17)
18
19func wantsModal(r *http.Request) bool {
20 return r.Header.Get("X-BlueGit") == "modal"
21}
22
23func writeModal(w http.ResponseWriter, ok bool, url, problem string, status int) {
24 if status == 0 {
25 status = http.StatusOK
26 }
27 w.Header().Set("Content-Type", "application/json; charset=utf-8")
28 w.WriteHeader(status)
29 _ = json.NewEncoder(w).Encode(map[string]any{"ok": ok, "url": url, "error": problem})
30}
31
32func (s *Server) finishCreate(w http.ResponseWriter, r *http.Request, path, notice string) {
33 if wantsModal(r) {
34 writeModal(w, true, path, "", http.StatusOK)
35 return
36 }
37 s.redirect(w, r, path, notice, "")
38}
39
40func (s *Server) failCreate(w http.ResponseWriter, r *http.Request, problem string) {
41 if wantsModal(r) {
42 writeModal(w, false, "", problem, http.StatusBadRequest)
43 return
44 }
45 s.redirect(w, r, "/new", "", problem)
46}
47
48func (s *Server) csrfValue(w http.ResponseWriter, r *http.Request) bool {
49 p := s.who(r)
50 if !p.OK || r.FormValue("csrf") == "" || r.FormValue("csrf") != p.Session.CSRF {
51 http.Error(w, s.tr(r, "err.badCSRF"), http.StatusBadRequest)
52 return false
53 }
54 return true
55}
56
57func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {
58 u, ok := s.loginRequired(w, r)
59 if !ok || !s.csrfOK(w, r) {
60 return
61 }
62 lang := i18n.Parse(r.FormValue("language"))
63 if err := s.Store.SetLanguage(r.Context(), u.ID, string(lang)); err != nil {
64 s.redirect(w, r, "/settings", "", s.trErr(r, err))
65 return
66 }
67 s.redirect(w, r, "/settings", i18n.T(lang, "flash.language"), "")
68}
69
70func (s *Server) saveGroup(w http.ResponseWriter, r *http.Request) {
71 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
72 if !ok || !s.csrfOK(w, r) {
73 return
74 }
75 vis := r.FormValue("visibility")
76 if vis != "public" {
77 vis = "private"
78 }
79 role := g.DefaultRole
80 if raw := strings.TrimSpace(r.FormValue("default_role")); raw != "" {
81 parsed, err := access.ParseRole(raw)
82 if err != nil {
83 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
84 return
85 }
86 role = parsed
87 }
88 if err := s.Store.UpdateGroup(r.Context(), g.ID, r.FormValue("description"), vis, role); err != nil {
89 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
90 return
91 }
92 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", s.tr(r, "flash.saved"), "")
93}
94
95func (s *Server) toggleStar(w http.ResponseWriter, r *http.Request) {
96 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
97 if !ok || !s.csrfOK(w, r) {
98 return
99 }
100 if u.ID == 0 {
101 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
102 return
103 }
104 _, mine, err := s.Store.StarInfo(r.Context(), u.ID, []int64{repo.ID})
105 if err != nil {
106 s.redirect(w, r, repoURL(repo), "", s.trErr(r, err))
107 return
108 }
109 if err := s.Store.SetStar(r.Context(), u.ID, repo.ID, !mine[repo.ID]); err != nil {
110 s.redirect(w, r, repoURL(repo), "", s.trErr(r, err))
111 return
112 }
113 back := r.FormValue("back")
114 if !strings.HasPrefix(back, "/") || strings.HasPrefix(back, "//") || strings.Contains(back, "://") {
115 back = repoURL(repo)
116 }
117 s.redirect(w, r, back, s.tr(r, "flash.star"), "")
118}
119
120func (s *Server) repoLogo(w http.ResponseWriter, r *http.Request) {
121 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
122 if !ok {
123 return
124 }
125 s.serveLogo(w, r, "repo", repo.ID, repo.LogoMIME)
126}
127
128func (s *Server) groupLogo(w http.ResponseWriter, r *http.Request) {
129 g, _, ok := s.guardGroup(w, r, access.RoleReadonly)
130 if !ok {
131 return
132 }
133 s.serveLogo(w, r, "group", g.ID, g.LogoMIME)
134}
135
136func (s *Server) uploadRepoLogo(w http.ResponseWriter, r *http.Request) {
137 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
138 if !ok || !s.readUpload(w, r) {
139 return
140 }
141 if err := s.storeLogo(r, "repo", repo.ID); err != nil {
142 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.trErr(r, err))
143 return
144 }
145 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.logo"), "")
146}
147
148func (s *Server) uploadGroupLogo(w http.ResponseWriter, r *http.Request) {
149 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
150 if !ok || !s.readUpload(w, r) {
151 return
152 }
153 if err := s.storeLogo(r, "group", g.ID); err != nil {
154 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
155 return
156 }
157 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", s.tr(r, "flash.logo"), "")
158}
159
160func (s *Server) readUpload(w http.ResponseWriter, r *http.Request) bool {
161 if err := r.ParseMultipartForm(logo.MaxUpload + 4096); err != nil {
162 http.Error(w, s.tr(r, "err.badForm"), http.StatusBadRequest)
163 return false
164 }
165 return s.csrfValue(w, r)
166}
167
168func (s *Server) storeLogo(r *http.Request, kind string, id int64) error {
169 f, hdr, err := r.FormFile("logo")
170 if err != nil {
171 return i18n.E("err.logoRead")
172 }
173 defer f.Close()
174 if hdr.Size > logo.MaxUpload {
175 return i18n.E("err.logoBig")
176 }
177 raw, err := io.ReadAll(io.LimitReader(f, logo.MaxUpload+1))
178 if err != nil {
179 return i18n.E("err.logoRead")
180 }
181 data, mime, err := logo.Normalize(raw)
182 if err != nil {
183 return err
184 }
185 path, err := s.logoPath(kind, id)
186 if err != nil {
187 return err
188 }
189 if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
190 return i18n.E("err.logoStore")
191 }
192 if err := os.WriteFile(path, data, 0o644); err != nil {
193 return i18n.E("err.logoStore")
194 }
195 return s.Store.SetLogoMIME(r.Context(), kind, id, mime)
196}
197
198func (s *Server) serveLogo(w http.ResponseWriter, r *http.Request, kind string, id int64, mime string) {
199 if mime == "" {
200 http.NotFound(w, r)
201 return
202 }
203 path, err := s.logoPath(kind, id)
204 if err != nil {
205 http.NotFound(w, r)
206 return
207 }
208 data, err := os.ReadFile(path)
209 if err != nil {
210 http.NotFound(w, r)
211 return
212 }
213 w.Header().Set("Content-Type", mime)
214 w.Header().Set("Cache-Control", "private, max-age=60")
215 http.ServeContent(w, r, "", time.Time{}, bytes.NewReader(data))
216}
217
218func (s *Server) logoPath(kind string, id int64) (string, error) {
219 if s.StateDir == "" {
220 return "", i18n.E("err.logoStore")
221 }
222 return filepath.Join(s.StateDir, "logos", kind+"-"+strconv.FormatInt(id, 10)), nil
223}
internal/server/project.go +13 −79
@@ -7,11 +7,11 @@ import (
7 7 "path"
8 8 "sort"
9 9 "strings"
10 "time"
11 10
12 11 "gitlab.com/Timfa/bluegit/internal/access"
13 12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
14 13 "gitlab.com/Timfa/bluegit/internal/highlight"
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15 15 "gitlab.com/Timfa/bluegit/internal/markdown"
16 16 "gitlab.com/Timfa/bluegit/internal/store"
17 17 )
@@ -20,14 +20,15 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
20 20 v.Page = "overview"
21 21 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
22 22 s.branchList(r, v, dir)
23 lang := i18n.Parse(v.Lang)
23 24 if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
24 row := commitRow(c)
25 row := commitRow(c, lang)
25 26 v.Head = &row
26 27 }
27 28 entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
28 29 touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
29 30 if err == nil {
30 v.Files = fileRows(entries, "", touch)
31 v.Files = fileRows(entries, "", touch, lang)
31 32 }
32 33 readme, license := findDocs(entries)
33 34 v.LicensePath = license
@@ -44,12 +45,13 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
44 45 if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
45 46 v.NReleases = len(rels)
46 47 }
47 v.Created = dutchDate(repo.CreatedAt)
48 v.Created = i18n.FormatDate(lang, repo.CreatedAt)
48 49 }
49 50
50 51 func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string, isFile bool) {
51 52 v.Page = "files"
52 53 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
54 lang := i18n.Parse(v.Lang)
53 55 s.branchList(r, v, dir)
54 56 all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)
55 57 v.Tree = treeRows(all, rel)
@@ -58,7 +60,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
58 60 entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)
59 61 touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
60 62 if err == nil {
61 v.Files = fileRows(entries, rel, touch)
63 v.Files = fileRows(entries, rel, touch, lang)
62 64 }
63 65 return
64 66 }
@@ -78,7 +80,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
78 80 v.BlobSize = formatSize(n)
79 81 }
80 82 if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
81 row := commitRow(c)
83 row := commitRow(c, lang)
82 84 v.Head = &row
83 85 }
84 86 }
@@ -104,21 +106,21 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
104 106 if !ok {
105 107 return
106 108 }
107 v := s.repoView(w, r, repo, role, "Tags")
109 v := s.repoView(w, r, repo, role, "title.tags")
108 110 v.Wide = true
109 111 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
110 112 v.TagNames, _ = gitrepo.Tags(r.Context(), s.Git, dir)
111 113 s.render(w, "tags", v)
112 114 }
113 115
114 func commitRow(c gitrepo.Commit) CommitRow {
116 func commitRow(c gitrepo.Commit, lang i18n.Lang) CommitRow {
115 117 return CommitRow{
116 118 SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,
117 Subject: c.Subject, Body: c.Body, When: ago(c.Unix),
119 Subject: c.Subject, Body: c.Body, When: i18n.Ago(lang, c.Unix),
118 120 }
119 121 }
120 122
121 func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit) []FileRow {
123 func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {
122 124 var out []FileRow
123 125 for _, e := range entries {
124 126 p := e.Name
@@ -128,7 +130,7 @@ func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Com
128 130 row := FileRow{Name: e.Name, Path: p, Dir: e.Type == "tree", Icon: fileIcon(e.Name, e.Type)}
129 131 if c, ok := touch[p]; ok {
130 132 row.Subject = c.Subject
131 row.When = ago(c.Unix)
133 row.When = i18n.Ago(lang, c.Unix)
132 134 row.SHA = c.SHA
133 135 }
134 136 out = append(out, row)
@@ -219,74 +221,6 @@ func fileIcon(name, typ string) string {
219 221 return "file"
220 222 }
221 223
222 func ago(unix int64) string {
223 if unix <= 0 {
224 return ""
225 }
226 d := time.Since(time.Unix(unix, 0))
227 if d < time.Minute {
228 return "zojuist"
229 }
230 if d < time.Hour {
231 n := int(d.Minutes())
232 if n < 1 {
233 n = 1
234 }
235 if n == 1 {
236 return "1 minuut geleden"
237 }
238 return fmt.Sprintf("%d minuten geleden", n)
239 }
240 if d < 24*time.Hour {
241 n := int(d.Hours())
242 if n == 1 {
243 return "1 uur geleden"
244 }
245 return fmt.Sprintf("%d uur geleden", n)
246 }
247 days := int(d.Hours() / 24)
248 if days < 1 {
249 days = 1
250 }
251 if days == 1 {
252 return "1 dag geleden"
253 }
254 if days < 14 {
255 return fmt.Sprintf("%d dagen geleden", days)
256 }
257 if days < 60 {
258 n := days / 7
259 if n == 1 {
260 return "1 week geleden"
261 }
262 return fmt.Sprintf("%d weken geleden", n)
263 }
264 if days < 365 {
265 n := days / 30
266 if n < 1 {
267 n = 1
268 }
269 if n == 1 {
270 return "1 maand geleden"
271 }
272 return fmt.Sprintf("%d maanden geleden", n)
273 }
274 n := days / 365
275 if n == 1 {
276 return "1 jaar geleden"
277 }
278 return fmt.Sprintf("%d jaar geleden", n)
279 }
280
281 func dutchDate(t time.Time) string {
282 if t.IsZero() {
283 return ""
284 }
285 months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
286 t = t.Local()
287 return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
288 }
289
290 224 func formatSize(n int64) string {
291 225 if n < 1024 {
292 226 return fmt.Sprintf("%d B", n)
@@ -7,11 +7,11 @@ import (
7 "path"
7 "path"
8 "sort"
8 "sort"
9 "strings"
9 "strings"
10 "time"
11
10
12 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
14 "gitlab.com/Timfa/bluegit/internal/highlight"
13 "gitlab.com/Timfa/bluegit/internal/highlight"
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15 "gitlab.com/Timfa/bluegit/internal/markdown"
15 "gitlab.com/Timfa/bluegit/internal/markdown"
16 "gitlab.com/Timfa/bluegit/internal/store"
16 "gitlab.com/Timfa/bluegit/internal/store"
17)
17)
@@ -20,14 +20,15 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
20 v.Page = "overview"
20 v.Page = "overview"
21 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
21 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
22 s.branchList(r, v, dir)
22 s.branchList(r, v, dir)
23 lang := i18n.Parse(v.Lang)
23 if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
24 if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
24 row := commitRow(c)
25 row := commitRow(c, lang)
25 v.Head = &row
26 v.Head = &row
26 }
27 }
27 entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
28 entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
28 touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
29 touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
29 if err == nil {
30 if err == nil {
30 v.Files = fileRows(entries, "", touch)
31 v.Files = fileRows(entries, "", touch, lang)
31 }
32 }
32 readme, license := findDocs(entries)
33 readme, license := findDocs(entries)
33 v.LicensePath = license
34 v.LicensePath = license
@@ -44,12 +45,13 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
44 if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
45 if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
45 v.NReleases = len(rels)
46 v.NReleases = len(rels)
46 }
47 }
47 v.Created = dutchDate(repo.CreatedAt)
48 v.Created = i18n.FormatDate(lang, repo.CreatedAt)
48}
49}
49
50
50func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string, isFile bool) {
51func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string, isFile bool) {
51 v.Page = "files"
52 v.Page = "files"
52 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
53 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
54 lang := i18n.Parse(v.Lang)
53 s.branchList(r, v, dir)
55 s.branchList(r, v, dir)
54 all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)
56 all, _ := gitrepo.TreeAll(r.Context(), s.Git, dir, v.Rev)
55 v.Tree = treeRows(all, rel)
57 v.Tree = treeRows(all, rel)
@@ -58,7 +60,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
58 entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)
60 entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, rel)
59 touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
61 touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
60 if err == nil {
62 if err == nil {
61 v.Files = fileRows(entries, rel, touch)
63 v.Files = fileRows(entries, rel, touch, lang)
62 }
64 }
63 return
65 return
64 }
66 }
@@ -78,7 +80,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
78 v.BlobSize = formatSize(n)
80 v.BlobSize = formatSize(n)
79 }
81 }
80 if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
82 if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
81 row := commitRow(c)
83 row := commitRow(c, lang)
82 v.Head = &row
84 v.Head = &row
83 }
85 }
84}
86}
@@ -104,21 +106,21 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
104 if !ok {
106 if !ok {
105 return
107 return
106 }
108 }
107 v := s.repoView(w, r, repo, role, "Tags")
109 v := s.repoView(w, r, repo, role, "title.tags")
108 v.Wide = true
110 v.Wide = true
109 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
111 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
110 v.TagNames, _ = gitrepo.Tags(r.Context(), s.Git, dir)
112 v.TagNames, _ = gitrepo.Tags(r.Context(), s.Git, dir)
111 s.render(w, "tags", v)
113 s.render(w, "tags", v)
112}
114}
113
115
114func commitRow(c gitrepo.Commit) CommitRow {
116func commitRow(c gitrepo.Commit, lang i18n.Lang) CommitRow {
115 return CommitRow{
117 return CommitRow{
116 SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,
118 SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,
117 Subject: c.Subject, Body: c.Body, When: ago(c.Unix),
119 Subject: c.Subject, Body: c.Body, When: i18n.Ago(lang, c.Unix),
118 }
120 }
119}
121}
120
122
121func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit) []FileRow {
123func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {
122 var out []FileRow
124 var out []FileRow
123 for _, e := range entries {
125 for _, e := range entries {
124 p := e.Name
126 p := e.Name
@@ -128,7 +130,7 @@ func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Com
128 row := FileRow{Name: e.Name, Path: p, Dir: e.Type == "tree", Icon: fileIcon(e.Name, e.Type)}
130 row := FileRow{Name: e.Name, Path: p, Dir: e.Type == "tree", Icon: fileIcon(e.Name, e.Type)}
129 if c, ok := touch[p]; ok {
131 if c, ok := touch[p]; ok {
130 row.Subject = c.Subject
132 row.Subject = c.Subject
131 row.When = ago(c.Unix)
133 row.When = i18n.Ago(lang, c.Unix)
132 row.SHA = c.SHA
134 row.SHA = c.SHA
133 }
135 }
134 out = append(out, row)
136 out = append(out, row)
@@ -219,74 +221,6 @@ func fileIcon(name, typ string) string {
219 return "file"
221 return "file"
220}
222}
221
223
222func ago(unix int64) string {
223 if unix <= 0 {
224 return ""
225 }
226 d := time.Since(time.Unix(unix, 0))
227 if d < time.Minute {
228 return "zojuist"
229 }
230 if d < time.Hour {
231 n := int(d.Minutes())
232 if n < 1 {
233 n = 1
234 }
235 if n == 1 {
236 return "1 minuut geleden"
237 }
238 return fmt.Sprintf("%d minuten geleden", n)
239 }
240 if d < 24*time.Hour {
241 n := int(d.Hours())
242 if n == 1 {
243 return "1 uur geleden"
244 }
245 return fmt.Sprintf("%d uur geleden", n)
246 }
247 days := int(d.Hours() / 24)
248 if days < 1 {
249 days = 1
250 }
251 if days == 1 {
252 return "1 dag geleden"
253 }
254 if days < 14 {
255 return fmt.Sprintf("%d dagen geleden", days)
256 }
257 if days < 60 {
258 n := days / 7
259 if n == 1 {
260 return "1 week geleden"
261 }
262 return fmt.Sprintf("%d weken geleden", n)
263 }
264 if days < 365 {
265 n := days / 30
266 if n < 1 {
267 n = 1
268 }
269 if n == 1 {
270 return "1 maand geleden"
271 }
272 return fmt.Sprintf("%d maanden geleden", n)
273 }
274 n := days / 365
275 if n == 1 {
276 return "1 jaar geleden"
277 }
278 return fmt.Sprintf("%d jaar geleden", n)
279}
280
281func dutchDate(t time.Time) string {
282 if t.IsZero() {
283 return ""
284 }
285 months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
286 t = t.Local()
287 return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
288}
289
290func formatSize(n int64) string {
224func formatSize(n int64) string {
291 if n < 1024 {
225 if n < 1024 {
292 return fmt.Sprintf("%d B", n)
226 return fmt.Sprintf("%d B", n)
internal/server/repo_handlers.go +52 −37
@@ -7,6 +7,7 @@ import (
7 7
8 8 "gitlab.com/Timfa/bluegit/internal/access"
9 9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
10 11 "gitlab.com/Timfa/bluegit/internal/names"
11 12 "gitlab.com/Timfa/bluegit/internal/store"
12 13 )
@@ -24,21 +25,21 @@ func (s *Server) guard(w http.ResponseWriter, r *http.Request, min access.Role)
24 25 if p.OK {
25 26 role, err = s.Store.EffectiveRole(r.Context(), p.User.ID, repo.ID)
26 27 if err != nil {
27 http.Error(w, "rechten", http.StatusInternalServerError)
28 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
28 29 return store.User{}, store.Repo{}, "", false
29 30 }
30 31 }
31 32 readable := role.CanRead() || repo.Visibility == "public"
32 33 if !readable {
33 34 if p.OK {
34 http.Error(w, "geen toegang", http.StatusForbidden)
35 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
35 36 } else {
36 37 http.NotFound(w, r)
37 38 }
38 39 return store.User{}, store.Repo{}, "", false
39 40 }
40 41 if min != access.RoleReadonly && !role.AtLeast(min) {
41 http.Error(w, "geen toegang", http.StatusForbidden)
42 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
42 43 return store.User{}, store.Repo{}, "", false
43 44 }
44 45 return p.User, repo, role, true
@@ -64,7 +65,7 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
64 65 v := s.repoView(w, r, repo, role, repo.Name)
65 66 v.Wide = true
66 67 s.fillOverview(r, &v, repo)
67 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID})
68 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID}, s.langOf(r))
68 69 s.render(w, "repo", v)
69 70 }
70 71
@@ -120,7 +121,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {
120 121 if !ok {
121 122 return
122 123 }
123 v := s.repoView(w, r, repo, role, "Commits")
124 v := s.repoView(w, r, repo, role, "title.commits")
124 125 v.Page = "commits"
125 126 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
126 127 list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)
@@ -155,7 +156,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
155 156 if !ok {
156 157 return
157 158 }
158 v := s.repoView(w, r, repo, role, "Branches")
159 v := s.repoView(w, r, repo, role, "title.branches")
159 160 v.Page = "branches"
160 161 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
161 162 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
@@ -171,7 +172,7 @@ func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
171 172 if !ok {
172 173 return
173 174 }
174 v := s.repoView(w, r, repo, role, "Merge requests")
175 v := s.repoView(w, r, repo, role, "title.mrs")
175 176 v.Page = "mrs"
176 177 v.MRs, _ = s.Store.ListMergeRequests(r.Context(), repo.ID)
177 178 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
@@ -188,23 +189,24 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
188 189 return
189 190 }
190 191 if !role.CanWriteCode() {
191 http.Error(w, "geen toegang", http.StatusForbidden)
192 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
192 193 return
193 194 }
194 195 source := safeRev(r.FormValue("source"), "")
195 196 target := safeRev(r.FormValue("target"), repo.DefaultBranch)
196 197 if source == "" || source == target {
197 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", "kies twee verschillende branches")
198 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", s.tr(r, "err.branches"))
198 199 return
199 200 }
200 201 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, u.ID, r.FormValue("title"), r.FormValue("description"), source, target)
201 202 if err != nil {
202 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", err.Error())
203 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", s.trErr(r, err))
203 204 return
204 205 }
205 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, "merge request !"+strconv.FormatInt(mr.Number, 10)+" geopend: "+mr.Title, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10)))
206 num := strconv.FormatInt(mr.Number, 10)
207 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, s.tr(r, "hook.mr", num, mr.Title), repoURL(repo)+"/-/merge-requests/"+num))
206 208 s.recordContribution(u.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
207 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Merge request geopend", "")
209 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+num, s.tr(r, "flash.mrOpened"), "")
208 210 }
209 211
210 212 func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
@@ -233,7 +235,7 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
233 235 }
234 236 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
235 237 for _, n := range notes {
236 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: dutchDate(n.CreatedAt)})
238 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: i18n.FormatDate(s.langOf(r), n.CreatedAt)})
237 239 }
238 240 s.render(w, "mr", v)
239 241 }
@@ -244,7 +246,7 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
244 246 return
245 247 }
246 248 if u.ID == 0 {
247 http.Error(w, "geen toegang", http.StatusForbidden)
249 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
248 250 return
249 251 }
250 252 mr, err := s.mrFromRequest(r, repo.ID)
@@ -254,10 +256,10 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
254 256 }
255 257 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
256 258 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
257 s.redirect(w, r, back, "", err.Error())
259 s.redirect(w, r, back, "", s.trErr(r, err))
258 260 return
259 261 }
260 s.redirect(w, r, back, "Reactie geplaatst", "")
262 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
261 263 }
262 264
263 265 func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
@@ -272,7 +274,7 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
272 274 }
273 275 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
274 276 if !role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch)) {
275 http.Error(w, "geen toegang tot de doelbranch", http.StatusForbidden)
277 http.Error(w, s.tr(r, "err.targetAccess"), http.StatusForbidden)
276 278 return
277 279 }
278 280 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
@@ -281,13 +283,13 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
281 283 email := u.Username + "@users.git.timfalken.com"
282 284 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
283 285 if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
284 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", err.Error())
286 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.trErr(r, err))
285 287 return
286 288 }
287 289 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
288 290 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
289 291 s.AfterPush(repo, u, before, after)
290 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Samengevoegd", "")
292 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
291 293 }
292 294
293 295 func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
@@ -301,11 +303,11 @@ func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
301 303 return
302 304 }
303 305 if mr.AuthorID != u.ID && !role.CanManageSettings() {
304 http.Error(w, "geen toegang", http.StatusForbidden)
306 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
305 307 return
306 308 }
307 309 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
308 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Gesloten", "")
310 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")
309 311 }
310 312
311 313 func (s *Server) mrFromRequest(r *http.Request, repoID int64) (store.MergeRequest, error) {
@@ -321,7 +323,7 @@ func (s *Server) pipelines(w http.ResponseWriter, r *http.Request) {
321 323 if !ok {
322 324 return
323 325 }
324 v := s.repoView(w, r, repo, role, "Pipelines")
326 v := s.repoView(w, r, repo, role, "title.pipelines")
325 327 v.Pipes, _ = s.Store.ListPipelines(r.Context(), repo.ID)
326 328 s.render(w, "pipelines", v)
327 329 }
@@ -341,7 +343,7 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {
341 343 http.NotFound(w, r)
342 344 return
343 345 }
344 v := s.repoView(w, r, repo, role, "Pipeline")
346 v := s.repoView(w, r, repo, role, "title.pipeline")
345 347 v.Pipe = &p
346 348 v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)
347 349 s.render(w, "pipeline", v)
@@ -356,11 +358,11 @@ func (s *Server) runPipeline(w http.ResponseWriter, r *http.Request) {
356 358 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
357 359 shaOut, err := gitSHA(r, s.Git, dir, ref)
358 360 if err != nil {
359 s.redirect(w, r, repoURL(repo)+"/-/pipelines", "", "branch niet gevonden")
361 s.redirect(w, r, repoURL(repo)+"/-/pipelines", "", s.tr(r, "err.branchMissing"))
360 362 return
361 363 }
362 364 s.startPipeline(r.Context(), repo, shaOut, "refs/heads/"+ref, u.Username)
363 s.redirect(w, r, repoURL(repo)+"/-/pipelines", "Pipeline gestart", "")
365 s.redirect(w, r, repoURL(repo)+"/-/pipelines", s.tr(r, "flash.pipeline"), "")
364 366 }
365 367
366 368 func (s *Server) releases(w http.ResponseWriter, r *http.Request) {
@@ -368,7 +370,7 @@ func (s *Server) releases(w http.ResponseWriter, r *http.Request) {
368 370 if !ok {
369 371 return
370 372 }
371 v := s.repoView(w, r, repo, role, "Releases")
373 v := s.repoView(w, r, repo, role, "title.releases")
372 374 v.Releases, _ = s.Store.ListReleases(r.Context(), repo.ID)
373 375 s.render(w, "releases", v)
374 376 }
@@ -379,12 +381,17 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
379 381 return
380 382 }
381 383 if s.StoragePath() == "" {
382 s.redirect(w, r, "/", "", strings.TrimSpace(noStorageMsg))
384 msg := s.tr(r, "err.noStorage")
385 if wantsModal(r) {
386 writeModal(w, false, "", msg, http.StatusBadRequest)
387 return
388 }
389 s.redirect(w, r, "/", "", msg)
383 390 return
384 391 }
385 392 name, err := names.Slug("repo", r.FormValue("name"))
386 393 if err != nil {
387 s.redirect(w, r, "/new", "", "Deze naam kan niet.")
394 s.failCreate(w, r, s.tr(r, "slug.bad"))
388 395 return
389 396 }
390 397 ownerKind := "user"
@@ -392,12 +399,12 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
392 399 if gpath := strings.TrimSpace(r.FormValue("group")); gpath != "" {
393 400 g, err := s.Store.GroupByPath(r.Context(), gpath)
394 401 if err != nil {
395 s.redirect(w, r, "/new", "", "groep niet gevonden")
402 s.failCreate(w, r, s.tr(r, "err.groupMissing"))
396 403 return
397 404 }
398 405 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
399 406 if err != nil || !role.CanManageSettings() {
400 http.Error(w, "geen toegang", http.StatusForbidden)
407 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
401 408 return
402 409 }
403 410 ownerKind, ownerID = "group", g.ID
@@ -408,16 +415,16 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
408 415 }
409 416 repo, err := s.Store.CreateRepo(r.Context(), ownerKind, ownerID, name, r.FormValue("description"), s.Cfg.Git.DefaultBranch, vis)
410 417 if err != nil {
411 s.redirect(w, r, "/new", "", err.Error())
418 s.failCreate(w, r, s.trErr(r, err))
412 419 return
413 420 }
414 421 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
415 422 if err := gitrepo.Init(s.Git, dir, repo.DefaultBranch, s.HookBin); err != nil {
416 423 _ = s.Store.DeleteRepo(r.Context(), repo.ID)
417 s.redirect(w, r, "/new", "", "git init: "+err.Error())
424 s.failCreate(w, r, s.tr(r, "err.gitInit", err.Error()))
418 425 return
419 426 }
420 s.redirect(w, r, repoURL(repo), "Repository aangemaakt", "")
427 s.finishCreate(w, r, repoURL(repo), s.tr(r, "flash.repoCreated"))
421 428 }
422 429
423 430 func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
@@ -428,15 +435,23 @@ func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
428 435 display := strings.TrimSpace(r.FormValue("name"))
429 436 path, err := names.Slug("group", display)
430 437 if err != nil {
431 s.redirect(w, r, "/new", "", "Deze naam kan niet.")
438 s.failCreate(w, r, s.tr(r, "slug.bad"))
432 439 return
433 440 }
434 g, err := s.Store.CreateGroup(r.Context(), u.ID, display, path, r.FormValue("description"))
441 role := access.Role("")
442 if raw := strings.TrimSpace(r.FormValue("default_role")); raw != "" {
443 role, err = access.ParseRole(raw)
444 if err != nil {
445 s.failCreate(w, r, s.trErr(r, err))
446 return
447 }
448 }
449 g, err := s.Store.CreateGroup(r.Context(), u.ID, display, path, r.FormValue("description"), role)
435 450 if err != nil {
436 s.redirect(w, r, "/new", "", err.Error())
451 s.failCreate(w, r, s.trErr(r, err))
437 452 return
438 453 }
439 s.redirect(w, r, "/groups/"+g.Path, "Groep aangemaakt", "")
454 s.finishCreate(w, r, "/groups/"+g.Path, s.tr(r, "flash.groupCreated"))
440 455 }
441 456
442 457 func toCommits(in []gitrepo.Commit) []CommitRow {
@@ -7,6 +7,7 @@ import (
7
7
8 "gitlab.com/Timfa/bluegit/internal/access"
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/store"
12 "gitlab.com/Timfa/bluegit/internal/store"
12)
13)
@@ -24,21 +25,21 @@ func (s *Server) guard(w http.ResponseWriter, r *http.Request, min access.Role)
24 if p.OK {
25 if p.OK {
25 role, err = s.Store.EffectiveRole(r.Context(), p.User.ID, repo.ID)
26 role, err = s.Store.EffectiveRole(r.Context(), p.User.ID, repo.ID)
26 if err != nil {
27 if err != nil {
27 http.Error(w, "rechten", http.StatusInternalServerError)
28 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
28 return store.User{}, store.Repo{}, "", false
29 return store.User{}, store.Repo{}, "", false
29 }
30 }
30 }
31 }
31 readable := role.CanRead() || repo.Visibility == "public"
32 readable := role.CanRead() || repo.Visibility == "public"
32 if !readable {
33 if !readable {
33 if p.OK {
34 if p.OK {
34 http.Error(w, "geen toegang", http.StatusForbidden)
35 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
35 } else {
36 } else {
36 http.NotFound(w, r)
37 http.NotFound(w, r)
37 }
38 }
38 return store.User{}, store.Repo{}, "", false
39 return store.User{}, store.Repo{}, "", false
39 }
40 }
40 if min != access.RoleReadonly && !role.AtLeast(min) {
41 if min != access.RoleReadonly && !role.AtLeast(min) {
41 http.Error(w, "geen toegang", http.StatusForbidden)
42 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
42 return store.User{}, store.Repo{}, "", false
43 return store.User{}, store.Repo{}, "", false
43 }
44 }
44 return p.User, repo, role, true
45 return p.User, repo, role, true
@@ -64,7 +65,7 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
64 v := s.repoView(w, r, repo, role, repo.Name)
65 v := s.repoView(w, r, repo, role, repo.Name)
65 v.Wide = true
66 v.Wide = true
66 s.fillOverview(r, &v, repo)
67 s.fillOverview(r, &v, repo)
67 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID})
68 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID}, s.langOf(r))
68 s.render(w, "repo", v)
69 s.render(w, "repo", v)
69}
70}
70
71
@@ -120,7 +121,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {
120 if !ok {
121 if !ok {
121 return
122 return
122 }
123 }
123 v := s.repoView(w, r, repo, role, "Commits")
124 v := s.repoView(w, r, repo, role, "title.commits")
124 v.Page = "commits"
125 v.Page = "commits"
125 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
126 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
126 list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)
127 list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)
@@ -155,7 +156,7 @@ func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
155 if !ok {
156 if !ok {
156 return
157 return
157 }
158 }
158 v := s.repoView(w, r, repo, role, "Branches")
159 v := s.repoView(w, r, repo, role, "title.branches")
159 v.Page = "branches"
160 v.Page = "branches"
160 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
161 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
161 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
162 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
@@ -171,7 +172,7 @@ func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
171 if !ok {
172 if !ok {
172 return
173 return
173 }
174 }
174 v := s.repoView(w, r, repo, role, "Merge requests")
175 v := s.repoView(w, r, repo, role, "title.mrs")
175 v.Page = "mrs"
176 v.Page = "mrs"
176 v.MRs, _ = s.Store.ListMergeRequests(r.Context(), repo.ID)
177 v.MRs, _ = s.Store.ListMergeRequests(r.Context(), repo.ID)
177 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
178 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
@@ -188,23 +189,24 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
188 return
189 return
189 }
190 }
190 if !role.CanWriteCode() {
191 if !role.CanWriteCode() {
191 http.Error(w, "geen toegang", http.StatusForbidden)
192 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
192 return
193 return
193 }
194 }
194 source := safeRev(r.FormValue("source"), "")
195 source := safeRev(r.FormValue("source"), "")
195 target := safeRev(r.FormValue("target"), repo.DefaultBranch)
196 target := safeRev(r.FormValue("target"), repo.DefaultBranch)
196 if source == "" || source == target {
197 if source == "" || source == target {
197 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", "kies twee verschillende branches")
198 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", s.tr(r, "err.branches"))
198 return
199 return
199 }
200 }
200 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, u.ID, r.FormValue("title"), r.FormValue("description"), source, target)
201 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, u.ID, r.FormValue("title"), r.FormValue("description"), source, target)
201 if err != nil {
202 if err != nil {
202 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", err.Error())
203 s.redirect(w, r, repoURL(repo)+"/-/merge-requests", "", s.trErr(r, err))
203 return
204 return
204 }
205 }
205 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, "merge request !"+strconv.FormatInt(mr.Number, 10)+" geopend: "+mr.Title, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10)))
206 num := strconv.FormatInt(mr.Number, 10)
207 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, s.tr(r, "hook.mr", num, mr.Title), repoURL(repo)+"/-/merge-requests/"+num))
206 s.recordContribution(u.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
208 s.recordContribution(u.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
207 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Merge request geopend", "")
209 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+num, s.tr(r, "flash.mrOpened"), "")
208}
210}
209
211
210func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
212func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
@@ -233,7 +235,7 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
233 }
235 }
234 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
236 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
235 for _, n := range notes {
237 for _, n := range notes {
236 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: dutchDate(n.CreatedAt)})
238 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: i18n.FormatDate(s.langOf(r), n.CreatedAt)})
237 }
239 }
238 s.render(w, "mr", v)
240 s.render(w, "mr", v)
239}
241}
@@ -244,7 +246,7 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
244 return
246 return
245 }
247 }
246 if u.ID == 0 {
248 if u.ID == 0 {
247 http.Error(w, "geen toegang", http.StatusForbidden)
249 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
248 return
250 return
249 }
251 }
250 mr, err := s.mrFromRequest(r, repo.ID)
252 mr, err := s.mrFromRequest(r, repo.ID)
@@ -254,10 +256,10 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
254 }
256 }
255 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
257 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
256 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
258 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
257 s.redirect(w, r, back, "", err.Error())
259 s.redirect(w, r, back, "", s.trErr(r, err))
258 return
260 return
259 }
261 }
260 s.redirect(w, r, back, "Reactie geplaatst", "")
262 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
261}
263}
262
264
263func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
265func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
@@ -272,7 +274,7 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
272 }
274 }
273 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
275 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
274 if !role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch)) {
276 if !role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch)) {
275 http.Error(w, "geen toegang tot de doelbranch", http.StatusForbidden)
277 http.Error(w, s.tr(r, "err.targetAccess"), http.StatusForbidden)
276 return
278 return
277 }
279 }
278 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
280 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
@@ -281,13 +283,13 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
281 email := u.Username + "@users.git.timfalken.com"
283 email := u.Username + "@users.git.timfalken.com"
282 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
284 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
283 if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
285 if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
284 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", err.Error())
286 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.trErr(r, err))
285 return
287 return
286 }
288 }
287 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
289 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
288 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
290 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
289 s.AfterPush(repo, u, before, after)
291 s.AfterPush(repo, u, before, after)
290 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Samengevoegd", "")
292 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
291}
293}
292
294
293func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
295func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
@@ -301,11 +303,11 @@ func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
301 return
303 return
302 }
304 }
303 if mr.AuthorID != u.ID && !role.CanManageSettings() {
305 if mr.AuthorID != u.ID && !role.CanManageSettings() {
304 http.Error(w, "geen toegang", http.StatusForbidden)
306 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
305 return
307 return
306 }
308 }
307 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
309 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
308 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Gesloten", "")
310 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")
309}
311}
310
312
311func (s *Server) mrFromRequest(r *http.Request, repoID int64) (store.MergeRequest, error) {
313func (s *Server) mrFromRequest(r *http.Request, repoID int64) (store.MergeRequest, error) {
@@ -321,7 +323,7 @@ func (s *Server) pipelines(w http.ResponseWriter, r *http.Request) {
321 if !ok {
323 if !ok {
322 return
324 return
323 }
325 }
324 v := s.repoView(w, r, repo, role, "Pipelines")
326 v := s.repoView(w, r, repo, role, "title.pipelines")
325 v.Pipes, _ = s.Store.ListPipelines(r.Context(), repo.ID)
327 v.Pipes, _ = s.Store.ListPipelines(r.Context(), repo.ID)
326 s.render(w, "pipelines", v)
328 s.render(w, "pipelines", v)
327}
329}
@@ -341,7 +343,7 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {
341 http.NotFound(w, r)
343 http.NotFound(w, r)
342 return
344 return
343 }
345 }
344 v := s.repoView(w, r, repo, role, "Pipeline")
346 v := s.repoView(w, r, repo, role, "title.pipeline")
345 v.Pipe = &p
347 v.Pipe = &p
346 v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)
348 v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)
347 s.render(w, "pipeline", v)
349 s.render(w, "pipeline", v)
@@ -356,11 +358,11 @@ func (s *Server) runPipeline(w http.ResponseWriter, r *http.Request) {
356 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
358 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
357 shaOut, err := gitSHA(r, s.Git, dir, ref)
359 shaOut, err := gitSHA(r, s.Git, dir, ref)
358 if err != nil {
360 if err != nil {
359 s.redirect(w, r, repoURL(repo)+"/-/pipelines", "", "branch niet gevonden")
361 s.redirect(w, r, repoURL(repo)+"/-/pipelines", "", s.tr(r, "err.branchMissing"))
360 return
362 return
361 }
363 }
362 s.startPipeline(r.Context(), repo, shaOut, "refs/heads/"+ref, u.Username)
364 s.startPipeline(r.Context(), repo, shaOut, "refs/heads/"+ref, u.Username)
363 s.redirect(w, r, repoURL(repo)+"/-/pipelines", "Pipeline gestart", "")
365 s.redirect(w, r, repoURL(repo)+"/-/pipelines", s.tr(r, "flash.pipeline"), "")
364}
366}
365
367
366func (s *Server) releases(w http.ResponseWriter, r *http.Request) {
368func (s *Server) releases(w http.ResponseWriter, r *http.Request) {
@@ -368,7 +370,7 @@ func (s *Server) releases(w http.ResponseWriter, r *http.Request) {
368 if !ok {
370 if !ok {
369 return
371 return
370 }
372 }
371 v := s.repoView(w, r, repo, role, "Releases")
373 v := s.repoView(w, r, repo, role, "title.releases")
372 v.Releases, _ = s.Store.ListReleases(r.Context(), repo.ID)
374 v.Releases, _ = s.Store.ListReleases(r.Context(), repo.ID)
373 s.render(w, "releases", v)
375 s.render(w, "releases", v)
374}
376}
@@ -379,12 +381,17 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
379 return
381 return
380 }
382 }
381 if s.StoragePath() == "" {
383 if s.StoragePath() == "" {
382 s.redirect(w, r, "/", "", strings.TrimSpace(noStorageMsg))
384 msg := s.tr(r, "err.noStorage")
385 if wantsModal(r) {
386 writeModal(w, false, "", msg, http.StatusBadRequest)
387 return
388 }
389 s.redirect(w, r, "/", "", msg)
383 return
390 return
384 }
391 }
385 name, err := names.Slug("repo", r.FormValue("name"))
392 name, err := names.Slug("repo", r.FormValue("name"))
386 if err != nil {
393 if err != nil {
387 s.redirect(w, r, "/new", "", "Deze naam kan niet.")
394 s.failCreate(w, r, s.tr(r, "slug.bad"))
388 return
395 return
389 }
396 }
390 ownerKind := "user"
397 ownerKind := "user"
@@ -392,12 +399,12 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
392 if gpath := strings.TrimSpace(r.FormValue("group")); gpath != "" {
399 if gpath := strings.TrimSpace(r.FormValue("group")); gpath != "" {
393 g, err := s.Store.GroupByPath(r.Context(), gpath)
400 g, err := s.Store.GroupByPath(r.Context(), gpath)
394 if err != nil {
401 if err != nil {
395 s.redirect(w, r, "/new", "", "groep niet gevonden")
402 s.failCreate(w, r, s.tr(r, "err.groupMissing"))
396 return
403 return
397 }
404 }
398 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
405 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
399 if err != nil || !role.CanManageSettings() {
406 if err != nil || !role.CanManageSettings() {
400 http.Error(w, "geen toegang", http.StatusForbidden)
407 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
401 return
408 return
402 }
409 }
403 ownerKind, ownerID = "group", g.ID
410 ownerKind, ownerID = "group", g.ID
@@ -408,16 +415,16 @@ func (s *Server) createRepo(w http.ResponseWriter, r *http.Request) {
408 }
415 }
409 repo, err := s.Store.CreateRepo(r.Context(), ownerKind, ownerID, name, r.FormValue("description"), s.Cfg.Git.DefaultBranch, vis)
416 repo, err := s.Store.CreateRepo(r.Context(), ownerKind, ownerID, name, r.FormValue("description"), s.Cfg.Git.DefaultBranch, vis)
410 if err != nil {
417 if err != nil {
411 s.redirect(w, r, "/new", "", err.Error())
418 s.failCreate(w, r, s.trErr(r, err))
412 return
419 return
413 }
420 }
414 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
421 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
415 if err := gitrepo.Init(s.Git, dir, repo.DefaultBranch, s.HookBin); err != nil {
422 if err := gitrepo.Init(s.Git, dir, repo.DefaultBranch, s.HookBin); err != nil {
416 _ = s.Store.DeleteRepo(r.Context(), repo.ID)
423 _ = s.Store.DeleteRepo(r.Context(), repo.ID)
417 s.redirect(w, r, "/new", "", "git init: "+err.Error())
424 s.failCreate(w, r, s.tr(r, "err.gitInit", err.Error()))
418 return
425 return
419 }
426 }
420 s.redirect(w, r, repoURL(repo), "Repository aangemaakt", "")
427 s.finishCreate(w, r, repoURL(repo), s.tr(r, "flash.repoCreated"))
421}
428}
422
429
423func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
430func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
@@ -428,15 +435,23 @@ func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
428 display := strings.TrimSpace(r.FormValue("name"))
435 display := strings.TrimSpace(r.FormValue("name"))
429 path, err := names.Slug("group", display)
436 path, err := names.Slug("group", display)
430 if err != nil {
437 if err != nil {
431 s.redirect(w, r, "/new", "", "Deze naam kan niet.")
438 s.failCreate(w, r, s.tr(r, "slug.bad"))
432 return
439 return
433 }
440 }
434 g, err := s.Store.CreateGroup(r.Context(), u.ID, display, path, r.FormValue("description"))
441 role := access.Role("")
442 if raw := strings.TrimSpace(r.FormValue("default_role")); raw != "" {
443 role, err = access.ParseRole(raw)
444 if err != nil {
445 s.failCreate(w, r, s.trErr(r, err))
446 return
447 }
448 }
449 g, err := s.Store.CreateGroup(r.Context(), u.ID, display, path, r.FormValue("description"), role)
435 if err != nil {
450 if err != nil {
436 s.redirect(w, r, "/new", "", err.Error())
451 s.failCreate(w, r, s.trErr(r, err))
437 return
452 return
438 }
453 }
439 s.redirect(w, r, "/groups/"+g.Path, "Groep aangemaakt", "")
454 s.finishCreate(w, r, "/groups/"+g.Path, s.tr(r, "flash.groupCreated"))
440}
455}
441
456
442func toCommits(in []gitrepo.Commit) []CommitRow {
457func toCommits(in []gitrepo.Commit) []CommitRow {
internal/server/server.go +133 −32
@@ -10,6 +10,7 @@ import (
10 10 "io/fs"
11 11 "log/slog"
12 12 "net/http"
13 "net/url"
13 14 "strings"
14 15 "sync"
15 16 "time"
@@ -19,6 +20,7 @@ import (
19 20 "gitlab.com/Timfa/bluegit/internal/activity"
20 21 "gitlab.com/Timfa/bluegit/internal/auth"
21 22 "gitlab.com/Timfa/bluegit/internal/config"
23 "gitlab.com/Timfa/bluegit/internal/i18n"
22 24 "gitlab.com/Timfa/bluegit/internal/realip"
23 25 "gitlab.com/Timfa/bluegit/internal/runner"
24 26 "gitlab.com/Timfa/bluegit/internal/store"
@@ -42,6 +44,7 @@ type Server struct {
42 44 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
43 45 AfterStorage func(path string)
44 46 tmpl *template.Template
47 byLang map[string]*template.Template
45 48
46 49 storageMu sync.RWMutex
47 50 storage string
@@ -76,12 +79,16 @@ func (s *Server) Handler() http.Handler {
76 79 mux.HandleFunc("GET /setup", s.setupPage)
77 80 mux.HandleFunc("POST /setup", s.setupSave)
78 81 mux.HandleFunc("GET /settings", s.account)
82 mux.HandleFunc("POST /settings/language", s.saveLanguage)
79 83 mux.HandleFunc("POST /settings/tokens", s.createToken)
80 84 mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
81 85 mux.HandleFunc("POST /settings/ssh", s.addSSH)
82 86 mux.HandleFunc("POST /settings/ssh/delete", s.deleteSSH)
83 87 mux.HandleFunc("GET /settings/export", s.export)
84 88 mux.HandleFunc("GET /groups/{path}", s.groupPage)
89 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
90 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
91 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
85 92 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
86 93 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
87 94 mux.HandleFunc("POST /groups/{path}/secrets", s.groupSecret)
@@ -113,6 +120,9 @@ func (s *Server) Handler() http.Handler {
113 120 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
114 121 mux.HandleFunc("GET /{owner}/{repo}/-/releases", s.releases)
115 122 mux.HandleFunc("GET /{owner}/{repo}/-/releases/{tag}/assets/{name}", s.releaseAsset)
123 mux.HandleFunc("GET /{owner}/{repo}/-/logo", s.repoLogo)
124 mux.HandleFunc("POST /{owner}/{repo}/-/logo", s.uploadRepoLogo)
125 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
116 126 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
117 127 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
118 128 mux.HandleFunc("POST /{owner}/{repo}/-/members", s.repoMember)
@@ -136,33 +146,48 @@ func (s *Server) realIP(next http.Handler) http.Handler {
136 146 }
137 147
138 148 func (s *Server) mustTemplates() {
139 if s.tmpl != nil {
149 if s.byLang != nil {
140 150 return
141 151 }
142 s.tmpl = template.Must(template.New("web").Funcs(template.FuncMap{
143 "short": func(v string) string {
144 if len(v) > 10 {
145 return v[:10]
146 }
147 return v
148 },
149 "join": strings.Join,
150 "initial": func(s string) string {
151 s = strings.TrimSpace(s)
152 if s == "" {
153 return "?"
154 }
155 r, _ := utf8.DecodeRuneInString(s)
156 return strings.ToUpper(string(r))
157 },
158 "splitPath": func(p string) []string {
159 if p == "" {
160 return nil
161 }
162 return strings.Split(p, "/")
163 },
164 "iconOf": func(name string) string { return fileIcon(name, "blob") },
165 }).ParseFS(webFS, "templates/*.html"))
152 s.byLang = map[string]*template.Template{}
153 for _, lang := range i18n.All() {
154 l := lang
155 s.byLang[string(l)] = template.Must(template.New("web").Funcs(template.FuncMap{
156 "short": func(v string) string {
157 if len(v) > 10 {
158 return v[:10]
159 }
160 return v
161 },
162 "join": strings.Join,
163 "initial": func(s string) string {
164 s = strings.TrimSpace(s)
165 if s == "" {
166 return "?"
167 }
168 r, _ := utf8.DecodeRuneInString(s)
169 return strings.ToUpper(string(r))
170 },
171 "splitPath": func(p string) []string {
172 if p == "" {
173 return nil
174 }
175 return strings.Split(p, "/")
176 },
177 "iconOf": func(name string) string { return fileIcon(name, "blob") },
178 "t": func(key string, args ...any) string { return i18n.T(l, key, args...) },
179 "tn": func(n int, one, many string) string {
180 key := many
181 if n == 1 {
182 key = one
183 }
184 return i18n.T(l, key, n)
185 },
186 "roleName": func(r access.Role) string { return i18n.T(l, "role."+string(r)) },
187 "visName": func(v string) string { return i18n.T(l, "vis."+v) },
188 }).ParseFS(webFS, "templates/*.html"))
189 }
190 s.tmpl = s.byLang[string(i18n.EN)]
166 191 }
167 192
168 193 func (s *Server) asset(w http.ResponseWriter, r *http.Request) {
@@ -223,12 +248,12 @@ func (s *Server) who(r *http.Request) principal {
223 248
224 249 func (s *Server) csrfOK(w http.ResponseWriter, r *http.Request) bool {
225 250 if err := r.ParseForm(); err != nil {
226 http.Error(w, "ongeldig formulier", http.StatusBadRequest)
251 http.Error(w, s.tr(r, "err.badForm"), http.StatusBadRequest)
227 252 return false
228 253 }
229 254 p := s.who(r)
230 255 if !p.OK || r.FormValue("csrf") == "" || r.FormValue("csrf") != p.Session.CSRF {
231 http.Error(w, "ongeldig formulier, vernieuw de pagina", http.StatusBadRequest)
256 http.Error(w, s.tr(r, "err.badCSRF"), http.StatusBadRequest)
232 257 return false
233 258 }
234 259 return true
@@ -258,15 +283,15 @@ func (s *Server) setSessionCookie(w http.ResponseWriter, id string, exp time.Tim
258 283 func (s *Server) flash(w http.ResponseWriter, notice, problem string) {
259 284 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
260 285 if notice != "" {
261 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: notice, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
286 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: url.QueryEscape(notice), Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
262 287 }
263 288 if problem != "" {
264 http.SetCookie(w, &http.Cookie{Name: "bluegit_error", Value: problem, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
289 http.SetCookie(w, &http.Cookie{Name: "bluegit_error", Value: url.QueryEscape(problem), Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
265 290 }
266 291 }
267 292
268 293 func (s *Server) takeFlash(w http.ResponseWriter, r *http.Request) (string, string) {
269 notice, problem := cookieVal(r, "bluegit_notice"), cookieVal(r, "bluegit_error")
294 notice, problem := flashVal(r, "bluegit_notice"), flashVal(r, "bluegit_error")
270 295 if notice != "" {
271 296 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: "", Path: "/", MaxAge: -1})
272 297 }
@@ -284,14 +309,52 @@ func cookieVal(r *http.Request, name string) string {
284 309 return c.Value
285 310 }
286 311
312 func flashVal(r *http.Request, name string) string {
313 raw := cookieVal(r, name)
314 if raw == "" {
315 return ""
316 }
317 v, err := url.QueryUnescape(raw)
318 if err != nil {
319 return raw
320 }
321 return v
322 }
323
287 324 func (s *Server) redirect(w http.ResponseWriter, r *http.Request, path, notice, problem string) {
288 325 s.flash(w, notice, problem)
289 326 http.Redirect(w, r, path, http.StatusSeeOther)
290 327 }
291 328
329 func (s *Server) langOf(r *http.Request) i18n.Lang {
330 if p := s.who(r); p.OK {
331 return i18n.Parse(p.User.Language)
332 }
333 return i18n.EN
334 }
335
336 func (s *Server) tr(r *http.Request, key string, args ...any) string {
337 return i18n.T(s.langOf(r), key, args...)
338 }
339
340 func (s *Server) trErr(r *http.Request, err error) string {
341 return i18n.Text(s.langOf(r), err)
342 }
343
292 344 func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View {
293 345 notice, problem := s.takeFlash(w, r)
294 v := View{Title: title, BaseURL: s.Cfg.BaseURL, Notice: notice, Err: problem, StorageUnset: s.StoragePath() == ""}
346 lang := s.langOf(r)
347 if strings.HasPrefix(title, "title.") {
348 title = i18n.T(lang, title)
349 }
350 v := View{
351 Title: title, BaseURL: s.Cfg.BaseURL, Notice: notice, Err: problem,
352 StorageUnset: s.StoragePath() == "", Lang: string(lang), HTMLLang: htmlLang(lang),
353 Cunei: lang == i18n.Cuneiform,
354 }
355 for _, l := range i18n.All() {
356 v.Langs = append(v.Langs, LangChoice{Code: string(l), Label: l.Name()})
357 }
295 358 if p := s.who(r); p.OK {
296 359 u := p.User
297 360 v.User = &u
@@ -300,9 +363,26 @@ func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View
300 363 return v
301 364 }
302 365
366 func htmlLang(l i18n.Lang) string {
367 switch l {
368 case i18n.NL:
369 return "nl"
370 case i18n.DE:
371 return "de"
372 case i18n.FR:
373 return "fr"
374 default:
375 return "en"
376 }
377 }
378
303 379 func (s *Server) render(w http.ResponseWriter, name string, v View) {
304 380 w.Header().Set("Content-Type", "text/html; charset=utf-8")
305 if err := s.tmpl.ExecuteTemplate(w, name, v); err != nil && s.Log != nil {
381 tmpl := s.byLang[v.Lang]
382 if tmpl == nil {
383 tmpl = s.tmpl
384 }
385 if err := tmpl.ExecuteTemplate(w, name, v); err != nil && s.Log != nil {
306 386 s.Log.Error("sjabloon", "name", name, "err", err)
307 387 }
308 388 }
@@ -364,6 +444,14 @@ type View struct {
364 444 MinFree string
365 445 Wide bool
366 446 Page string
447 Lang string
448 HTMLLang string
449 Cunei bool
450 Langs []LangChoice
451 Query string
452 SortDir string
453 FlipDir string
454 Cards []RepoCard
367 455 Head *CommitRow
368 456 Files []FileRow
369 457 Tree []FileRow
@@ -384,6 +472,19 @@ type View struct {
384 472 Notes []NoteRow
385 473 }
386 474
475 // LangChoice is één taal in de instellingen.
476 type LangChoice struct {
477 Code, Label string
478 }
479
480 // RepoCard is een repository in een groepslijst.
481 type RepoCard struct {
482 Repo store.Repo
483 Stars int
484 Starred bool
485 When string
486 }
487
387 488 // NoteRow is een reactie in de interface.
388 489 type NoteRow struct {
389 490 Author, Body, When string
@@ -10,6 +10,7 @@ import (
10 "io/fs"
10 "io/fs"
11 "log/slog"
11 "log/slog"
12 "net/http"
12 "net/http"
13 "net/url"
13 "strings"
14 "strings"
14 "sync"
15 "sync"
15 "time"
16 "time"
@@ -19,6 +20,7 @@ import (
19 "gitlab.com/Timfa/bluegit/internal/activity"
20 "gitlab.com/Timfa/bluegit/internal/activity"
20 "gitlab.com/Timfa/bluegit/internal/auth"
21 "gitlab.com/Timfa/bluegit/internal/auth"
21 "gitlab.com/Timfa/bluegit/internal/config"
22 "gitlab.com/Timfa/bluegit/internal/config"
23 "gitlab.com/Timfa/bluegit/internal/i18n"
22 "gitlab.com/Timfa/bluegit/internal/realip"
24 "gitlab.com/Timfa/bluegit/internal/realip"
23 "gitlab.com/Timfa/bluegit/internal/runner"
25 "gitlab.com/Timfa/bluegit/internal/runner"
24 "gitlab.com/Timfa/bluegit/internal/store"
26 "gitlab.com/Timfa/bluegit/internal/store"
@@ -42,6 +44,7 @@ type Server struct {
42 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
44 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
43 AfterStorage func(path string)
45 AfterStorage func(path string)
44 tmpl *template.Template
46 tmpl *template.Template
47 byLang map[string]*template.Template
45
48
46 storageMu sync.RWMutex
49 storageMu sync.RWMutex
47 storage string
50 storage string
@@ -76,12 +79,16 @@ func (s *Server) Handler() http.Handler {
76 mux.HandleFunc("GET /setup", s.setupPage)
79 mux.HandleFunc("GET /setup", s.setupPage)
77 mux.HandleFunc("POST /setup", s.setupSave)
80 mux.HandleFunc("POST /setup", s.setupSave)
78 mux.HandleFunc("GET /settings", s.account)
81 mux.HandleFunc("GET /settings", s.account)
82 mux.HandleFunc("POST /settings/language", s.saveLanguage)
79 mux.HandleFunc("POST /settings/tokens", s.createToken)
83 mux.HandleFunc("POST /settings/tokens", s.createToken)
80 mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
84 mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
81 mux.HandleFunc("POST /settings/ssh", s.addSSH)
85 mux.HandleFunc("POST /settings/ssh", s.addSSH)
82 mux.HandleFunc("POST /settings/ssh/delete", s.deleteSSH)
86 mux.HandleFunc("POST /settings/ssh/delete", s.deleteSSH)
83 mux.HandleFunc("GET /settings/export", s.export)
87 mux.HandleFunc("GET /settings/export", s.export)
84 mux.HandleFunc("GET /groups/{path}", s.groupPage)
88 mux.HandleFunc("GET /groups/{path}", s.groupPage)
89 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
90 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
91 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
85 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
92 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
86 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
93 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
87 mux.HandleFunc("POST /groups/{path}/secrets", s.groupSecret)
94 mux.HandleFunc("POST /groups/{path}/secrets", s.groupSecret)
@@ -113,6 +120,9 @@ func (s *Server) Handler() http.Handler {
113 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
120 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
114 mux.HandleFunc("GET /{owner}/{repo}/-/releases", s.releases)
121 mux.HandleFunc("GET /{owner}/{repo}/-/releases", s.releases)
115 mux.HandleFunc("GET /{owner}/{repo}/-/releases/{tag}/assets/{name}", s.releaseAsset)
122 mux.HandleFunc("GET /{owner}/{repo}/-/releases/{tag}/assets/{name}", s.releaseAsset)
123 mux.HandleFunc("GET /{owner}/{repo}/-/logo", s.repoLogo)
124 mux.HandleFunc("POST /{owner}/{repo}/-/logo", s.uploadRepoLogo)
125 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
116 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
126 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
117 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
127 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
118 mux.HandleFunc("POST /{owner}/{repo}/-/members", s.repoMember)
128 mux.HandleFunc("POST /{owner}/{repo}/-/members", s.repoMember)
@@ -136,33 +146,48 @@ func (s *Server) realIP(next http.Handler) http.Handler {
136}
146}
137
147
138func (s *Server) mustTemplates() {
148func (s *Server) mustTemplates() {
139 if s.tmpl != nil {
149 if s.byLang != nil {
140 return
150 return
141 }
151 }
142 s.tmpl = template.Must(template.New("web").Funcs(template.FuncMap{
152 s.byLang = map[string]*template.Template{}
143 "short": func(v string) string {
153 for _, lang := range i18n.All() {
144 if len(v) > 10 {
154 l := lang
145 return v[:10]
155 s.byLang[string(l)] = template.Must(template.New("web").Funcs(template.FuncMap{
146 }
156 "short": func(v string) string {
147 return v
157 if len(v) > 10 {
148 },
158 return v[:10]
149 "join": strings.Join,
159 }
150 "initial": func(s string) string {
160 return v
151 s = strings.TrimSpace(s)
161 },
152 if s == "" {
162 "join": strings.Join,
153 return "?"
163 "initial": func(s string) string {
154 }
164 s = strings.TrimSpace(s)
155 r, _ := utf8.DecodeRuneInString(s)
165 if s == "" {
156 return strings.ToUpper(string(r))
166 return "?"
157 },
167 }
158 "splitPath": func(p string) []string {
168 r, _ := utf8.DecodeRuneInString(s)
159 if p == "" {
169 return strings.ToUpper(string(r))
160 return nil
170 },
161 }
171 "splitPath": func(p string) []string {
162 return strings.Split(p, "/")
172 if p == "" {
163 },
173 return nil
164 "iconOf": func(name string) string { return fileIcon(name, "blob") },
174 }
165 }).ParseFS(webFS, "templates/*.html"))
175 return strings.Split(p, "/")
176 },
177 "iconOf": func(name string) string { return fileIcon(name, "blob") },
178 "t": func(key string, args ...any) string { return i18n.T(l, key, args...) },
179 "tn": func(n int, one, many string) string {
180 key := many
181 if n == 1 {
182 key = one
183 }
184 return i18n.T(l, key, n)
185 },
186 "roleName": func(r access.Role) string { return i18n.T(l, "role."+string(r)) },
187 "visName": func(v string) string { return i18n.T(l, "vis."+v) },
188 }).ParseFS(webFS, "templates/*.html"))
189 }
190 s.tmpl = s.byLang[string(i18n.EN)]
166}
191}
167
192
168func (s *Server) asset(w http.ResponseWriter, r *http.Request) {
193func (s *Server) asset(w http.ResponseWriter, r *http.Request) {
@@ -223,12 +248,12 @@ func (s *Server) who(r *http.Request) principal {
223
248
224func (s *Server) csrfOK(w http.ResponseWriter, r *http.Request) bool {
249func (s *Server) csrfOK(w http.ResponseWriter, r *http.Request) bool {
225 if err := r.ParseForm(); err != nil {
250 if err := r.ParseForm(); err != nil {
226 http.Error(w, "ongeldig formulier", http.StatusBadRequest)
251 http.Error(w, s.tr(r, "err.badForm"), http.StatusBadRequest)
227 return false
252 return false
228 }
253 }
229 p := s.who(r)
254 p := s.who(r)
230 if !p.OK || r.FormValue("csrf") == "" || r.FormValue("csrf") != p.Session.CSRF {
255 if !p.OK || r.FormValue("csrf") == "" || r.FormValue("csrf") != p.Session.CSRF {
231 http.Error(w, "ongeldig formulier, vernieuw de pagina", http.StatusBadRequest)
256 http.Error(w, s.tr(r, "err.badCSRF"), http.StatusBadRequest)
232 return false
257 return false
233 }
258 }
234 return true
259 return true
@@ -258,15 +283,15 @@ func (s *Server) setSessionCookie(w http.ResponseWriter, id string, exp time.Tim
258func (s *Server) flash(w http.ResponseWriter, notice, problem string) {
283func (s *Server) flash(w http.ResponseWriter, notice, problem string) {
259 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
284 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
260 if notice != "" {
285 if notice != "" {
261 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: notice, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
286 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: url.QueryEscape(notice), Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
262 }
287 }
263 if problem != "" {
288 if problem != "" {
264 http.SetCookie(w, &http.Cookie{Name: "bluegit_error", Value: problem, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
289 http.SetCookie(w, &http.Cookie{Name: "bluegit_error", Value: url.QueryEscape(problem), Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
265 }
290 }
266}
291}
267
292
268func (s *Server) takeFlash(w http.ResponseWriter, r *http.Request) (string, string) {
293func (s *Server) takeFlash(w http.ResponseWriter, r *http.Request) (string, string) {
269 notice, problem := cookieVal(r, "bluegit_notice"), cookieVal(r, "bluegit_error")
294 notice, problem := flashVal(r, "bluegit_notice"), flashVal(r, "bluegit_error")
270 if notice != "" {
295 if notice != "" {
271 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: "", Path: "/", MaxAge: -1})
296 http.SetCookie(w, &http.Cookie{Name: "bluegit_notice", Value: "", Path: "/", MaxAge: -1})
272 }
297 }
@@ -284,14 +309,52 @@ func cookieVal(r *http.Request, name string) string {
284 return c.Value
309 return c.Value
285}
310}
286
311
312func flashVal(r *http.Request, name string) string {
313 raw := cookieVal(r, name)
314 if raw == "" {
315 return ""
316 }
317 v, err := url.QueryUnescape(raw)
318 if err != nil {
319 return raw
320 }
321 return v
322}
323
287func (s *Server) redirect(w http.ResponseWriter, r *http.Request, path, notice, problem string) {
324func (s *Server) redirect(w http.ResponseWriter, r *http.Request, path, notice, problem string) {
288 s.flash(w, notice, problem)
325 s.flash(w, notice, problem)
289 http.Redirect(w, r, path, http.StatusSeeOther)
326 http.Redirect(w, r, path, http.StatusSeeOther)
290}
327}
291
328
329func (s *Server) langOf(r *http.Request) i18n.Lang {
330 if p := s.who(r); p.OK {
331 return i18n.Parse(p.User.Language)
332 }
333 return i18n.EN
334}
335
336func (s *Server) tr(r *http.Request, key string, args ...any) string {
337 return i18n.T(s.langOf(r), key, args...)
338}
339
340func (s *Server) trErr(r *http.Request, err error) string {
341 return i18n.Text(s.langOf(r), err)
342}
343
292func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View {
344func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View {
293 notice, problem := s.takeFlash(w, r)
345 notice, problem := s.takeFlash(w, r)
294 v := View{Title: title, BaseURL: s.Cfg.BaseURL, Notice: notice, Err: problem, StorageUnset: s.StoragePath() == ""}
346 lang := s.langOf(r)
347 if strings.HasPrefix(title, "title.") {
348 title = i18n.T(lang, title)
349 }
350 v := View{
351 Title: title, BaseURL: s.Cfg.BaseURL, Notice: notice, Err: problem,
352 StorageUnset: s.StoragePath() == "", Lang: string(lang), HTMLLang: htmlLang(lang),
353 Cunei: lang == i18n.Cuneiform,
354 }
355 for _, l := range i18n.All() {
356 v.Langs = append(v.Langs, LangChoice{Code: string(l), Label: l.Name()})
357 }
295 if p := s.who(r); p.OK {
358 if p := s.who(r); p.OK {
296 u := p.User
359 u := p.User
297 v.User = &u
360 v.User = &u
@@ -300,9 +363,26 @@ func (s *Server) view(w http.ResponseWriter, r *http.Request, title string) View
300 return v
363 return v
301}
364}
302
365
366func htmlLang(l i18n.Lang) string {
367 switch l {
368 case i18n.NL:
369 return "nl"
370 case i18n.DE:
371 return "de"
372 case i18n.FR:
373 return "fr"
374 default:
375 return "en"
376 }
377}
378
303func (s *Server) render(w http.ResponseWriter, name string, v View) {
379func (s *Server) render(w http.ResponseWriter, name string, v View) {
304 w.Header().Set("Content-Type", "text/html; charset=utf-8")
380 w.Header().Set("Content-Type", "text/html; charset=utf-8")
305 if err := s.tmpl.ExecuteTemplate(w, name, v); err != nil && s.Log != nil {
381 tmpl := s.byLang[v.Lang]
382 if tmpl == nil {
383 tmpl = s.tmpl
384 }
385 if err := tmpl.ExecuteTemplate(w, name, v); err != nil && s.Log != nil {
306 s.Log.Error("sjabloon", "name", name, "err", err)
386 s.Log.Error("sjabloon", "name", name, "err", err)
307 }
387 }
308}
388}
@@ -364,6 +444,14 @@ type View struct {
364 MinFree string
444 MinFree string
365 Wide bool
445 Wide bool
366 Page string
446 Page string
447 Lang string
448 HTMLLang string
449 Cunei bool
450 Langs []LangChoice
451 Query string
452 SortDir string
453 FlipDir string
454 Cards []RepoCard
367 Head *CommitRow
455 Head *CommitRow
368 Files []FileRow
456 Files []FileRow
369 Tree []FileRow
457 Tree []FileRow
@@ -384,6 +472,19 @@ type View struct {
384 Notes []NoteRow
472 Notes []NoteRow
385}
473}
386
474
475// LangChoice is één taal in de instellingen.
476type LangChoice struct {
477 Code, Label string
478}
479
480// RepoCard is een repository in een groepslijst.
481type RepoCard struct {
482 Repo store.Repo
483 Stars int
484 Starred bool
485 When string
486}
487
387// NoteRow is een reactie in de interface.
488// NoteRow is een reactie in de interface.
388type NoteRow struct {
489type NoteRow struct {
389 Author, Body, When string
490 Author, Body, When string
internal/server/server_test.go +22 −22
@@ -50,7 +50,7 @@ func TestWebRepoPushAndSecretBoundary(t *testing.T) {
50 50 t.Fatal(err)
51 51 }
52 52 body := read(t, res)
53 if res.StatusCode != 200 || !strings.Contains(body, "Overzicht") {
53 if res.StatusCode != 200 || !strings.Contains(body, "Overview") {
54 54 t.Fatalf("login %d %s", res.StatusCode, body)
55 55 }
56 56 logo, err := client.Get(ts.URL + "/assets/logo.svg")
@@ -215,7 +215,7 @@ func TestSetupChoosesStorage(t *testing.T) {
215 215 t.Fatal(err)
216 216 }
217 217 body := read(t, res)
218 if res.StatusCode != http.StatusServiceUnavailable || !strings.Contains(body, "nog niet ingesteld") {
218 if res.StatusCode != http.StatusServiceUnavailable || !strings.Contains(body, "not set up yet") {
219 219 t.Fatalf("git zonder opslag: %d %s", res.StatusCode, body)
220 220 }
221 221
@@ -226,7 +226,7 @@ func TestSetupChoosesStorage(t *testing.T) {
226 226 t.Fatal(err)
227 227 }
228 228 page := read(t, res)
229 if res.StatusCode != 200 || !strings.Contains(page, "Opslag kiezen") {
229 if res.StatusCode != 200 || !strings.Contains(page, "Choose storage") {
230 230 t.Fatalf("setup:\n%s", page)
231 231 }
232 232 res, err = client.PostForm(ts.URL+"/setup", url.Values{"csrf": {csrfOf(t, page)}, "path": {"relatief"}})
@@ -234,7 +234,7 @@ func TestSetupChoosesStorage(t *testing.T) {
234 234 t.Fatal(err)
235 235 }
236 236 page = read(t, res)
237 if !strings.Contains(page, "absoluut") {
237 if !strings.Contains(page, "absolute") {
238 238 t.Fatalf("relatief pad:\n%s", page)
239 239 }
240 240 res, err = client.PostForm(ts.URL+"/setup", url.Values{"csrf": {csrfOf(t, page)}, "path": {storage}})
@@ -242,7 +242,7 @@ func TestSetupChoosesStorage(t *testing.T) {
242 242 t.Fatal(err)
243 243 }
244 244 page = read(t, res)
245 if !strings.Contains(page, "Overzicht") || !strings.Contains(page, "vrij") {
245 if !strings.Contains(page, "Overview") || !strings.Contains(page, "free.") {
246 246 t.Fatalf("na opslaan:\n%s", page)
247 247 }
248 248 if srv.StoragePath() != storage {
@@ -257,7 +257,7 @@ func TestSetupChoosesStorage(t *testing.T) {
257 257 t.Fatal(err)
258 258 }
259 259 page = read(t, res)
260 if !strings.Contains(page, "verplaatst geen") || !strings.Contains(page, "Vrije ruimte") {
260 if !strings.Contains(page, "does not move") || !strings.Contains(page, "Free space") {
261 261 t.Fatalf("wijzigen:\n%s", page)
262 262 }
263 263 res, err = http.Get(ts.URL + "/tim/demo.git/info/refs?service=git-upload-pack")
@@ -402,7 +402,7 @@ func TestNameBecomesSlug(t *testing.T) {
402 402 t.Fatal(err)
403 403 }
404 404 page = read(t, res)
405 if !strings.Contains(page, "Deze naam kan niet.") {
405 if !strings.Contains(page, "This name cannot be used.") {
406 406 t.Fatalf("weigering:\n%s", page)
407 407 }
408 408 }
@@ -449,7 +449,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
449 449 t.Fatal(err)
450 450 }
451 451 created := read(t, res)
452 if !strings.Contains(created, "tim/legacy-cycles") || !strings.Contains(created, "Nog geen commits") {
452 if !strings.Contains(created, "tim/legacy-cycles") || !strings.Contains(created, "No commits yet.") {
453 453 t.Fatalf("lege repo:\n%s", created)
454 454 }
455 455 ctx := context.Background()
@@ -489,15 +489,15 @@ func TestProjectOverviewAndFiles(t *testing.T) {
489 489 }
490 490 body := read(t, res)
491 491 for _, want := range []string{
492 `class="on">Overzicht`,
493 `/-/tree?rev=master">Bestanden`,
494 "Projectinformatie",
495 "Laatste commit",
496 "Laatste wijziging",
492 `class="on">Overview`,
493 `/-/tree?rev=master">Files`,
494 "Project information",
495 "Last commit",
496 "Last update",
497 497 "eerste commit",
498 "Bestand zoeken",
499 `aria-label="Beschermd"`,
500 "Aangemaakt op",
498 "Find file",
499 `aria-label="Protected"`,
500 "Created on ",
501 501 "1 commit",
502 502 "<table class=\"md\">",
503 503 "<th>Sleutel</th>",
@@ -526,13 +526,13 @@ func TestProjectOverviewAndFiles(t *testing.T) {
526 526 }
527 527 tree := read(t, res)
528 528 for _, want := range []string{
529 `class="on">Bestanden`,
529 `class="on">Files`,
530 530 `data-tree-filter`,
531 531 `data-path="src/main.go"`,
532 532 `data-path="crates/sim"`,
533 "Deze map is leeg",
533 "This directory is empty.",
534 534 } {
535 if want == "Deze map is leeg" {
535 if want == "This directory is empty." {
536 536 if strings.Contains(tree, want) {
537 537 t.Fatalf("root is niet leeg:\n%s", tree)
538 538 }
@@ -549,7 +549,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
549 549 }
550 550 blob := read(t, res)
551 551 for _, want := range []string{
552 `class="on">Bestanden`,
552 `class="on">Files`,
553 553 `class="depth-1 active"`,
554 554 `data-path="src"`,
555 555 `<span class="hl-k">func</span>`,
@@ -558,7 +558,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
558 558 `<span>src</span>`,
559 559 `<span>main.go</span>`,
560 560 `main.go <span class="muted">`,
561 "Kopieer",
561 "Copy",
562 562 } {
563 563 if !strings.Contains(blob, want) {
564 564 t.Fatalf("blob mist %q\n%s", want, blob)
@@ -595,7 +595,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
595 595 git(t, adaWork, "commit", "-m", "ada op master")
596 596 if out, err := gitOut(adaWork, "push", "origin", "master"); err == nil {
597 597 t.Fatalf("ontwikkelaar pushte master:\n%s", out)
598 } else if !strings.Contains(out, "beschermd") {
598 } else if !strings.Contains(out, "protected") {
599 599 t.Fatalf("weigering zonder beschermd: %v\n%s", err, out)
600 600 }
601 601 git(t, adaWork, "checkout", "-b", "feature")
@@ -50,7 +50,7 @@ func TestWebRepoPushAndSecretBoundary(t *testing.T) {
50 t.Fatal(err)
50 t.Fatal(err)
51 }
51 }
52 body := read(t, res)
52 body := read(t, res)
53 if res.StatusCode != 200 || !strings.Contains(body, "Overzicht") {
53 if res.StatusCode != 200 || !strings.Contains(body, "Overview") {
54 t.Fatalf("login %d %s", res.StatusCode, body)
54 t.Fatalf("login %d %s", res.StatusCode, body)
55 }
55 }
56 logo, err := client.Get(ts.URL + "/assets/logo.svg")
56 logo, err := client.Get(ts.URL + "/assets/logo.svg")
@@ -215,7 +215,7 @@ func TestSetupChoosesStorage(t *testing.T) {
215 t.Fatal(err)
215 t.Fatal(err)
216 }
216 }
217 body := read(t, res)
217 body := read(t, res)
218 if res.StatusCode != http.StatusServiceUnavailable || !strings.Contains(body, "nog niet ingesteld") {
218 if res.StatusCode != http.StatusServiceUnavailable || !strings.Contains(body, "not set up yet") {
219 t.Fatalf("git zonder opslag: %d %s", res.StatusCode, body)
219 t.Fatalf("git zonder opslag: %d %s", res.StatusCode, body)
220 }
220 }
221
221
@@ -226,7 +226,7 @@ func TestSetupChoosesStorage(t *testing.T) {
226 t.Fatal(err)
226 t.Fatal(err)
227 }
227 }
228 page := read(t, res)
228 page := read(t, res)
229 if res.StatusCode != 200 || !strings.Contains(page, "Opslag kiezen") {
229 if res.StatusCode != 200 || !strings.Contains(page, "Choose storage") {
230 t.Fatalf("setup:\n%s", page)
230 t.Fatalf("setup:\n%s", page)
231 }
231 }
232 res, err = client.PostForm(ts.URL+"/setup", url.Values{"csrf": {csrfOf(t, page)}, "path": {"relatief"}})
232 res, err = client.PostForm(ts.URL+"/setup", url.Values{"csrf": {csrfOf(t, page)}, "path": {"relatief"}})
@@ -234,7 +234,7 @@ func TestSetupChoosesStorage(t *testing.T) {
234 t.Fatal(err)
234 t.Fatal(err)
235 }
235 }
236 page = read(t, res)
236 page = read(t, res)
237 if !strings.Contains(page, "absoluut") {
237 if !strings.Contains(page, "absolute") {
238 t.Fatalf("relatief pad:\n%s", page)
238 t.Fatalf("relatief pad:\n%s", page)
239 }
239 }
240 res, err = client.PostForm(ts.URL+"/setup", url.Values{"csrf": {csrfOf(t, page)}, "path": {storage}})
240 res, err = client.PostForm(ts.URL+"/setup", url.Values{"csrf": {csrfOf(t, page)}, "path": {storage}})
@@ -242,7 +242,7 @@ func TestSetupChoosesStorage(t *testing.T) {
242 t.Fatal(err)
242 t.Fatal(err)
243 }
243 }
244 page = read(t, res)
244 page = read(t, res)
245 if !strings.Contains(page, "Overzicht") || !strings.Contains(page, "vrij") {
245 if !strings.Contains(page, "Overview") || !strings.Contains(page, "free.") {
246 t.Fatalf("na opslaan:\n%s", page)
246 t.Fatalf("na opslaan:\n%s", page)
247 }
247 }
248 if srv.StoragePath() != storage {
248 if srv.StoragePath() != storage {
@@ -257,7 +257,7 @@ func TestSetupChoosesStorage(t *testing.T) {
257 t.Fatal(err)
257 t.Fatal(err)
258 }
258 }
259 page = read(t, res)
259 page = read(t, res)
260 if !strings.Contains(page, "verplaatst geen") || !strings.Contains(page, "Vrije ruimte") {
260 if !strings.Contains(page, "does not move") || !strings.Contains(page, "Free space") {
261 t.Fatalf("wijzigen:\n%s", page)
261 t.Fatalf("wijzigen:\n%s", page)
262 }
262 }
263 res, err = http.Get(ts.URL + "/tim/demo.git/info/refs?service=git-upload-pack")
263 res, err = http.Get(ts.URL + "/tim/demo.git/info/refs?service=git-upload-pack")
@@ -402,7 +402,7 @@ func TestNameBecomesSlug(t *testing.T) {
402 t.Fatal(err)
402 t.Fatal(err)
403 }
403 }
404 page = read(t, res)
404 page = read(t, res)
405 if !strings.Contains(page, "Deze naam kan niet.") {
405 if !strings.Contains(page, "This name cannot be used.") {
406 t.Fatalf("weigering:\n%s", page)
406 t.Fatalf("weigering:\n%s", page)
407 }
407 }
408}
408}
@@ -449,7 +449,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
449 t.Fatal(err)
449 t.Fatal(err)
450 }
450 }
451 created := read(t, res)
451 created := read(t, res)
452 if !strings.Contains(created, "tim/legacy-cycles") || !strings.Contains(created, "Nog geen commits") {
452 if !strings.Contains(created, "tim/legacy-cycles") || !strings.Contains(created, "No commits yet.") {
453 t.Fatalf("lege repo:\n%s", created)
453 t.Fatalf("lege repo:\n%s", created)
454 }
454 }
455 ctx := context.Background()
455 ctx := context.Background()
@@ -489,15 +489,15 @@ func TestProjectOverviewAndFiles(t *testing.T) {
489 }
489 }
490 body := read(t, res)
490 body := read(t, res)
491 for _, want := range []string{
491 for _, want := range []string{
492 `class="on">Overzicht`,
492 `class="on">Overview`,
493 `/-/tree?rev=master">Bestanden`,
493 `/-/tree?rev=master">Files`,
494 "Projectinformatie",
494 "Project information",
495 "Laatste commit",
495 "Last commit",
496 "Laatste wijziging",
496 "Last update",
497 "eerste commit",
497 "eerste commit",
498 "Bestand zoeken",
498 "Find file",
499 `aria-label="Beschermd"`,
499 `aria-label="Protected"`,
500 "Aangemaakt op",
500 "Created on ",
501 "1 commit",
501 "1 commit",
502 "<table class=\"md\">",
502 "<table class=\"md\">",
503 "<th>Sleutel</th>",
503 "<th>Sleutel</th>",
@@ -526,13 +526,13 @@ func TestProjectOverviewAndFiles(t *testing.T) {
526 }
526 }
527 tree := read(t, res)
527 tree := read(t, res)
528 for _, want := range []string{
528 for _, want := range []string{
529 `class="on">Bestanden`,
529 `class="on">Files`,
530 `data-tree-filter`,
530 `data-tree-filter`,
531 `data-path="src/main.go"`,
531 `data-path="src/main.go"`,
532 `data-path="crates/sim"`,
532 `data-path="crates/sim"`,
533 "Deze map is leeg",
533 "This directory is empty.",
534 } {
534 } {
535 if want == "Deze map is leeg" {
535 if want == "This directory is empty." {
536 if strings.Contains(tree, want) {
536 if strings.Contains(tree, want) {
537 t.Fatalf("root is niet leeg:\n%s", tree)
537 t.Fatalf("root is niet leeg:\n%s", tree)
538 }
538 }
@@ -549,7 +549,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
549 }
549 }
550 blob := read(t, res)
550 blob := read(t, res)
551 for _, want := range []string{
551 for _, want := range []string{
552 `class="on">Bestanden`,
552 `class="on">Files`,
553 `class="depth-1 active"`,
553 `class="depth-1 active"`,
554 `data-path="src"`,
554 `data-path="src"`,
555 `<span class="hl-k">func</span>`,
555 `<span class="hl-k">func</span>`,
@@ -558,7 +558,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
558 `<span>src</span>`,
558 `<span>src</span>`,
559 `<span>main.go</span>`,
559 `<span>main.go</span>`,
560 `main.go <span class="muted">`,
560 `main.go <span class="muted">`,
561 "Kopieer",
561 "Copy",
562 } {
562 } {
563 if !strings.Contains(blob, want) {
563 if !strings.Contains(blob, want) {
564 t.Fatalf("blob mist %q\n%s", want, blob)
564 t.Fatalf("blob mist %q\n%s", want, blob)
@@ -595,7 +595,7 @@ func TestProjectOverviewAndFiles(t *testing.T) {
595 git(t, adaWork, "commit", "-m", "ada op master")
595 git(t, adaWork, "commit", "-m", "ada op master")
596 if out, err := gitOut(adaWork, "push", "origin", "master"); err == nil {
596 if out, err := gitOut(adaWork, "push", "origin", "master"); err == nil {
597 t.Fatalf("ontwikkelaar pushte master:\n%s", out)
597 t.Fatalf("ontwikkelaar pushte master:\n%s", out)
598 } else if !strings.Contains(out, "beschermd") {
598 } else if !strings.Contains(out, "protected") {
599 t.Fatalf("weigering zonder beschermd: %v\n%s", err, out)
599 t.Fatalf("weigering zonder beschermd: %v\n%s", err, out)
600 }
600 }
601 git(t, adaWork, "checkout", "-b", "feature")
601 git(t, adaWork, "checkout", "-b", "feature")
internal/server/settings_handlers.go +154 −54
@@ -3,11 +3,13 @@ package server
3 3 import (
4 4 "net/http"
5 5 "os"
6 "sort"
6 7 "strconv"
7 8 "strings"
8 9
9 10 "gitlab.com/Timfa/bluegit/internal/access"
10 11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/i18n"
11 13 "gitlab.com/Timfa/bluegit/internal/store"
12 14 "gitlab.com/Timfa/bluegit/internal/webhook"
13 15 )
@@ -17,11 +19,8 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
17 19 if !ok {
18 20 return
19 21 }
20 v := s.repoView(w, r, repo, role, "Instellingen")
21 v.Tab = r.URL.Query().Get("tab")
22 if v.Tab == "" {
23 v.Tab = "algemeen"
24 }
22 v := s.repoView(w, r, repo, role, "title.settings")
23 v.Tab = settingsTab(r.URL.Query().Get("tab"))
25 24 if role.CanManageSettings() {
26 25 v.Members, _ = s.Store.ListMembers(r.Context(), "repo", repo.ID)
27 26 if repo.OwnerKind == "user" {
@@ -63,10 +62,10 @@ func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {
63 62 vis = "private"
64 63 }
65 64 if err := s.Store.UpdateRepo(r.Context(), repo.ID, r.FormValue("description"), vis); err != nil {
66 s.redirect(w, r, repoURL(repo)+"/-/settings", "", err.Error())
65 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.trErr(r, err))
67 66 return
68 67 }
69 s.redirect(w, r, repoURL(repo)+"/-/settings", "Opgeslagen", "")
68 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")
70 69 }
71 70
72 71 func (s *Server) repoMember(w http.ResponseWriter, r *http.Request) {
@@ -92,14 +91,14 @@ func (s *Server) memberPost(w http.ResponseWriter, r *http.Request, kind string)
92 91 }
93 92 role, err := access.ParseRole(r.FormValue("role"))
94 93 if err != nil {
95 s.redirect(w, r, back, "", err.Error())
94 s.redirect(w, r, back, "", s.trErr(r, err))
96 95 return
97 96 }
98 97 if err := s.Store.SetMember(r.Context(), kind, scopeID, r.FormValue("username"), role); err != nil {
99 s.redirect(w, r, back, "", err.Error())
98 s.redirect(w, r, back, "", s.trErr(r, err))
100 99 return
101 100 }
102 s.redirect(w, r, back, "Lid opgeslagen", "")
101 s.redirect(w, r, back, s.tr(r, "flash.memberSaved"), "")
103 102 }
104 103
105 104 func (s *Server) memberRemove(w http.ResponseWriter, r *http.Request, kind string) {
@@ -108,10 +107,10 @@ func (s *Server) memberRemove(w http.ResponseWriter, r *http.Request, kind strin
108 107 return
109 108 }
110 109 if err := s.Store.RemoveMember(r.Context(), kind, scopeID, r.FormValue("username")); err != nil {
111 s.redirect(w, r, back, "", err.Error())
110 s.redirect(w, r, back, "", s.trErr(r, err))
112 111 return
113 112 }
114 s.redirect(w, r, back, "Lid verwijderd", "")
113 s.redirect(w, r, back, s.tr(r, "flash.memberRemoved"), "")
115 114 }
116 115
117 116 func (s *Server) adminScope(w http.ResponseWriter, r *http.Request, kind string) (int64, string, bool) {
@@ -121,13 +120,13 @@ func (s *Server) adminScope(w http.ResponseWriter, r *http.Request, kind string)
121 120 return 0, "", false
122 121 }
123 122 _ = role
124 return g.ID, "/groups/" + g.Path, true
123 return g.ID, "/groups/" + g.Path + "?tab=members", true
125 124 }
126 125 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
127 126 if !ok {
128 127 return 0, "", false
129 128 }
130 return repo.ID, repoURL(repo) + "/-/settings?tab=leden", true
129 return repo.ID, repoURL(repo) + "/-/settings?tab=members", true
131 130 }
132 131
133 132 func (s *Server) addProtected(w http.ResponseWriter, r *http.Request) {
@@ -136,10 +135,10 @@ func (s *Server) addProtected(w http.ResponseWriter, r *http.Request) {
136 135 return
137 136 }
138 137 if err := s.Store.AddProtected(r.Context(), repo.ID, r.FormValue("pattern")); err != nil {
139 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "", err.Error())
138 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "", s.trErr(r, err))
140 139 return
141 140 }
142 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "Branch beschermd", "")
141 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", s.tr(r, "flash.branchOn"), "")
143 142 }
144 143
145 144 func (s *Server) removeProtected(w http.ResponseWriter, r *http.Request) {
@@ -148,7 +147,7 @@ func (s *Server) removeProtected(w http.ResponseWriter, r *http.Request) {
148 147 return
149 148 }
150 149 _ = s.Store.RemoveProtected(r.Context(), repo.ID, r.FormValue("pattern"))
151 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "Patroon verwijderd", "")
150 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", s.tr(r, "flash.patternOff"), "")
152 151 }
153 152
154 153 func (s *Server) repoSecret(w http.ResponseWriter, r *http.Request) {
@@ -170,14 +169,12 @@ func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string)
170 169 return
171 170 }
172 171 back = strings.Split(back, "?")[0]
173 if kind == "repo" {
174 back += "?tab=geheimen"
175 }
172 back += scopeTab(kind, "secrets")
176 173 if err := s.Store.PutSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("value"), r.FormValue("protected") == "1"); err != nil {
177 s.redirect(w, r, back, "", err.Error())
174 s.redirect(w, r, back, "", s.trErr(r, err))
178 175 return
179 176 }
180 s.redirect(w, r, back, "Geheim opgeslagen", "")
177 s.redirect(w, r, back, s.tr(r, "flash.secretSaved"), "")
181 178 }
182 179
183 180 func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -186,11 +183,9 @@ func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind strin
186 183 return
187 184 }
188 185 back = strings.Split(back, "?")[0]
189 if kind == "repo" {
190 back += "?tab=geheimen"
191 }
186 back += scopeTab(kind, "secrets")
192 187 _ = s.Store.DeleteSecret(r.Context(), kind, scopeID, r.FormValue("name"))
193 s.redirect(w, r, back, "Geheim verwijderd", "")
188 s.redirect(w, r, back, s.tr(r, "flash.secretRemoved"), "")
194 189 }
195 190
196 191 func (s *Server) repoWebhook(w http.ResponseWriter, r *http.Request) { s.webhookPost(w, r, "repo") }
@@ -209,17 +204,15 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
209 204 if !ok || !s.csrfOK(w, r) {
210 205 return
211 206 }
212 if kind == "repo" {
213 back = strings.Split(back, "?")[0] + "?tab=webhooks"
214 }
207 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
215 208 preset := r.FormValue("preset")
216 209 if preset != webhook.PresetDiscord && preset != webhook.PresetGrok && preset != webhook.PresetGeneric {
217 s.redirect(w, r, back, "", "onbekende preset")
210 s.redirect(w, r, back, "", s.tr(r, "err.preset"))
218 211 return
219 212 }
220 213 filter := strings.TrimSpace(r.FormValue("branch_filter"))
221 214 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
222 s.redirect(w, r, back, "", err.Error())
215 s.redirect(w, r, back, "", s.trErr(r, err))
223 216 return
224 217 }
225 218 var events []string
@@ -229,7 +222,7 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
229 222 }
230 223 }
231 224 if len(events) == 0 {
232 s.redirect(w, r, back, "", "kies minstens één gebeurtenis")
225 s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))
233 226 return
234 227 }
235 228 headers := map[string]string{}
@@ -240,7 +233,7 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
240 233 }
241 234 k, v, ok := strings.Cut(line, ":")
242 235 if !ok || strings.TrimSpace(k) == "" {
243 s.redirect(w, r, back, "", "header moet 'Naam: waarde' zijn")
236 s.redirect(w, r, back, "", s.tr(r, "err.header"))
244 237 return
245 238 }
246 239 headers[strings.TrimSpace(k)] = strings.TrimSpace(v)
@@ -251,10 +244,10 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
251 244 Headers: headers, BodyTemplate: r.FormValue("body"), Events: events, BranchFilter: filter,
252 245 })
253 246 if err != nil {
254 s.redirect(w, r, back, "", err.Error())
247 s.redirect(w, r, back, "", s.trErr(r, err))
255 248 return
256 249 }
257 s.redirect(w, r, back, "Webhook opgeslagen", "")
250 s.redirect(w, r, back, s.tr(r, "flash.webhookSaved"), "")
258 251 }
259 252
260 253 func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -262,12 +255,10 @@ func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind stri
262 255 if !ok || !s.csrfOK(w, r) {
263 256 return
264 257 }
265 if kind == "repo" {
266 back = strings.Split(back, "?")[0] + "?tab=webhooks"
267 }
258 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
268 259 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
269 260 _ = s.Store.DeleteWebhook(r.Context(), kind, scopeID, id)
270 s.redirect(w, r, back, "Webhook verwijderd", "")
261 s.redirect(w, r, back, s.tr(r, "flash.webhookRemoved"), "")
271 262 }
272 263
273 264 func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
@@ -276,13 +267,13 @@ func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
276 267 return
277 268 }
278 269 if r.FormValue("confirm") != repo.Name {
279 s.redirect(w, r, repoURL(repo)+"/-/settings", "", "typ de repositorynaam om te verwijderen")
270 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.tr(r, "err.confirmDelete"))
280 271 return
281 272 }
282 273 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
283 274 _ = s.Store.DeleteRepo(r.Context(), repo.ID)
284 275 _ = os.RemoveAll(dir)
285 s.redirect(w, r, "/", "Repository verwijderd", "")
276 s.redirect(w, r, "/", s.tr(r, "flash.repoDeleted"), "")
286 277 }
287 278
288 279 func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.Role) (store.Group, access.Role, bool) {
@@ -292,21 +283,31 @@ func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.R
292 283 return store.Group{}, "", false
293 284 }
294 285 p := s.who(r)
295 if !p.OK {
296 http.Redirect(w, r, "/login", http.StatusFound)
297 return store.Group{}, "", false
286 var role access.Role
287 if p.OK {
288 role, err = s.Store.GroupRole(r.Context(), g.ID, p.User.ID)
289 if err != nil {
290 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
291 return store.Group{}, "", false
292 }
298 293 }
299 role, err := s.Store.GroupRole(r.Context(), g.ID, p.User.ID)
300 if err != nil {
301 http.Error(w, "rechten", http.StatusInternalServerError)
294 if min == access.RoleReadonly {
295 if role.CanRead() || g.Visibility == "public" {
296 return g, role, true
297 }
298 if p.OK {
299 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
300 } else {
301 http.NotFound(w, r)
302 }
302 303 return store.Group{}, "", false
303 304 }
304 if !role.AtLeast(min) && min != access.RoleReadonly {
305 http.Error(w, "geen toegang", http.StatusForbidden)
305 if !p.OK {
306 http.Redirect(w, r, "/login", http.StatusFound)
306 307 return store.Group{}, "", false
307 308 }
308 if min == access.RoleReadonly && !role.CanRead() {
309 http.Error(w, "geen toegang", http.StatusForbidden)
309 if !role.AtLeast(min) {
310 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
310 311 return store.Group{}, "", false
311 312 }
312 313 return g, role, true
@@ -318,17 +319,116 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
318 319 return
319 320 }
320 321 v := s.view(w, r, g.Name)
322 v.Wide = true
321 323 v.Group = &g
322 324 v.Role = role
323 325 v.CanAdmin = role.CanManageSettings()
324 v.Repos, _ = s.Store.ReposByGroup(r.Context(), g.ID)
326 tab := r.URL.Query().Get("tab")
327 switch tab {
328 case "members":
329 if !role.CanRead() {
330 tab = ""
331 }
332 case "settings":
333 if !role.CanManageSettings() {
334 tab = ""
335 }
336 default:
337 tab = ""
338 }
339 v.Tab = tab
340 all, _ := s.Store.ReposByGroup(r.Context(), g.ID)
341 uid := int64(0)
325 342 if v.User != nil {
326 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), v.User.ID, v.Repos))
343 uid = v.User.ID
327 344 }
328 if role.CanManageSettings() {
345 var repos []store.Repo
346 for _, repo := range all {
347 if repo.Visibility == "public" {
348 repos = append(repos, repo)
349 continue
350 }
351 if uid == 0 {
352 continue
353 }
354 er, err := s.Store.EffectiveRole(r.Context(), uid, repo.ID)
355 if err == nil && er.CanRead() {
356 repos = append(repos, repo)
357 }
358 }
359 q := strings.TrimSpace(r.URL.Query().Get("q"))
360 dir := r.URL.Query().Get("dir")
361 if dir != "desc" {
362 dir = "asc"
363 }
364 v.Query, v.SortDir = q, dir
365 if dir == "desc" {
366 v.FlipDir = "asc"
367 } else {
368 v.FlipDir = "desc"
369 }
370 if lq := strings.ToLower(q); lq != "" {
371 var filtered []store.Repo
372 for _, repo := range repos {
373 if strings.Contains(strings.ToLower(repo.Name), lq) {
374 filtered = append(filtered, repo)
375 }
376 }
377 repos = filtered
378 }
379 sort.Slice(repos, func(i, j int) bool {
380 a, b := strings.ToLower(repos[i].Name), strings.ToLower(repos[j].Name)
381 if dir == "desc" {
382 return a > b
383 }
384 return a < b
385 })
386 ids := make([]int64, len(repos))
387 for i, repo := range repos {
388 ids[i] = repo.ID
389 }
390 counts, mine, _ := s.Store.StarInfo(r.Context(), uid, ids)
391 lang := s.langOf(r)
392 for _, repo := range repos {
393 v.Cards = append(v.Cards, RepoCard{
394 Repo: repo, Stars: counts[repo.ID], Starred: mine[repo.ID],
395 When: i18n.FormatDate(lang, repo.CreatedAt),
396 })
397 }
398 v.Repos = repos
399 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
400 if tab == "members" && role.CanRead() {
401 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
402 }
403 if tab == "settings" && role.CanManageSettings() {
329 404 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
330 405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
331 406 v.Hooks = s.hookViews(r, "group", g.ID)
332 407 }
333 408 s.render(w, "group", v)
334 409 }
410
411 func settingsTab(tab string) string {
412 switch tab {
413 case "leden", "members":
414 return "members"
415 case "geheimen", "secrets":
416 return "secrets"
417 case "branches":
418 return "branches"
419 case "webhooks":
420 return "webhooks"
421 default:
422 return "general"
423 }
424 }
425
426 func scopeTab(kind, repoTab string) string {
427 if kind == "group" {
428 if repoTab == "members" {
429 return "?tab=members"
430 }
431 return "?tab=settings"
432 }
433 return "?tab=" + repoTab
434 }
@@ -3,11 +3,13 @@ package server
3import (
3import (
4 "net/http"
4 "net/http"
5 "os"
5 "os"
6 "sort"
6 "strconv"
7 "strconv"
7 "strings"
8 "strings"
8
9
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/gitrepo"
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/store"
13 "gitlab.com/Timfa/bluegit/internal/store"
12 "gitlab.com/Timfa/bluegit/internal/webhook"
14 "gitlab.com/Timfa/bluegit/internal/webhook"
13)
15)
@@ -17,11 +19,8 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
17 if !ok {
19 if !ok {
18 return
20 return
19 }
21 }
20 v := s.repoView(w, r, repo, role, "Instellingen")
22 v := s.repoView(w, r, repo, role, "title.settings")
21 v.Tab = r.URL.Query().Get("tab")
23 v.Tab = settingsTab(r.URL.Query().Get("tab"))
22 if v.Tab == "" {
23 v.Tab = "algemeen"
24 }
25 if role.CanManageSettings() {
24 if role.CanManageSettings() {
26 v.Members, _ = s.Store.ListMembers(r.Context(), "repo", repo.ID)
25 v.Members, _ = s.Store.ListMembers(r.Context(), "repo", repo.ID)
27 if repo.OwnerKind == "user" {
26 if repo.OwnerKind == "user" {
@@ -63,10 +62,10 @@ func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {
63 vis = "private"
62 vis = "private"
64 }
63 }
65 if err := s.Store.UpdateRepo(r.Context(), repo.ID, r.FormValue("description"), vis); err != nil {
64 if err := s.Store.UpdateRepo(r.Context(), repo.ID, r.FormValue("description"), vis); err != nil {
66 s.redirect(w, r, repoURL(repo)+"/-/settings", "", err.Error())
65 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.trErr(r, err))
67 return
66 return
68 }
67 }
69 s.redirect(w, r, repoURL(repo)+"/-/settings", "Opgeslagen", "")
68 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")
70}
69}
71
70
72func (s *Server) repoMember(w http.ResponseWriter, r *http.Request) {
71func (s *Server) repoMember(w http.ResponseWriter, r *http.Request) {
@@ -92,14 +91,14 @@ func (s *Server) memberPost(w http.ResponseWriter, r *http.Request, kind string)
92 }
91 }
93 role, err := access.ParseRole(r.FormValue("role"))
92 role, err := access.ParseRole(r.FormValue("role"))
94 if err != nil {
93 if err != nil {
95 s.redirect(w, r, back, "", err.Error())
94 s.redirect(w, r, back, "", s.trErr(r, err))
96 return
95 return
97 }
96 }
98 if err := s.Store.SetMember(r.Context(), kind, scopeID, r.FormValue("username"), role); err != nil {
97 if err := s.Store.SetMember(r.Context(), kind, scopeID, r.FormValue("username"), role); err != nil {
99 s.redirect(w, r, back, "", err.Error())
98 s.redirect(w, r, back, "", s.trErr(r, err))
100 return
99 return
101 }
100 }
102 s.redirect(w, r, back, "Lid opgeslagen", "")
101 s.redirect(w, r, back, s.tr(r, "flash.memberSaved"), "")
103}
102}
104
103
105func (s *Server) memberRemove(w http.ResponseWriter, r *http.Request, kind string) {
104func (s *Server) memberRemove(w http.ResponseWriter, r *http.Request, kind string) {
@@ -108,10 +107,10 @@ func (s *Server) memberRemove(w http.ResponseWriter, r *http.Request, kind strin
108 return
107 return
109 }
108 }
110 if err := s.Store.RemoveMember(r.Context(), kind, scopeID, r.FormValue("username")); err != nil {
109 if err := s.Store.RemoveMember(r.Context(), kind, scopeID, r.FormValue("username")); err != nil {
111 s.redirect(w, r, back, "", err.Error())
110 s.redirect(w, r, back, "", s.trErr(r, err))
112 return
111 return
113 }
112 }
114 s.redirect(w, r, back, "Lid verwijderd", "")
113 s.redirect(w, r, back, s.tr(r, "flash.memberRemoved"), "")
115}
114}
116
115
117func (s *Server) adminScope(w http.ResponseWriter, r *http.Request, kind string) (int64, string, bool) {
116func (s *Server) adminScope(w http.ResponseWriter, r *http.Request, kind string) (int64, string, bool) {
@@ -121,13 +120,13 @@ func (s *Server) adminScope(w http.ResponseWriter, r *http.Request, kind string)
121 return 0, "", false
120 return 0, "", false
122 }
121 }
123 _ = role
122 _ = role
124 return g.ID, "/groups/" + g.Path, true
123 return g.ID, "/groups/" + g.Path + "?tab=members", true
125 }
124 }
126 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
125 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
127 if !ok {
126 if !ok {
128 return 0, "", false
127 return 0, "", false
129 }
128 }
130 return repo.ID, repoURL(repo) + "/-/settings?tab=leden", true
129 return repo.ID, repoURL(repo) + "/-/settings?tab=members", true
131}
130}
132
131
133func (s *Server) addProtected(w http.ResponseWriter, r *http.Request) {
132func (s *Server) addProtected(w http.ResponseWriter, r *http.Request) {
@@ -136,10 +135,10 @@ func (s *Server) addProtected(w http.ResponseWriter, r *http.Request) {
136 return
135 return
137 }
136 }
138 if err := s.Store.AddProtected(r.Context(), repo.ID, r.FormValue("pattern")); err != nil {
137 if err := s.Store.AddProtected(r.Context(), repo.ID, r.FormValue("pattern")); err != nil {
139 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "", err.Error())
138 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "", s.trErr(r, err))
140 return
139 return
141 }
140 }
142 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "Branch beschermd", "")
141 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", s.tr(r, "flash.branchOn"), "")
143}
142}
144
143
145func (s *Server) removeProtected(w http.ResponseWriter, r *http.Request) {
144func (s *Server) removeProtected(w http.ResponseWriter, r *http.Request) {
@@ -148,7 +147,7 @@ func (s *Server) removeProtected(w http.ResponseWriter, r *http.Request) {
148 return
147 return
149 }
148 }
150 _ = s.Store.RemoveProtected(r.Context(), repo.ID, r.FormValue("pattern"))
149 _ = s.Store.RemoveProtected(r.Context(), repo.ID, r.FormValue("pattern"))
151 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", "Patroon verwijderd", "")
150 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=branches", s.tr(r, "flash.patternOff"), "")
152}
151}
153
152
154func (s *Server) repoSecret(w http.ResponseWriter, r *http.Request) {
153func (s *Server) repoSecret(w http.ResponseWriter, r *http.Request) {
@@ -170,14 +169,12 @@ func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string)
170 return
169 return
171 }
170 }
172 back = strings.Split(back, "?")[0]
171 back = strings.Split(back, "?")[0]
173 if kind == "repo" {
172 back += scopeTab(kind, "secrets")
174 back += "?tab=geheimen"
175 }
176 if err := s.Store.PutSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("value"), r.FormValue("protected") == "1"); err != nil {
173 if err := s.Store.PutSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("value"), r.FormValue("protected") == "1"); err != nil {
177 s.redirect(w, r, back, "", err.Error())
174 s.redirect(w, r, back, "", s.trErr(r, err))
178 return
175 return
179 }
176 }
180 s.redirect(w, r, back, "Geheim opgeslagen", "")
177 s.redirect(w, r, back, s.tr(r, "flash.secretSaved"), "")
181}
178}
182
179
183func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
180func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -186,11 +183,9 @@ func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind strin
186 return
183 return
187 }
184 }
188 back = strings.Split(back, "?")[0]
185 back = strings.Split(back, "?")[0]
189 if kind == "repo" {
186 back += scopeTab(kind, "secrets")
190 back += "?tab=geheimen"
191 }
192 _ = s.Store.DeleteSecret(r.Context(), kind, scopeID, r.FormValue("name"))
187 _ = s.Store.DeleteSecret(r.Context(), kind, scopeID, r.FormValue("name"))
193 s.redirect(w, r, back, "Geheim verwijderd", "")
188 s.redirect(w, r, back, s.tr(r, "flash.secretRemoved"), "")
194}
189}
195
190
196func (s *Server) repoWebhook(w http.ResponseWriter, r *http.Request) { s.webhookPost(w, r, "repo") }
191func (s *Server) repoWebhook(w http.ResponseWriter, r *http.Request) { s.webhookPost(w, r, "repo") }
@@ -209,17 +204,15 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
209 if !ok || !s.csrfOK(w, r) {
204 if !ok || !s.csrfOK(w, r) {
210 return
205 return
211 }
206 }
212 if kind == "repo" {
207 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
213 back = strings.Split(back, "?")[0] + "?tab=webhooks"
214 }
215 preset := r.FormValue("preset")
208 preset := r.FormValue("preset")
216 if preset != webhook.PresetDiscord && preset != webhook.PresetGrok && preset != webhook.PresetGeneric {
209 if preset != webhook.PresetDiscord && preset != webhook.PresetGrok && preset != webhook.PresetGeneric {
217 s.redirect(w, r, back, "", "onbekende preset")
210 s.redirect(w, r, back, "", s.tr(r, "err.preset"))
218 return
211 return
219 }
212 }
220 filter := strings.TrimSpace(r.FormValue("branch_filter"))
213 filter := strings.TrimSpace(r.FormValue("branch_filter"))
221 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
214 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
222 s.redirect(w, r, back, "", err.Error())
215 s.redirect(w, r, back, "", s.trErr(r, err))
223 return
216 return
224 }
217 }
225 var events []string
218 var events []string
@@ -229,7 +222,7 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
229 }
222 }
230 }
223 }
231 if len(events) == 0 {
224 if len(events) == 0 {
232 s.redirect(w, r, back, "", "kies minstens één gebeurtenis")
225 s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))
233 return
226 return
234 }
227 }
235 headers := map[string]string{}
228 headers := map[string]string{}
@@ -240,7 +233,7 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
240 }
233 }
241 k, v, ok := strings.Cut(line, ":")
234 k, v, ok := strings.Cut(line, ":")
242 if !ok || strings.TrimSpace(k) == "" {
235 if !ok || strings.TrimSpace(k) == "" {
243 s.redirect(w, r, back, "", "header moet 'Naam: waarde' zijn")
236 s.redirect(w, r, back, "", s.tr(r, "err.header"))
244 return
237 return
245 }
238 }
246 headers[strings.TrimSpace(k)] = strings.TrimSpace(v)
239 headers[strings.TrimSpace(k)] = strings.TrimSpace(v)
@@ -251,10 +244,10 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
251 Headers: headers, BodyTemplate: r.FormValue("body"), Events: events, BranchFilter: filter,
244 Headers: headers, BodyTemplate: r.FormValue("body"), Events: events, BranchFilter: filter,
252 })
245 })
253 if err != nil {
246 if err != nil {
254 s.redirect(w, r, back, "", err.Error())
247 s.redirect(w, r, back, "", s.trErr(r, err))
255 return
248 return
256 }
249 }
257 s.redirect(w, r, back, "Webhook opgeslagen", "")
250 s.redirect(w, r, back, s.tr(r, "flash.webhookSaved"), "")
258}
251}
259
252
260func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
253func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -262,12 +255,10 @@ func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind stri
262 if !ok || !s.csrfOK(w, r) {
255 if !ok || !s.csrfOK(w, r) {
263 return
256 return
264 }
257 }
265 if kind == "repo" {
258 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
266 back = strings.Split(back, "?")[0] + "?tab=webhooks"
267 }
268 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
259 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
269 _ = s.Store.DeleteWebhook(r.Context(), kind, scopeID, id)
260 _ = s.Store.DeleteWebhook(r.Context(), kind, scopeID, id)
270 s.redirect(w, r, back, "Webhook verwijderd", "")
261 s.redirect(w, r, back, s.tr(r, "flash.webhookRemoved"), "")
271}
262}
272
263
273func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
264func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
@@ -276,13 +267,13 @@ func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
276 return
267 return
277 }
268 }
278 if r.FormValue("confirm") != repo.Name {
269 if r.FormValue("confirm") != repo.Name {
279 s.redirect(w, r, repoURL(repo)+"/-/settings", "", "typ de repositorynaam om te verwijderen")
270 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.tr(r, "err.confirmDelete"))
280 return
271 return
281 }
272 }
282 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
273 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
283 _ = s.Store.DeleteRepo(r.Context(), repo.ID)
274 _ = s.Store.DeleteRepo(r.Context(), repo.ID)
284 _ = os.RemoveAll(dir)
275 _ = os.RemoveAll(dir)
285 s.redirect(w, r, "/", "Repository verwijderd", "")
276 s.redirect(w, r, "/", s.tr(r, "flash.repoDeleted"), "")
286}
277}
287
278
288func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.Role) (store.Group, access.Role, bool) {
279func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.Role) (store.Group, access.Role, bool) {
@@ -292,21 +283,31 @@ func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.R
292 return store.Group{}, "", false
283 return store.Group{}, "", false
293 }
284 }
294 p := s.who(r)
285 p := s.who(r)
295 if !p.OK {
286 var role access.Role
296 http.Redirect(w, r, "/login", http.StatusFound)
287 if p.OK {
297 return store.Group{}, "", false
288 role, err = s.Store.GroupRole(r.Context(), g.ID, p.User.ID)
289 if err != nil {
290 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
291 return store.Group{}, "", false
292 }
298 }
293 }
299 role, err := s.Store.GroupRole(r.Context(), g.ID, p.User.ID)
294 if min == access.RoleReadonly {
300 if err != nil {
295 if role.CanRead() || g.Visibility == "public" {
301 http.Error(w, "rechten", http.StatusInternalServerError)
296 return g, role, true
297 }
298 if p.OK {
299 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
300 } else {
301 http.NotFound(w, r)
302 }
302 return store.Group{}, "", false
303 return store.Group{}, "", false
303 }
304 }
304 if !role.AtLeast(min) && min != access.RoleReadonly {
305 if !p.OK {
305 http.Error(w, "geen toegang", http.StatusForbidden)
306 http.Redirect(w, r, "/login", http.StatusFound)
306 return store.Group{}, "", false
307 return store.Group{}, "", false
307 }
308 }
308 if min == access.RoleReadonly && !role.CanRead() {
309 if !role.AtLeast(min) {
309 http.Error(w, "geen toegang", http.StatusForbidden)
310 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
310 return store.Group{}, "", false
311 return store.Group{}, "", false
311 }
312 }
312 return g, role, true
313 return g, role, true
@@ -318,17 +319,116 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
318 return
319 return
319 }
320 }
320 v := s.view(w, r, g.Name)
321 v := s.view(w, r, g.Name)
322 v.Wide = true
321 v.Group = &g
323 v.Group = &g
322 v.Role = role
324 v.Role = role
323 v.CanAdmin = role.CanManageSettings()
325 v.CanAdmin = role.CanManageSettings()
324 v.Repos, _ = s.Store.ReposByGroup(r.Context(), g.ID)
326 tab := r.URL.Query().Get("tab")
327 switch tab {
328 case "members":
329 if !role.CanRead() {
330 tab = ""
331 }
332 case "settings":
333 if !role.CanManageSettings() {
334 tab = ""
335 }
336 default:
337 tab = ""
338 }
339 v.Tab = tab
340 all, _ := s.Store.ReposByGroup(r.Context(), g.ID)
341 uid := int64(0)
325 if v.User != nil {
342 if v.User != nil {
326 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), v.User.ID, v.Repos))
343 uid = v.User.ID
327 }
344 }
328 if role.CanManageSettings() {
345 var repos []store.Repo
346 for _, repo := range all {
347 if repo.Visibility == "public" {
348 repos = append(repos, repo)
349 continue
350 }
351 if uid == 0 {
352 continue
353 }
354 er, err := s.Store.EffectiveRole(r.Context(), uid, repo.ID)
355 if err == nil && er.CanRead() {
356 repos = append(repos, repo)
357 }
358 }
359 q := strings.TrimSpace(r.URL.Query().Get("q"))
360 dir := r.URL.Query().Get("dir")
361 if dir != "desc" {
362 dir = "asc"
363 }
364 v.Query, v.SortDir = q, dir
365 if dir == "desc" {
366 v.FlipDir = "asc"
367 } else {
368 v.FlipDir = "desc"
369 }
370 if lq := strings.ToLower(q); lq != "" {
371 var filtered []store.Repo
372 for _, repo := range repos {
373 if strings.Contains(strings.ToLower(repo.Name), lq) {
374 filtered = append(filtered, repo)
375 }
376 }
377 repos = filtered
378 }
379 sort.Slice(repos, func(i, j int) bool {
380 a, b := strings.ToLower(repos[i].Name), strings.ToLower(repos[j].Name)
381 if dir == "desc" {
382 return a > b
383 }
384 return a < b
385 })
386 ids := make([]int64, len(repos))
387 for i, repo := range repos {
388 ids[i] = repo.ID
389 }
390 counts, mine, _ := s.Store.StarInfo(r.Context(), uid, ids)
391 lang := s.langOf(r)
392 for _, repo := range repos {
393 v.Cards = append(v.Cards, RepoCard{
394 Repo: repo, Stars: counts[repo.ID], Starred: mine[repo.ID],
395 When: i18n.FormatDate(lang, repo.CreatedAt),
396 })
397 }
398 v.Repos = repos
399 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
400 if tab == "members" && role.CanRead() {
401 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
402 }
403 if tab == "settings" && role.CanManageSettings() {
329 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
404 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
330 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
331 v.Hooks = s.hookViews(r, "group", g.ID)
406 v.Hooks = s.hookViews(r, "group", g.ID)
332 }
407 }
333 s.render(w, "group", v)
408 s.render(w, "group", v)
334}
409}
410
411func settingsTab(tab string) string {
412 switch tab {
413 case "leden", "members":
414 return "members"
415 case "geheimen", "secrets":
416 return "secrets"
417 case "branches":
418 return "branches"
419 case "webhooks":
420 return "webhooks"
421 default:
422 return "general"
423 }
424}
425
426func scopeTab(kind, repoTab string) string {
427 if kind == "group" {
428 if repoTab == "members" {
429 return "?tab=members"
430 }
431 return "?tab=settings"
432 }
433 return "?tab=" + repoTab
434}
internal/server/setup.go +14 −12
@@ -10,7 +10,9 @@ import (
10 10 "gitlab.com/Timfa/bluegit/internal/state"
11 11 )
12 12
13 const noStorageMsg = "Opslag is nog niet ingesteld. De beheerder kiest een pad in de webinterface.\n"
13 func (s *Server) noStorageText(r *http.Request) string {
14 return s.tr(r, "err.noStorage") + "\n"
15 }
14 16
15 17 func allowsWithoutStorage(r *http.Request) bool {
16 18 switch r.URL.Path {
@@ -33,7 +35,7 @@ func (s *Server) gate(next http.Handler) http.Handler {
33 35 return
34 36 }
35 37 if isGitPath(r.URL.Path) || strings.HasPrefix(r.URL.Path, "/api/") {
36 http.Error(w, noStorageMsg, http.StatusServiceUnavailable)
38 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
37 39 return
38 40 }
39 41 if p := s.who(r); p.OK && p.User.InstanceAdmin {
@@ -84,31 +86,31 @@ func (s *Server) setupSave(w http.ResponseWriter, r *http.Request) {
84 86 return
85 87 }
86 88 if s.StateDir == "" {
87 s.renderSetup(w, r, "Het pad kon niet bewaard worden.", r.FormValue("path"))
89 s.renderSetup(w, r, s.tr(r, "err.storageSave"), r.FormValue("path"))
88 90 return
89 91 }
90 92 info, err := state.Inspect(r.FormValue("path"))
91 93 if err != nil {
92 s.renderSetup(w, r, err.Error(), strings.TrimSpace(r.FormValue("path")))
94 s.renderSetup(w, r, s.trErr(r, err), strings.TrimSpace(r.FormValue("path")))
93 95 return
94 96 }
95 97 if same, err := samePath(s.StateDir, info.Path); err != nil {
96 s.renderSetup(w, r, err.Error(), info.Path)
98 s.renderSetup(w, r, s.trErr(r, err), info.Path)
97 99 return
98 100 } else if same {
99 s.renderSetup(w, r, "Kies de map voor de repositories.", info.Path)
101 s.renderSetup(w, r, s.tr(r, "err.storageSame"), info.Path)
100 102 return
101 103 }
102 104 previous := s.StoragePath()
103 105 if err := state.Write(s.StateDir, info.Path); err != nil {
104 s.renderSetup(w, r, err.Error(), info.Path)
106 s.renderSetup(w, r, s.trErr(r, err), info.Path)
105 107 return
106 108 }
107 109 s.AdoptStorage(info.Path)
108 110 s.RefreshHooks()
109 notice := "Opslag ingesteld op " + info.Path + ". " + state.Format(info.Free) + " vrij."
111 notice := s.tr(r, "err.storageSet", info.Path, state.Format(info.Free))
110 112 if previous != "" && previous != info.Path {
111 notice = "Opslagpad gewijzigd naar " + info.Path + ". Bestaande data is niet verplaatst. " + state.Format(info.Free) + " vrij."
113 notice = s.tr(r, "err.storageMoved", info.Path, state.Format(info.Free))
112 114 }
113 115 s.redirect(w, r, "/", notice, "")
114 116 }
@@ -126,14 +128,14 @@ func (s *Server) adminOnly(w http.ResponseWriter, r *http.Request) (bool, bool)
126 128 return false, false
127 129 }
128 130 if !u.InstanceAdmin {
129 http.Error(w, "Je mag de opslag niet instellen.", http.StatusForbidden)
131 http.Error(w, s.tr(r, "err.noStorageAdmin"), http.StatusForbidden)
130 132 return false, false
131 133 }
132 134 return true, true
133 135 }
134 136
135 137 func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, prefill string) {
136 v := s.view(w, r, "Opslag")
138 v := s.view(w, r, "title.storage")
137 139 if problem != "" {
138 140 v.Err = problem
139 141 }
@@ -154,7 +156,7 @@ func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, pr
154 156 v.StorageTotal = state.Format(info.Total)
155 157 }
156 158 if err != nil && v.Err == "" {
157 v.Err = err.Error()
159 v.Err = s.trErr(r, err)
158 160 }
159 161 }
160 162 s.render(w, "setup", v)
@@ -10,7 +10,9 @@ import (
10 "gitlab.com/Timfa/bluegit/internal/state"
10 "gitlab.com/Timfa/bluegit/internal/state"
11)
11)
12
12
13const noStorageMsg = "Opslag is nog niet ingesteld. De beheerder kiest een pad in de webinterface.\n"
13func (s *Server) noStorageText(r *http.Request) string {
14 return s.tr(r, "err.noStorage") + "\n"
15}
14
16
15func allowsWithoutStorage(r *http.Request) bool {
17func allowsWithoutStorage(r *http.Request) bool {
16 switch r.URL.Path {
18 switch r.URL.Path {
@@ -33,7 +35,7 @@ func (s *Server) gate(next http.Handler) http.Handler {
33 return
35 return
34 }
36 }
35 if isGitPath(r.URL.Path) || strings.HasPrefix(r.URL.Path, "/api/") {
37 if isGitPath(r.URL.Path) || strings.HasPrefix(r.URL.Path, "/api/") {
36 http.Error(w, noStorageMsg, http.StatusServiceUnavailable)
38 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
37 return
39 return
38 }
40 }
39 if p := s.who(r); p.OK && p.User.InstanceAdmin {
41 if p := s.who(r); p.OK && p.User.InstanceAdmin {
@@ -84,31 +86,31 @@ func (s *Server) setupSave(w http.ResponseWriter, r *http.Request) {
84 return
86 return
85 }
87 }
86 if s.StateDir == "" {
88 if s.StateDir == "" {
87 s.renderSetup(w, r, "Het pad kon niet bewaard worden.", r.FormValue("path"))
89 s.renderSetup(w, r, s.tr(r, "err.storageSave"), r.FormValue("path"))
88 return
90 return
89 }
91 }
90 info, err := state.Inspect(r.FormValue("path"))
92 info, err := state.Inspect(r.FormValue("path"))
91 if err != nil {
93 if err != nil {
92 s.renderSetup(w, r, err.Error(), strings.TrimSpace(r.FormValue("path")))
94 s.renderSetup(w, r, s.trErr(r, err), strings.TrimSpace(r.FormValue("path")))
93 return
95 return
94 }
96 }
95 if same, err := samePath(s.StateDir, info.Path); err != nil {
97 if same, err := samePath(s.StateDir, info.Path); err != nil {
96 s.renderSetup(w, r, err.Error(), info.Path)
98 s.renderSetup(w, r, s.trErr(r, err), info.Path)
97 return
99 return
98 } else if same {
100 } else if same {
99 s.renderSetup(w, r, "Kies de map voor de repositories.", info.Path)
101 s.renderSetup(w, r, s.tr(r, "err.storageSame"), info.Path)
100 return
102 return
101 }
103 }
102 previous := s.StoragePath()
104 previous := s.StoragePath()
103 if err := state.Write(s.StateDir, info.Path); err != nil {
105 if err := state.Write(s.StateDir, info.Path); err != nil {
104 s.renderSetup(w, r, err.Error(), info.Path)
106 s.renderSetup(w, r, s.trErr(r, err), info.Path)
105 return
107 return
106 }
108 }
107 s.AdoptStorage(info.Path)
109 s.AdoptStorage(info.Path)
108 s.RefreshHooks()
110 s.RefreshHooks()
109 notice := "Opslag ingesteld op " + info.Path + ". " + state.Format(info.Free) + " vrij."
111 notice := s.tr(r, "err.storageSet", info.Path, state.Format(info.Free))
110 if previous != "" && previous != info.Path {
112 if previous != "" && previous != info.Path {
111 notice = "Opslagpad gewijzigd naar " + info.Path + ". Bestaande data is niet verplaatst. " + state.Format(info.Free) + " vrij."
113 notice = s.tr(r, "err.storageMoved", info.Path, state.Format(info.Free))
112 }
114 }
113 s.redirect(w, r, "/", notice, "")
115 s.redirect(w, r, "/", notice, "")
114}
116}
@@ -126,14 +128,14 @@ func (s *Server) adminOnly(w http.ResponseWriter, r *http.Request) (bool, bool)
126 return false, false
128 return false, false
127 }
129 }
128 if !u.InstanceAdmin {
130 if !u.InstanceAdmin {
129 http.Error(w, "Je mag de opslag niet instellen.", http.StatusForbidden)
131 http.Error(w, s.tr(r, "err.noStorageAdmin"), http.StatusForbidden)
130 return false, false
132 return false, false
131 }
133 }
132 return true, true
134 return true, true
133}
135}
134
136
135func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, prefill string) {
137func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, prefill string) {
136 v := s.view(w, r, "Opslag")
138 v := s.view(w, r, "title.storage")
137 if problem != "" {
139 if problem != "" {
138 v.Err = problem
140 v.Err = problem
139 }
141 }
@@ -154,7 +156,7 @@ func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, pr
154 v.StorageTotal = state.Format(info.Total)
156 v.StorageTotal = state.Format(info.Total)
155 }
157 }
156 if err != nil && v.Err == "" {
158 if err != nil && v.Err == "" {
157 v.Err = err.Error()
159 v.Err = s.trErr(r, err)
158 }
160 }
159 }
161 }
160 s.render(w, "setup", v)
162 s.render(w, "setup", v)
internal/server/slug.go +26 −5
@@ -8,8 +8,15 @@ import (
8 8
9 9 "gitlab.com/Timfa/bluegit/internal/access"
10 10 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/store"
11 12 )
12 13
14 type slugBody struct {
15 Name string `json:"name"`
16 URL string `json:"url"`
17 Available bool `json:"available"`
18 }
19
13 20 func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {
14 21 u, ok := s.loginRequired(w, r)
15 22 if !ok {
@@ -20,22 +27,36 @@ func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {
20 27 w.Header().Set("Content-Type", "application/json; charset=utf-8")
21 28 slug, err := names.Slug(kind, raw)
22 29 if strings.TrimSpace(raw) == "" || err != nil {
23 _ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})
30 _ = json.NewEncoder(w).Encode(slugBody{})
24 31 return
25 32 }
26 33 host := publicHost(s.Cfg.BaseURL, r.Host)
27 34 var path string
35 ownerKind, ownerID := "user", u.ID
28 36 switch kind {
29 37 case "repo":
30 owner := s.previewOwner(r, u.ID, u.Username)
31 path = host + "/" + owner + "/" + slug
38 ownerKind, ownerID, path = s.previewOwnerRef(r, u)
39 path = host + "/" + path + "/" + slug
32 40 case "group":
33 41 path = host + "/groups/" + slug
34 42 default:
35 _ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})
43 _ = json.NewEncoder(w).Encode(slugBody{})
36 44 return
37 45 }
38 _ = json.NewEncoder(w).Encode(map[string]string{"name": slug, "url": path})
46 taken, err := s.Store.SlugTaken(r.Context(), kind, slug, ownerKind, ownerID)
47 _ = json.NewEncoder(w).Encode(slugBody{Name: slug, URL: path, Available: err == nil && !taken})
48 }
49
50 func (s *Server) previewOwnerRef(r *http.Request, u store.User) (string, int64, string) {
51 path := s.previewOwner(r, u.ID, u.Username)
52 if path == u.Username {
53 return "user", u.ID, path
54 }
55 g, err := s.Store.GroupByPath(r.Context(), path)
56 if err != nil {
57 return "user", u.ID, u.Username
58 }
59 return "group", g.ID, g.Path
39 60 }
40 61
41 62 func (s *Server) previewOwner(r *http.Request, userID int64, username string) string {
@@ -8,8 +8,15 @@ import (
8
8
9 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/names"
10 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/store"
11)
12)
12
13
14type slugBody struct {
15 Name string `json:"name"`
16 URL string `json:"url"`
17 Available bool `json:"available"`
18}
19
13func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {
20func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {
14 u, ok := s.loginRequired(w, r)
21 u, ok := s.loginRequired(w, r)
15 if !ok {
22 if !ok {
@@ -20,22 +27,36 @@ func (s *Server) slugPreview(w http.ResponseWriter, r *http.Request) {
20 w.Header().Set("Content-Type", "application/json; charset=utf-8")
27 w.Header().Set("Content-Type", "application/json; charset=utf-8")
21 slug, err := names.Slug(kind, raw)
28 slug, err := names.Slug(kind, raw)
22 if strings.TrimSpace(raw) == "" || err != nil {
29 if strings.TrimSpace(raw) == "" || err != nil {
23 _ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})
30 _ = json.NewEncoder(w).Encode(slugBody{})
24 return
31 return
25 }
32 }
26 host := publicHost(s.Cfg.BaseURL, r.Host)
33 host := publicHost(s.Cfg.BaseURL, r.Host)
27 var path string
34 var path string
35 ownerKind, ownerID := "user", u.ID
28 switch kind {
36 switch kind {
29 case "repo":
37 case "repo":
30 owner := s.previewOwner(r, u.ID, u.Username)
38 ownerKind, ownerID, path = s.previewOwnerRef(r, u)
31 path = host + "/" + owner + "/" + slug
39 path = host + "/" + path + "/" + slug
32 case "group":
40 case "group":
33 path = host + "/groups/" + slug
41 path = host + "/groups/" + slug
34 default:
42 default:
35 _ = json.NewEncoder(w).Encode(map[string]string{"name": "", "url": ""})
43 _ = json.NewEncoder(w).Encode(slugBody{})
36 return
44 return
37 }
45 }
38 _ = json.NewEncoder(w).Encode(map[string]string{"name": slug, "url": path})
46 taken, err := s.Store.SlugTaken(r.Context(), kind, slug, ownerKind, ownerID)
47 _ = json.NewEncoder(w).Encode(slugBody{Name: slug, URL: path, Available: err == nil && !taken})
48}
49
50func (s *Server) previewOwnerRef(r *http.Request, u store.User) (string, int64, string) {
51 path := s.previewOwner(r, u.ID, u.Username)
52 if path == u.Username {
53 return "user", u.ID, path
54 }
55 g, err := s.Store.GroupByPath(r.Context(), path)
56 if err != nil {
57 return "user", u.ID, u.Username
58 }
59 return "group", g.ID, g.Path
39}
60}
40
61
41func (s *Server) previewOwner(r *http.Request, userID int64, username string) string {
62func (s *Server) previewOwner(r *http.Request, userID int64, username string) string {
internal/server/static/NotoSansCuneiform-Regular.ttf added Binary file +0 −0

The contents of this binary file are not shown.

internal/server/static/OFL-cuneiform.txt added +93 −0
@@ -0,0 +1,93 @@
1 Copyright 2022 The Noto Project Authors (https://github.com/notofonts/cuneiform)
2
3 This Font Software is licensed under the SIL Open Font License, Version 1.1.
4 This license is copied below, and is also available with a FAQ at:
5 https://scripts.sil.org/OFL
6
7
8 -----------------------------------------------------------
9 SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10 -----------------------------------------------------------
11
12 PREAMBLE
13 The goals of the Open Font License (OFL) are to stimulate worldwide
14 development of collaborative font projects, to support the font creation
15 efforts of academic and linguistic communities, and to provide a free and
16 open framework in which fonts may be shared and improved in partnership
17 with others.
18
19 The OFL allows the licensed fonts to be used, studied, modified and
20 redistributed freely as long as they are not sold by themselves. The
21 fonts, including any derivative works, can be bundled, embedded,
22 redistributed and/or sold with any software provided that any reserved
23 names are not used by derivative works. The fonts and derivatives,
24 however, cannot be released under any other type of license. The
25 requirement for fonts to remain under this license does not apply
26 to any document created using the fonts or their derivatives.
27
28 DEFINITIONS
29 "Font Software" refers to the set of files released by the Copyright
30 Holder(s) under this license and clearly marked as such. This may
31 include source files, build scripts and documentation.
32
33 "Reserved Font Name" refers to any names specified as such after the
34 copyright statement(s).
35
36 "Original Version" refers to the collection of Font Software components as
37 distributed by the Copyright Holder(s).
38
39 "Modified Version" refers to any derivative made by adding to, deleting,
40 or substituting -- in part or in whole -- any of the components of the
41 Original Version, by changing formats or by porting the Font Software to a
42 new environment.
43
44 "Author" refers to any designer, engineer, programmer, technical
45 writer or other person who contributed to the Font Software.
46
47 PERMISSION & CONDITIONS
48 Permission is hereby granted, free of charge, to any person obtaining
49 a copy of the Font Software, to use, study, copy, merge, embed, modify,
50 redistribute, and sell modified and unmodified copies of the Font
51 Software, subject to the following conditions:
52
53 1) Neither the Font Software nor any of its individual components,
54 in Original or Modified Versions, may be sold by itself.
55
56 2) Original or Modified Versions of the Font Software may be bundled,
57 redistributed and/or sold with any software, provided that each copy
58 contains the above copyright notice and this license. These can be
59 included either as stand-alone text files, human-readable headers or
60 in the appropriate machine-readable metadata fields within text or
61 binary files as long as those fields can be easily viewed by the user.
62
63 3) No Modified Version of the Font Software may use the Reserved Font
64 Name(s) unless explicit written permission is granted by the corresponding
65 Copyright Holder. This restriction only applies to the primary font name as
66 presented to the users.
67
68 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69 Software shall not be used to promote, endorse or advertise any
70 Modified Version, except to acknowledge the contribution(s) of the
71 Copyright Holder(s) and the Author(s) or with their explicit written
72 permission.
73
74 5) The Font Software, modified or unmodified, in part or in whole,
75 must be distributed entirely under this license, and must not be
76 distributed under any other license. The requirement for fonts to
77 remain under this license does not apply to any document created
78 using the Font Software.
79
80 TERMINATION
81 This license becomes null and void if any of the above conditions are
82 not met.
83
84 DISCLAIMER
85 THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88 OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89 COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93 OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -0,0 +1,93 @@
1Copyright 2022 The Noto Project Authors (https://github.com/notofonts/cuneiform)
2
3This Font Software is licensed under the SIL Open Font License, Version 1.1.
4This license is copied below, and is also available with a FAQ at:
5https://scripts.sil.org/OFL
6
7
8-----------------------------------------------------------
9SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10-----------------------------------------------------------
11
12PREAMBLE
13The goals of the Open Font License (OFL) are to stimulate worldwide
14development of collaborative font projects, to support the font creation
15efforts of academic and linguistic communities, and to provide a free and
16open framework in which fonts may be shared and improved in partnership
17with others.
18
19The OFL allows the licensed fonts to be used, studied, modified and
20redistributed freely as long as they are not sold by themselves. The
21fonts, including any derivative works, can be bundled, embedded,
22redistributed and/or sold with any software provided that any reserved
23names are not used by derivative works. The fonts and derivatives,
24however, cannot be released under any other type of license. The
25requirement for fonts to remain under this license does not apply
26to any document created using the fonts or their derivatives.
27
28DEFINITIONS
29"Font Software" refers to the set of files released by the Copyright
30Holder(s) under this license and clearly marked as such. This may
31include source files, build scripts and documentation.
32
33"Reserved Font Name" refers to any names specified as such after the
34copyright statement(s).
35
36"Original Version" refers to the collection of Font Software components as
37distributed by the Copyright Holder(s).
38
39"Modified Version" refers to any derivative made by adding to, deleting,
40or substituting -- in part or in whole -- any of the components of the
41Original Version, by changing formats or by porting the Font Software to a
42new environment.
43
44"Author" refers to any designer, engineer, programmer, technical
45writer or other person who contributed to the Font Software.
46
47PERMISSION & CONDITIONS
48Permission is hereby granted, free of charge, to any person obtaining
49a copy of the Font Software, to use, study, copy, merge, embed, modify,
50redistribute, and sell modified and unmodified copies of the Font
51Software, subject to the following conditions:
52
531) Neither the Font Software nor any of its individual components,
54in Original or Modified Versions, may be sold by itself.
55
562) Original or Modified Versions of the Font Software may be bundled,
57redistributed and/or sold with any software, provided that each copy
58contains the above copyright notice and this license. These can be
59included either as stand-alone text files, human-readable headers or
60in the appropriate machine-readable metadata fields within text or
61binary files as long as those fields can be easily viewed by the user.
62
633) No Modified Version of the Font Software may use the Reserved Font
64Name(s) unless explicit written permission is granted by the corresponding
65Copyright Holder. This restriction only applies to the primary font name as
66presented to the users.
67
684) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69Software shall not be used to promote, endorse or advertise any
70Modified Version, except to acknowledge the contribution(s) of the
71Copyright Holder(s) and the Author(s) or with their explicit written
72permission.
73
745) The Font Software, modified or unmodified, in part or in whole,
75must be distributed entirely under this license, and must not be
76distributed under any other license. The requirement for fonts to
77remain under this license does not apply to any document created
78using the Font Software.
79
80TERMINATION
81This license becomes null and void if any of the above conditions are
82not met.
83
84DISCLAIMER
85THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93OTHER DEALINGS IN THE FONT SOFTWARE.
internal/server/static/new.js added +100 −0
@@ -0,0 +1,100 @@
1 (function () {
2 var chooser = document.querySelector("[data-chooser]");
3 var sheet = document.querySelector("[data-sheet]");
4 if (!chooser || !sheet) {
5 return;
6 }
7 var openTimer = 0;
8 function show(kind) {
9 var forms = sheet.querySelectorAll("form[data-kind]");
10 for (var i = 0; i < forms.length; i++) {
11 var form = forms[i];
12 var on = form.getAttribute("data-kind") === kind;
13 form.hidden = !on;
14 var err = form.querySelector("[data-form-err]");
15 if (err) {
16 err.textContent = "";
17 }
18 }
19 sheet.hidden = false;
20 sheet.classList.remove("closing");
21 sheet.classList.add("open");
22 var current = sheet.querySelector("form[data-kind='" + kind + "'] [name=name]");
23 if (current) {
24 current.focus();
25 }
26 }
27 function open(kind) {
28 chooser.classList.add("away");
29 clearTimeout(openTimer);
30 openTimer = setTimeout(function () { show(kind); }, 280);
31 }
32 function close() {
33 sheet.classList.add("closing");
34 setTimeout(function () {
35 sheet.hidden = true;
36 sheet.classList.remove("open", "closing");
37 chooser.classList.remove("away");
38 }, 280);
39 }
40 var picks = chooser.querySelectorAll("[data-open]");
41 for (var i = 0; i < picks.length; i++) {
42 picks[i].addEventListener("click", function (ev) {
43 open(ev.currentTarget.getAttribute("data-open"));
44 });
45 }
46 var closer = sheet.querySelector("[data-close]");
47 if (closer) {
48 closer.addEventListener("click", close);
49 }
50 var forms = sheet.querySelectorAll("form[data-kind]");
51 for (var j = 0; j < forms.length; j++) {
52 forms[j].addEventListener("submit", function (ev) {
53 ev.preventDefault();
54 var form = ev.currentTarget;
55 var err = form.querySelector("[data-form-err]");
56 if (err) {
57 err.textContent = "";
58 }
59 var body = new URLSearchParams(new FormData(form));
60 fetch(form.action, {
61 method: "POST",
62 body: body,
63 headers: {
64 "X-BlueGit": "modal",
65 "Accept": "application/json",
66 "Content-Type": "application/x-www-form-urlencoded"
67 }
68 }).then(function (res) {
69 var type = res.headers.get("content-type") || "";
70 if (type.indexOf("json") === -1) {
71 if (res.ok) {
72 fold(res.url);
73 return;
74 }
75 if (err) {
76 err.textContent = form.getAttribute("data-bad") || "";
77 }
78 return;
79 }
80 return res.json().then(function (data) {
81 if (!res.ok || !data.ok) {
82 if (err) {
83 err.textContent = (data && data.error) || form.getAttribute("data-bad") || "";
84 }
85 return;
86 }
87 fold(data.url);
88 });
89 }).catch(function () {
90 if (err) {
91 err.textContent = form.getAttribute("data-bad") || "";
92 }
93 });
94 });
95 }
96 function fold(url) {
97 sheet.classList.add("closing");
98 setTimeout(function () { window.location.assign(url); }, 280);
99 }
100 })();
@@ -0,0 +1,100 @@
1(function () {
2 var chooser = document.querySelector("[data-chooser]");
3 var sheet = document.querySelector("[data-sheet]");
4 if (!chooser || !sheet) {
5 return;
6 }
7 var openTimer = 0;
8 function show(kind) {
9 var forms = sheet.querySelectorAll("form[data-kind]");
10 for (var i = 0; i < forms.length; i++) {
11 var form = forms[i];
12 var on = form.getAttribute("data-kind") === kind;
13 form.hidden = !on;
14 var err = form.querySelector("[data-form-err]");
15 if (err) {
16 err.textContent = "";
17 }
18 }
19 sheet.hidden = false;
20 sheet.classList.remove("closing");
21 sheet.classList.add("open");
22 var current = sheet.querySelector("form[data-kind='" + kind + "'] [name=name]");
23 if (current) {
24 current.focus();
25 }
26 }
27 function open(kind) {
28 chooser.classList.add("away");
29 clearTimeout(openTimer);
30 openTimer = setTimeout(function () { show(kind); }, 280);
31 }
32 function close() {
33 sheet.classList.add("closing");
34 setTimeout(function () {
35 sheet.hidden = true;
36 sheet.classList.remove("open", "closing");
37 chooser.classList.remove("away");
38 }, 280);
39 }
40 var picks = chooser.querySelectorAll("[data-open]");
41 for (var i = 0; i < picks.length; i++) {
42 picks[i].addEventListener("click", function (ev) {
43 open(ev.currentTarget.getAttribute("data-open"));
44 });
45 }
46 var closer = sheet.querySelector("[data-close]");
47 if (closer) {
48 closer.addEventListener("click", close);
49 }
50 var forms = sheet.querySelectorAll("form[data-kind]");
51 for (var j = 0; j < forms.length; j++) {
52 forms[j].addEventListener("submit", function (ev) {
53 ev.preventDefault();
54 var form = ev.currentTarget;
55 var err = form.querySelector("[data-form-err]");
56 if (err) {
57 err.textContent = "";
58 }
59 var body = new URLSearchParams(new FormData(form));
60 fetch(form.action, {
61 method: "POST",
62 body: body,
63 headers: {
64 "X-BlueGit": "modal",
65 "Accept": "application/json",
66 "Content-Type": "application/x-www-form-urlencoded"
67 }
68 }).then(function (res) {
69 var type = res.headers.get("content-type") || "";
70 if (type.indexOf("json") === -1) {
71 if (res.ok) {
72 fold(res.url);
73 return;
74 }
75 if (err) {
76 err.textContent = form.getAttribute("data-bad") || "";
77 }
78 return;
79 }
80 return res.json().then(function (data) {
81 if (!res.ok || !data.ok) {
82 if (err) {
83 err.textContent = (data && data.error) || form.getAttribute("data-bad") || "";
84 }
85 return;
86 }
87 fold(data.url);
88 });
89 }).catch(function () {
90 if (err) {
91 err.textContent = form.getAttribute("data-bad") || "";
92 }
93 });
94 });
95 }
96 function fold(url) {
97 sheet.classList.add("closing");
98 setTimeout(function () { window.location.assign(url); }, 280);
99 }
100})();
internal/server/static/repo.js +1 −1
@@ -29,7 +29,7 @@
29 29 }
30 30 shown = true;
31 31 var old = btn.textContent;
32 btn.textContent = "Gekopieerd";
32 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
33 33 setTimeout(function () { btn.textContent = old; }, 1200);
34 34 }
35 35 if (copyNow(value)) {
@@ -29,7 +29,7 @@
29 }
29 }
30 shown = true;
30 shown = true;
31 var old = btn.textContent;
31 var old = btn.textContent;
32 btn.textContent = "Gekopieerd";
32 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
33 setTimeout(function () { btn.textContent = old; }, 1200);
33 setTimeout(function () { btn.textContent = old; }, 1200);
34 }
34 }
35 if (copyNow(value)) {
35 if (copyNow(value)) {
internal/server/static/slug.js +36 −7
@@ -6,17 +6,24 @@
6 6
7 7 function bind(form) {
8 8 var name = form.querySelector("[name=name]");
9 var out = form.querySelector("[data-slug-out]");
9 var text = form.querySelector("[data-slug-text]");
10 var flag = form.querySelector("[data-slug-flag]");
10 11 var owner = form.querySelector("[name=group]");
11 if (!name || !out) {
12 if (!name || !text || !flag) {
12 13 return;
13 14 }
14 15 var seq = 0;
16 var timer = 0;
17 function clear() {
18 text.textContent = "";
19 flag.textContent = "";
20 flag.className = "flag";
21 }
15 22 function update() {
16 23 var n = ++seq;
17 24 var value = name.value;
18 25 if (!value.trim()) {
19 out.textContent = "";
26 clear();
20 27 return;
21 28 }
22 29 var q = new URLSearchParams();
@@ -36,17 +43,39 @@
36 43 if (n !== seq) {
37 44 return;
38 45 }
39 out.textContent = data.name ? data.name + " · " + data.url : "Deze naam kan niet.";
46 if (!data.name) {
47 text.textContent = "";
48 flag.textContent = form.getAttribute("data-bad") || "";
49 flag.className = "flag bad";
50 return;
51 }
52 text.textContent = data.name + " · " + data.url;
53 if (data.available) {
54 flag.textContent = form.getAttribute("data-free") || "";
55 flag.className = "flag ok";
56 } else {
57 flag.textContent = form.getAttribute("data-taken") || "";
58 flag.className = "flag bad";
59 }
40 60 })
41 61 .catch(function () {
42 62 if (n === seq) {
43 out.textContent = "";
63 clear();
44 64 }
45 65 });
46 66 }
47 name.addEventListener("input", update);
67 function schedule() {
68 clearTimeout(timer);
69 if (!name.value.trim()) {
70 seq++;
71 clear();
72 return;
73 }
74 timer = setTimeout(update, 1000);
75 }
76 name.addEventListener("input", schedule);
48 77 if (owner) {
49 owner.addEventListener("change", update);
78 owner.addEventListener("change", schedule);
50 79 }
51 80 }
52 81 })();
@@ -6,17 +6,24 @@
6
6
7 function bind(form) {
7 function bind(form) {
8 var name = form.querySelector("[name=name]");
8 var name = form.querySelector("[name=name]");
9 var out = form.querySelector("[data-slug-out]");
9 var text = form.querySelector("[data-slug-text]");
10 var flag = form.querySelector("[data-slug-flag]");
10 var owner = form.querySelector("[name=group]");
11 var owner = form.querySelector("[name=group]");
11 if (!name || !out) {
12 if (!name || !text || !flag) {
12 return;
13 return;
13 }
14 }
14 var seq = 0;
15 var seq = 0;
16 var timer = 0;
17 function clear() {
18 text.textContent = "";
19 flag.textContent = "";
20 flag.className = "flag";
21 }
15 function update() {
22 function update() {
16 var n = ++seq;
23 var n = ++seq;
17 var value = name.value;
24 var value = name.value;
18 if (!value.trim()) {
25 if (!value.trim()) {
19 out.textContent = "";
26 clear();
20 return;
27 return;
21 }
28 }
22 var q = new URLSearchParams();
29 var q = new URLSearchParams();
@@ -36,17 +43,39 @@
36 if (n !== seq) {
43 if (n !== seq) {
37 return;
44 return;
38 }
45 }
39 out.textContent = data.name ? data.name + " · " + data.url : "Deze naam kan niet.";
46 if (!data.name) {
47 text.textContent = "";
48 flag.textContent = form.getAttribute("data-bad") || "";
49 flag.className = "flag bad";
50 return;
51 }
52 text.textContent = data.name + " · " + data.url;
53 if (data.available) {
54 flag.textContent = form.getAttribute("data-free") || "";
55 flag.className = "flag ok";
56 } else {
57 flag.textContent = form.getAttribute("data-taken") || "";
58 flag.className = "flag bad";
59 }
40 })
60 })
41 .catch(function () {
61 .catch(function () {
42 if (n === seq) {
62 if (n === seq) {
43 out.textContent = "";
63 clear();
44 }
64 }
45 });
65 });
46 }
66 }
47 name.addEventListener("input", update);
67 function schedule() {
68 clearTimeout(timer);
69 if (!name.value.trim()) {
70 seq++;
71 clear();
72 return;
73 }
74 timer = setTimeout(update, 1000);
75 }
76 name.addEventListener("input", schedule);
48 if (owner) {
77 if (owner) {
49 owner.addEventListener("change", update);
78 owner.addEventListener("change", schedule);
50 }
79 }
51 }
80 }
52})();
81})();
internal/server/static/style.css +44 −0
@@ -184,8 +184,52 @@ table.code td.src { white-space: pre; }
184 184 .heat-total, .heat-legend, .heat-foot .muted { margin: 0; }
185 185 .heat-legend { display: flex; align-items: center; justify-content: flex-end; gap: 4px; }
186 186 .heat-foot .muted { text-align: right; margin-top: 0.2rem; }
187 .chooser { display: flex; gap: 1rem; flex-wrap: wrap; margin: 1.2rem 0 0.4rem; transition: opacity .28s ease, transform .28s ease; }
188 .chooser.away { opacity: 0; transform: translateY(-10px) scale(.97); pointer-events: none; }
189 .pick { min-width: 11rem; padding: 1rem 1.3rem; font-size: 1.05rem; }
190 .sheet { transform-origin: top center; }
191 .sheet.open { animation: unfold .32s ease; }
192 .sheet.closing { animation: fold .28s ease forwards; }
193 @keyframes unfold {
194 from { opacity: 0; transform: scaleY(.55); }
195 to { opacity: 1; transform: scaleY(1); }
196 }
197 @keyframes fold {
198 from { opacity: 1; transform: scaleY(1); }
199 to { opacity: 0; transform: scaleY(.45); }
200 }
201 .preview { min-height: 1.2rem; display: flex; gap: .7rem; align-items: baseline; flex-wrap: wrap; }
202 .flag.ok { color: var(--ok); font-weight: 600; }
203 .flag.bad { color: var(--bad); font-weight: 600; }
204 .form-err:empty { display: none; }
205 .form-err { color: var(--bad); margin: 0.2rem 0; }
206 .bar { display: flex; gap: .6rem; align-items: center; margin: .4rem 0 .2rem; }
207 .bar input[type="search"] { flex: 1; }
208 .sortlabel { color: var(--muted); }
209 .iconbtn { text-decoration: none; border: 1px solid var(--line); border-radius: 8px; padding: .35rem .55rem; background: white; color: var(--ink); }
210 .repolist { list-style: none; padding: 0; margin: .4rem 0 1rem; }
211 .repolist > li { display: flex; align-items: center; gap: .7rem; padding: .75rem .2rem; border-bottom: 1px solid var(--line); }
212 .reponame { font-weight: 600; text-decoration: none; }
213 .stars { color: #9a6700; white-space: nowrap; }
214 .grown { flex: 1; }
215 .rowmenu { position: relative; }
216 .rowmenu > summary { list-style: none; cursor: pointer; border: 1px solid var(--line); border-radius: 8px; padding: .15rem .55rem; background: white; }
217 .rowmenu > summary::-webkit-details-marker { display: none; }
218 .rowmenu .menu-panel { position: absolute; right: 0; z-index: 3; min-width: 9rem; }
219 .rowmenu .menu-panel button, .rowmenu .menu-panel form { width: 100%; }
220 .rowmenu .menu-panel button { text-align: left; border-radius: 8px; }
221 img.tile { object-fit: cover; background: #fff; }
222 @font-face {
223 font-family: "Noto Sans Cuneiform";
224 src: url("/assets/NotoSansCuneiform-Regular.ttf") format("truetype");
225 font-display: swap;
226 }
227 html.cunei, html.cunei body, html.cunei button, html.cunei input, html.cunei select, html.cunei textarea {
228 font-family: "Noto Sans Cuneiform", "Segoe UI", sans-serif;
229 }
187 230 @media (max-width: 800px) {
188 231 .proj, .fileview { grid-template-columns: 1fr; }
189 232 .heat-foot { flex-direction: column; align-items: flex-start; }
190 233 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
234 .repolist > li { flex-wrap: wrap; }
191 235 }
@@ -184,8 +184,52 @@ table.code td.src { white-space: pre; }
184.heat-total, .heat-legend, .heat-foot .muted { margin: 0; }
184.heat-total, .heat-legend, .heat-foot .muted { margin: 0; }
185.heat-legend { display: flex; align-items: center; justify-content: flex-end; gap: 4px; }
185.heat-legend { display: flex; align-items: center; justify-content: flex-end; gap: 4px; }
186.heat-foot .muted { text-align: right; margin-top: 0.2rem; }
186.heat-foot .muted { text-align: right; margin-top: 0.2rem; }
187.chooser { display: flex; gap: 1rem; flex-wrap: wrap; margin: 1.2rem 0 0.4rem; transition: opacity .28s ease, transform .28s ease; }
188.chooser.away { opacity: 0; transform: translateY(-10px) scale(.97); pointer-events: none; }
189.pick { min-width: 11rem; padding: 1rem 1.3rem; font-size: 1.05rem; }
190.sheet { transform-origin: top center; }
191.sheet.open { animation: unfold .32s ease; }
192.sheet.closing { animation: fold .28s ease forwards; }
193@keyframes unfold {
194 from { opacity: 0; transform: scaleY(.55); }
195 to { opacity: 1; transform: scaleY(1); }
196}
197@keyframes fold {
198 from { opacity: 1; transform: scaleY(1); }
199 to { opacity: 0; transform: scaleY(.45); }
200}
201.preview { min-height: 1.2rem; display: flex; gap: .7rem; align-items: baseline; flex-wrap: wrap; }
202.flag.ok { color: var(--ok); font-weight: 600; }
203.flag.bad { color: var(--bad); font-weight: 600; }
204.form-err:empty { display: none; }
205.form-err { color: var(--bad); margin: 0.2rem 0; }
206.bar { display: flex; gap: .6rem; align-items: center; margin: .4rem 0 .2rem; }
207.bar input[type="search"] { flex: 1; }
208.sortlabel { color: var(--muted); }
209.iconbtn { text-decoration: none; border: 1px solid var(--line); border-radius: 8px; padding: .35rem .55rem; background: white; color: var(--ink); }
210.repolist { list-style: none; padding: 0; margin: .4rem 0 1rem; }
211.repolist > li { display: flex; align-items: center; gap: .7rem; padding: .75rem .2rem; border-bottom: 1px solid var(--line); }
212.reponame { font-weight: 600; text-decoration: none; }
213.stars { color: #9a6700; white-space: nowrap; }
214.grown { flex: 1; }
215.rowmenu { position: relative; }
216.rowmenu > summary { list-style: none; cursor: pointer; border: 1px solid var(--line); border-radius: 8px; padding: .15rem .55rem; background: white; }
217.rowmenu > summary::-webkit-details-marker { display: none; }
218.rowmenu .menu-panel { position: absolute; right: 0; z-index: 3; min-width: 9rem; }
219.rowmenu .menu-panel button, .rowmenu .menu-panel form { width: 100%; }
220.rowmenu .menu-panel button { text-align: left; border-radius: 8px; }
221img.tile { object-fit: cover; background: #fff; }
222@font-face {
223 font-family: "Noto Sans Cuneiform";
224 src: url("/assets/NotoSansCuneiform-Regular.ttf") format("truetype");
225 font-display: swap;
226}
227html.cunei, html.cunei body, html.cunei button, html.cunei input, html.cunei select, html.cunei textarea {
228 font-family: "Noto Sans Cuneiform", "Segoe UI", sans-serif;
229}
187@media (max-width: 800px) {
230@media (max-width: 800px) {
188 .proj, .fileview { grid-template-columns: 1fr; }
231 .proj, .fileview { grid-template-columns: 1fr; }
189 .heat-foot { flex-direction: column; align-items: flex-start; }
232 .heat-foot { flex-direction: column; align-items: flex-start; }
190 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
233 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
234 .repolist > li { flex-wrap: wrap; }
191}
235}
internal/server/templates/collab.html +174 −89
@@ -1,19 +1,19 @@
1 1 {{define "mrs"}}
2 2 {{template "layout-start" .}}
3 <h1>Merge requests</h1>
3 <h1>{{t "mr.title"}}</h1>
4 4 {{template "repotabs" .}}
5 5 <ul class="clean">
6 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">Geen merge requests.</li>{{end}}
6 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
7 7 </ul>
8 8 {{if .CanWrite}}
9 9 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
10 <h2>Nieuw</h2>
10 <h2>{{t "mr.new"}}</h2>
11 11 <input type="hidden" name="csrf" value="{{.CSRF}}">
12 <label>Titel <input name="title" required></label>
13 <label>Beschrijving <textarea name="description"></textarea></label>
14 <label>Bron <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15 <label>Doel <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
16 <button type="submit">Openen</button>
12 <label>{{t "mr.titleField"}} <input name="title" required></label>
13 <label>{{t "mr.description"}} <textarea name="description"></textarea></label>
14 <label>{{t "mr.source"}} <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15 <label>{{t "mr.target"}} <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
16 <button type="submit">{{t "action.open"}}</button>
17 17 </form>
18 18 {{end}}
19 19 {{template "layout-end" .}}
@@ -25,27 +25,27 @@
25 25 {{template "repotabs" .}}
26 26 <p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>
27 27 {{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}
28 <h2>Commits</h2>
29 <pre>{{if .Diff}}{{.Diff}}{{else}}geen commits vóór de doelbranch, of de branch ontbreekt{{end}}</pre>
28 <h2>{{t "mr.commits"}}</h2>
29 <pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
30 30 {{if .CanMerge}}
31 31 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
32 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">Samenvoegen</button>
32 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.merge"}}</button>
33 33 </form>
34 34 {{end}}
35 35 {{if and .User (eq .MR.Status "open")}}
36 36 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">Sluiten</button>
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
38 38 </form>
39 39 {{end}}
40 <h2>Reacties</h2>
40 <h2>{{t "mr.comments"}}</h2>
41 41 <ul class="clean">
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">Nog geen reacties.</li>{{end}}
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
43 43 </ul>
44 44 {{if .User}}
45 45 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
46 46 <input type="hidden" name="csrf" value="{{.CSRF}}">
47 <label>Reactie <textarea name="body" required></textarea></label>
48 <button type="submit">Plaatsen</button>
47 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
48 <button type="submit">{{t "action.post"}}</button>
49 49 </form>
50 50 {{end}}
51 51 {{template "layout-end" .}}
@@ -53,24 +53,24 @@
53 53
54 54 {{define "pipelines"}}
55 55 {{template "layout-start" .}}
56 <h1>Pipelines</h1>
56 <h1>{{t "pipe.title"}}</h1>
57 57 {{template "repotabs" .}}
58 58 {{if .CanWrite}}
59 59 <form method="post" action="/{{.Repo.FullPath}}/-/pipelines" class="row">
60 60 <input type="hidden" name="csrf" value="{{.CSRF}}">
61 <input name="ref" placeholder="branch, leeg is de standaard">
62 <button type="submit">Starten</button>
61 <input name="ref" placeholder="{{t "pipe.ref"}}">
62 <button type="submit">{{t "action.start"}}</button>
63 63 </form>
64 64 {{end}}
65 65 <ul class="clean">
66 {{range .Pipes}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Ref}} {{short .CommitSHA}}</span></li>{{else}}<li class="muted">Nog geen pipelines. Voeg <code>blue-ci-cd.yml</code> toe in de root.</li>{{end}}
66 {{range .Pipes}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Ref}} {{short .CommitSHA}}</span></li>{{else}}<li class="muted">{{t "pipe.none"}}</li>{{end}}
67 67 </ul>
68 68 {{template "layout-end" .}}
69 69 {{end}}
70 70
71 71 {{define "pipeline"}}
72 72 {{template "layout-start" .}}
73 <h1>Pipeline #{{.Pipe.ID}}</h1>
73 <h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1>
74 74 {{template "repotabs" .}}
75 75 <p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <code>{{.Pipe.CommitSHA}}</code></p>
76 76 {{range .Jobs}}
@@ -84,7 +84,7 @@
84 84
85 85 {{define "releases"}}
86 86 {{template "layout-start" .}}
87 <h1>Releases</h1>
87 <h1>{{t "title.releases"}}</h1>
88 88 {{template "repotabs" .}}
89 89 {{range .Releases}}
90 90 <article class="panel">
@@ -93,75 +93,89 @@
93 93 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
94 94 <ul>
95 95 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
96 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} bytes</span></li>{{end}}
96 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span></li>{{end}}
97 97 </ul>
98 98 </article>
99 {{else}}<p class="muted">Nog geen releases.</p>{{end}}
99 {{else}}<p class="muted">{{t "rel.none"}}</p>{{end}}
100 100 {{template "layout-end" .}}
101 101 {{end}}
102 102
103 {{define "roleselect"}}
104 <select name="role">
105 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
106 <option value="developer" {{if eq . "developer"}}selected{{end}}>{{t "role.developer"}}</option>
107 <option value="maintainer" {{if eq . "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
108 </select>
109 {{end}}
110
103 111 {{define "settings"}}
104 112 {{template "layout-start" .}}
105 <h1>Instellingen</h1>
113 <h1>{{t "title.settings"}}</h1>
106 114 {{template "repotabs" .}}
107 {{if not .CanAdmin}}<p>Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: {{.Role.Label}}.</p>{{end}}
115 {{if not .CanAdmin}}<p>{{t "set.onlyAdmin" (roleName .Role)}}</p>{{end}}
108 116 {{if .CanAdmin}}
109 117 <p class="sub">
110 <a href="?tab=algemeen">Algemeen</a>
111 <a href="?tab=leden">Leden</a>
112 <a href="?tab=branches">Branches</a>
113 <a href="?tab=geheimen">Geheimen</a>
114 <a href="?tab=webhooks">Webhooks</a>
118 <a href="?tab=general"{{if or (eq .Tab "general") (eq .Tab "")}} class="on"{{end}}>{{t "set.general"}}</a>
119 <a href="?tab=members"{{if eq .Tab "members"}} class="on"{{end}}>{{t "set.members"}}</a>
120 <a href="?tab=branches"{{if eq .Tab "branches"}} class="on"{{end}}>{{t "set.branches"}}</a>
121 <a href="?tab=secrets"{{if eq .Tab "secrets"}} class="on"{{end}}>{{t "set.secrets"}}</a>
122 <a href="?tab=webhooks"{{if eq .Tab "webhooks"}} class="on"{{end}}>{{t "set.webhooks"}}</a>
115 123 </p>
116 {{if eq .Tab "leden"}}
124 {{if eq .Tab "members"}}
117 125 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/members">
118 126 <input type="hidden" name="csrf" value="{{.CSRF}}">
119 127 <div class="row">
120 <input name="username" placeholder="gebruikersnaam" required>
121 <select name="role"><option value="readonly">Alleen lezen</option><option value="developer">Ontwikkelaar</option><option value="maintainer">Beheerder</option></select>
122 <button type="submit">Opslaan</button>
128 <input name="username" placeholder="{{t "set.username"}}" required>
129 {{template "roleselect" "developer"}}
130 <button type="submit">{{t "action.save"}}</button>
123 131 </div>
124 132 </form>
125 133 <ul class="clean">
126 {{range .Members}}<li>{{.Username}} · {{.Role.Label}} {{if .Pending}}<span class="pill">wacht op eerste aanmelding</span>{{end}}
127 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">Weg</button></form>{{end}}
134 {{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
135 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
128 136 </li>{{end}}
129 137 </ul>
130 138 {{else if eq .Tab "branches"}}
131 139 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/protected">
132 140 <input type="hidden" name="csrf" value="{{.CSRF}}">
133 <div class="row"><input name="pattern" placeholder="master of release/*" required><button type="submit">Beschermen</button></div>
141 <div class="row"><input name="pattern" placeholder="{{t "set.pattern"}}" required><button type="submit">{{t "action.protect"}}</button></div>
134 142 </form>
135 143 <ul class="clean">{{range .Patterns}}<li><code>{{.}}</code>
136 <form method="post" action="/{{$.Repo.FullPath}}/-/protected/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="pattern" value="{{.}}"><button class="ghost" type="submit">Weg</button></form>
144 <form method="post" action="/{{$.Repo.FullPath}}/-/protected/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="pattern" value="{{.}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
137 145 </li>{{end}}</ul>
138 <p class="muted">Ontwikkelaars kunnen niet naar deze branches pushen.</p>
139 {{else if eq .Tab "geheimen"}}
146 <p class="muted">{{t "set.protectHint"}}</p>
147 {{else if eq .Tab "secrets"}}
140 148 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/secrets">
141 149 <input type="hidden" name="csrf" value="{{.CSRF}}">
142 <label>Naam <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>
143 <label>Waarde <textarea name="value" required></textarea></label>
144 <label class="row"><input type="checkbox" name="protected" value="1"> Alleen meesturen op een beschermde branch</label>
145 <button type="submit">Opslaan</button>
150 <label>{{t "set.secretName"}} <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>
151 <label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
152 <label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
153 <button type="submit">{{t "action.save"}}</button>
146 154 </form>
147 <ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code> {{if .Protected}}<span class="pill">beschermd</span>{{end}}
148 <form method="post" action="/{{$.Repo.FullPath}}/-/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">Weg</button></form>
155 <ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
156 <form method="post" action="/{{$.Repo.FullPath}}/-/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
149 157 </li>{{end}}</ul>
150 <p class="muted">Waarden worden niet teruggetoond.</p>
158 <p class="muted">{{t "set.valuesHidden"}}</p>
151 159 {{else if eq .Tab "webhooks"}}
152 160 {{template "webhookform" .}}
153 161 {{else}}
154 162 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/settings">
155 163 <input type="hidden" name="csrf" value="{{.CSRF}}">
156 <label>Beschrijving <input name="description" value="{{.Repo.Description}}"></label>
157 <label>Zichtbaarheid <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>Privé</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>Openbaar</option></select></label>
158 <button type="submit">Opslaan</button>
164 <label>{{t "new.description"}} <input name="description" value="{{.Repo.Description}}"></label>
165 <label>{{t "new.visibility"}} <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option></select></label>
166 <button type="submit">{{t "action.save"}}</button>
167 </form>
168 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">
169 <input type="hidden" name="csrf" value="{{.CSRF}}">
170 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
171 <p class="muted">{{t "logo.hint"}}</p>
172 <button type="submit">{{t "action.save"}}</button>
159 173 </form>
160 174 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/delete">
161 <h2>Verwijderen</h2>
175 <h2>{{t "set.delete"}}</h2>
162 176 <input type="hidden" name="csrf" value="{{.CSRF}}">
163 <label>Typ {{.Repo.Name}} <input name="confirm"></label>
164 <button type="submit">Repository verwijderen</button>
177 <label>{{t "set.typeName" .Repo.Name}} <input name="confirm"></label>
178 <button type="submit">{{t "set.deleteRepo"}}</button>
165 179 </form>
166 180 {{end}}
167 181 {{end}}
@@ -171,26 +185,26 @@
171 185 {{define "webhookform"}}
172 186 <form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}">
173 187 <input type="hidden" name="csrf" value="{{.CSRF}}">
174 <label>Naam <input name="name" required></label>
175 <label>Preset
188 <label>{{t "set.whName"}} <input name="name" required></label>
189 <label>{{t "set.preset"}}
176 190 <select name="preset">
177 <option value="generic">Generieke JSON</option>
178 <option value="discord">Discord</option>
179 <option value="grok">Grok Bot</option>
191 <option value="generic">{{t "set.preset.generic"}}</option>
192 <option value="discord">{{t "set.preset.discord"}}</option>
193 <option value="grok">{{t "set.preset.grok"}}</option>
180 194 </select>
181 195 </label>
182 <label>URL <input name="url" placeholder="https://example.test/hook" required></label>
183 <label>Branchfilter voor push <input name="branch_filter" placeholder="leeg, master, of re:^release/.*"></label>
184 <label>Headers, één per regel <textarea name="headers" placeholder="Authorization: Bearer secret.GROK_TOKEN tussen dubbele accolades"></textarea></label>
185 <label>Body-sjabloon, leeg is de gebeurtenis als JSON <textarea name="body" placeholder="Discord: een JSON-object met content"></textarea></label>
196 <label>{{t "set.url"}} <input name="url" placeholder="https://example.test/hook" required></label>
197 <label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>
198 <label>{{t "set.headers"}} <textarea name="headers" placeholder="Authorization: Bearer …"></textarea></label>
199 <label>{{t "set.body"}} <textarea name="body"></textarea></label>
186 200 <fieldset>
187 <label><input type="checkbox" name="event_push" value="1"> push</label>
188 <label><input type="checkbox" name="event_merge_request" value="1"> merge request</label>
189 <label><input type="checkbox" name="event_pipeline_success" value="1"> pipeline geslaagd</label>
190 <label><input type="checkbox" name="event_pipeline_failure" value="1"> pipeline mislukt</label>
191 <label><input type="checkbox" name="event_release_published" value="1"> release gepubliceerd</label>
201 <label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>
202 <label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>
203 <label><input type="checkbox" name="event_pipeline_success" value="1"> {{t "set.ev.ok"}}</label>
204 <label><input type="checkbox" name="event_pipeline_failure" value="1"> {{t "set.ev.fail"}}</label>
205 <label><input type="checkbox" name="event_release_published" value="1"> {{t "set.ev.release"}}</label>
192 206 </fieldset>
193 <button type="submit">Webhook opslaan</button>
207 <button type="submit">{{t "set.saveWebhook"}}</button>
194 208 </form>
195 209 <ul class="clean">
196 210 {{range .Hooks}}<li><strong>{{.Name}}</strong> {{.Preset}} <span class="muted">{{.URL}}</span>
@@ -198,7 +212,7 @@
198 212 {{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}
199 213 <form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">
200 214 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
201 <button class="ghost" type="submit">Weg</button>
215 <button class="ghost" type="submit">{{t "action.remove"}}</button>
202 216 </form>
203 217 </li>{{end}}
204 218 </ul>
@@ -206,34 +220,105 @@
206 220
207 221 {{define "group"}}
208 222 {{template "layout-start" .}}
209 <h1>{{.Group.Name}}</h1>
210 <p class="muted">{{.Group.Path}} · {{.Group.Description}}</p>
211 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
212 <h2>Repositories</h2>
213 <ul class="clean">{{range .Repos}}<li><a href="/{{.FullPath}}">{{.Name}}</a></li>{{else}}<li class="muted">Nog geen repositories.</li>{{end}}</ul>
223 <div class="projhead">
224 {{if .Group.HasLogo}}<img class="tile" src="/groups/{{.Group.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Group.Name}}</span>{{end}}
225 <h1>{{.Group.Name}}</h1>
226 {{template "visicon" .Group.Visibility}}
227 </div>
228 {{if .Group.Description}}<p class="muted">{{.Group.Description}}</p>{{end}}
229 <p class="sub">
230 <a href="/groups/{{.Group.Path}}"{{if ne .Tab "members"}}{{if ne .Tab "settings"}} class="on"{{end}}{{end}}>{{t "group.tab.repos"}}</a>
231 <a href="/groups/{{.Group.Path}}?tab=members"{{if eq .Tab "members"}} class="on"{{end}}>{{t "group.tab.members"}}</a>
232 {{if .CanAdmin}}<a href="/groups/{{.Group.Path}}?tab=settings"{{if eq .Tab "settings"}} class="on"{{end}}>{{t "group.tab.settings"}}</a>{{end}}
233 </p>
234 {{if eq .Tab "members"}}
214 235 {{if .CanAdmin}}
215 <h2>Leden</h2>
216 236 <form class="panel" method="post" action="/groups/{{.Group.Path}}/members">
217 237 <input type="hidden" name="csrf" value="{{.CSRF}}">
218 238 <div class="row">
219 <input name="username" placeholder="gebruikersnaam" required>
220 <select name="role"><option value="readonly">Alleen lezen</option><option value="developer">Ontwikkelaar</option><option value="maintainer">Beheerder</option></select>
221 <button type="submit">Opslaan</button>
239 <input name="username" placeholder="{{t "set.username"}}" required>
240 {{template "roleselect" (printf "%s" .Group.DefaultRole)}}
241 <button type="submit">{{t "action.save"}}</button>
222 242 </div>
223 243 </form>
224 <ul class="clean">{{range .Members}}<li>{{.Username}} · {{.Role.Label}} {{if .Pending}}<span class="pill">wacht</span>{{end}}</li>{{end}}</ul>
225 <h2>Geheimen</h2>
244 {{end}}
245 <ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
246 {{if and $.CanAdmin (not .Pending)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
247 </li>{{end}}</ul>
248 {{else if eq .Tab "settings"}}
249 <form class="panel" method="post" action="/groups/{{.Group.Path}}/settings">
250 <input type="hidden" name="csrf" value="{{.CSRF}}">
251 <label>{{t "new.description"}} <input name="description" value="{{.Group.Description}}"></label>
252 <label>{{t "new.visibility"}}
253 <select name="visibility">
254 <option value="private" {{if eq .Group.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option>
255 <option value="public" {{if eq .Group.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option>
256 </select>
257 </label>
258 <label>{{t "group.defaultRole"}}
259 <select name="default_role">
260 <option value="readonly" {{if eq (printf "%s" .Group.DefaultRole) "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
261 <option value="developer" {{if eq (printf "%s" .Group.DefaultRole) "developer"}}selected{{end}}>{{t "role.developer"}}</option>
262 <option value="maintainer" {{if eq (printf "%s" .Group.DefaultRole) "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
263 </select>
264 </label>
265 <p class="muted">{{t "new.roleHint"}}</p>
266 <button type="submit">{{t "action.save"}}</button>
267 </form>
268 <form class="panel" method="post" action="/groups/{{.Group.Path}}/logo" enctype="multipart/form-data">
269 <input type="hidden" name="csrf" value="{{.CSRF}}">
270 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
271 <p class="muted">{{t "logo.hint"}}</p>
272 <button type="submit">{{t "action.save"}}</button>
273 </form>
274 <h2>{{t "set.secrets"}}</h2>
226 275 <form class="panel" method="post" action="/groups/{{.Group.Path}}/secrets">
227 276 <input type="hidden" name="csrf" value="{{.CSRF}}">
228 <label>Naam <input name="name" required></label>
229 <label>Waarde <textarea name="value" required></textarea></label>
230 <label class="row"><input type="checkbox" name="protected" value="1"> Alleen op een beschermde branch</label>
231 <button type="submit">Opslaan</button>
232 </form>
233 <ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code></li>{{end}}</ul>
234 <h2>Webhooks</h2>
235 <p class="muted">Alleen geheimen van deze groep.</p>
277 <label>{{t "set.secretName"}} <input name="name" required></label>
278 <label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
279 <label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
280 <button type="submit">{{t "action.save"}}</button>
281 </form>
282 <ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code>
283 <form method="post" action="/groups/{{$.Group.Path}}/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
284 </li>{{end}}</ul>
285 <p class="muted">{{t "set.valuesHidden"}}</p>
286 <h2>{{t "set.webhooks"}}</h2>
287 <p class="muted">{{t "group.secretsNote"}}</p>
236 288 {{template "webhookform" .}}
289 {{else}}
290 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
291 <form class="bar" method="get" action="/groups/{{.Group.Path}}">
292 <input type="search" name="q" value="{{.Query}}" placeholder="{{t "group.search"}}">
293 <input type="hidden" name="dir" value="{{.SortDir}}">
294 <span class="sortlabel">{{t "group.sort"}}</span>
295 <a class="iconbtn" href="/groups/{{.Group.Path}}?q={{urlquery .Query}}&amp;dir={{.FlipDir}}" aria-label="{{t "group.direction"}}">{{if eq .SortDir "desc"}}↓{{else}}↑{{end}}</a>
296 </form>
297 <ul class="repolist">
298 {{range .Cards}}
299 <li>
300 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
301 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
302 {{template "visicon" .Repo.Visibility}}
303 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
304 <span class="muted grown">{{t "group.created" .When}}</span>
305 <details class="rowmenu">
306 <summary aria-label="{{t "group.menu"}}">⋯</summary>
307 <div class="menu-panel">
308 {{if $.User}}
309 <form method="post" action="/{{.Repo.FullPath}}/-/star">
310 <input type="hidden" name="csrf" value="{{$.CSRF}}">
311 <input type="hidden" name="back" value="/groups/{{$.Group.Path}}?q={{$.Query}}&amp;dir={{$.SortDir}}">
312 <button type="submit">{{if .Starred}}{{t "group.unstar"}}{{else}}{{t "group.star"}}{{end}}</button>
313 </form>
314 {{end}}
315 <button type="button" data-copy="{{.Repo.FullPath}}">{{t "action.copy"}}</button>
316 </div>
317 </details>
318 </li>
319 {{else}}<li class="muted">{{t "group.empty"}}</li>{{end}}
320 </ul>
321 <script src="/assets/repo.js"></script>
237 322 {{end}}
238 323 {{template "layout-end" .}}
239 324 {{end}}
@@ -1,19 +1,19 @@
1{{define "mrs"}}
1{{define "mrs"}}
2{{template "layout-start" .}}
2{{template "layout-start" .}}
3<h1>Merge requests</h1>
3<h1>{{t "mr.title"}}</h1>
4{{template "repotabs" .}}
4{{template "repotabs" .}}
5<ul class="clean">
5<ul class="clean">
6 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">Geen merge requests.</li>{{end}}
6 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
7</ul>
7</ul>
8{{if .CanWrite}}
8{{if .CanWrite}}
9<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
9<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
10 <h2>Nieuw</h2>
10 <h2>{{t "mr.new"}}</h2>
11 <input type="hidden" name="csrf" value="{{.CSRF}}">
11 <input type="hidden" name="csrf" value="{{.CSRF}}">
12 <label>Titel <input name="title" required></label>
12 <label>{{t "mr.titleField"}} <input name="title" required></label>
13 <label>Beschrijving <textarea name="description"></textarea></label>
13 <label>{{t "mr.description"}} <textarea name="description"></textarea></label>
14 <label>Bron <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
14 <label>{{t "mr.source"}} <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15 <label>Doel <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15 <label>{{t "mr.target"}} <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
16 <button type="submit">Openen</button>
16 <button type="submit">{{t "action.open"}}</button>
17</form>
17</form>
18{{end}}
18{{end}}
19{{template "layout-end" .}}
19{{template "layout-end" .}}
@@ -25,27 +25,27 @@
25{{template "repotabs" .}}
25{{template "repotabs" .}}
26<p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>
26<p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>
27{{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}
27{{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}
28<h2>Commits</h2>
28<h2>{{t "mr.commits"}}</h2>
29<pre>{{if .Diff}}{{.Diff}}{{else}}geen commits vóór de doelbranch, of de branch ontbreekt{{end}}</pre>
29<pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
30{{if .CanMerge}}
30{{if .CanMerge}}
31<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
31<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
32 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">Samenvoegen</button>
32 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.merge"}}</button>
33</form>
33</form>
34{{end}}
34{{end}}
35{{if and .User (eq .MR.Status "open")}}
35{{if and .User (eq .MR.Status "open")}}
36<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
36<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">Sluiten</button>
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
38</form>
38</form>
39{{end}}
39{{end}}
40<h2>Reacties</h2>
40<h2>{{t "mr.comments"}}</h2>
41<ul class="clean">
41<ul class="clean">
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">Nog geen reacties.</li>{{end}}
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
43</ul>
43</ul>
44{{if .User}}
44{{if .User}}
45<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
45<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
46 <input type="hidden" name="csrf" value="{{.CSRF}}">
46 <input type="hidden" name="csrf" value="{{.CSRF}}">
47 <label>Reactie <textarea name="body" required></textarea></label>
47 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
48 <button type="submit">Plaatsen</button>
48 <button type="submit">{{t "action.post"}}</button>
49</form>
49</form>
50{{end}}
50{{end}}
51{{template "layout-end" .}}
51{{template "layout-end" .}}
@@ -53,24 +53,24 @@
53
53
54{{define "pipelines"}}
54{{define "pipelines"}}
55{{template "layout-start" .}}
55{{template "layout-start" .}}
56<h1>Pipelines</h1>
56<h1>{{t "pipe.title"}}</h1>
57{{template "repotabs" .}}
57{{template "repotabs" .}}
58{{if .CanWrite}}
58{{if .CanWrite}}
59<form method="post" action="/{{.Repo.FullPath}}/-/pipelines" class="row">
59<form method="post" action="/{{.Repo.FullPath}}/-/pipelines" class="row">
60 <input type="hidden" name="csrf" value="{{.CSRF}}">
60 <input type="hidden" name="csrf" value="{{.CSRF}}">
61 <input name="ref" placeholder="branch, leeg is de standaard">
61 <input name="ref" placeholder="{{t "pipe.ref"}}">
62 <button type="submit">Starten</button>
62 <button type="submit">{{t "action.start"}}</button>
63</form>
63</form>
64{{end}}
64{{end}}
65<ul class="clean">
65<ul class="clean">
66 {{range .Pipes}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Ref}} {{short .CommitSHA}}</span></li>{{else}}<li class="muted">Nog geen pipelines. Voeg <code>blue-ci-cd.yml</code> toe in de root.</li>{{end}}
66 {{range .Pipes}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Ref}} {{short .CommitSHA}}</span></li>{{else}}<li class="muted">{{t "pipe.none"}}</li>{{end}}
67</ul>
67</ul>
68{{template "layout-end" .}}
68{{template "layout-end" .}}
69{{end}}
69{{end}}
70
70
71{{define "pipeline"}}
71{{define "pipeline"}}
72{{template "layout-start" .}}
72{{template "layout-start" .}}
73<h1>Pipeline #{{.Pipe.ID}}</h1>
73<h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1>
74{{template "repotabs" .}}
74{{template "repotabs" .}}
75<p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <code>{{.Pipe.CommitSHA}}</code></p>
75<p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <code>{{.Pipe.CommitSHA}}</code></p>
76{{range .Jobs}}
76{{range .Jobs}}
@@ -84,7 +84,7 @@
84
84
85{{define "releases"}}
85{{define "releases"}}
86{{template "layout-start" .}}
86{{template "layout-start" .}}
87<h1>Releases</h1>
87<h1>{{t "title.releases"}}</h1>
88{{template "repotabs" .}}
88{{template "repotabs" .}}
89{{range .Releases}}
89{{range .Releases}}
90<article class="panel">
90<article class="panel">
@@ -93,75 +93,89 @@
93 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
93 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
94 <ul>
94 <ul>
95 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
95 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
96 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} bytes</span></li>{{end}}
96 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span></li>{{end}}
97 </ul>
97 </ul>
98</article>
98</article>
99{{else}}<p class="muted">Nog geen releases.</p>{{end}}
99{{else}}<p class="muted">{{t "rel.none"}}</p>{{end}}
100{{template "layout-end" .}}
100{{template "layout-end" .}}
101{{end}}
101{{end}}
102
102
103{{define "roleselect"}}
104<select name="role">
105 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
106 <option value="developer" {{if eq . "developer"}}selected{{end}}>{{t "role.developer"}}</option>
107 <option value="maintainer" {{if eq . "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
108</select>
109{{end}}
110
103{{define "settings"}}
111{{define "settings"}}
104{{template "layout-start" .}}
112{{template "layout-start" .}}
105<h1>Instellingen</h1>
113<h1>{{t "title.settings"}}</h1>
106{{template "repotabs" .}}
114{{template "repotabs" .}}
107{{if not .CanAdmin}}<p>Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: {{.Role.Label}}.</p>{{end}}
115{{if not .CanAdmin}}<p>{{t "set.onlyAdmin" (roleName .Role)}}</p>{{end}}
108{{if .CanAdmin}}
116{{if .CanAdmin}}
109<p class="sub">
117<p class="sub">
110 <a href="?tab=algemeen">Algemeen</a>
118 <a href="?tab=general"{{if or (eq .Tab "general") (eq .Tab "")}} class="on"{{end}}>{{t "set.general"}}</a>
111 <a href="?tab=leden">Leden</a>
119 <a href="?tab=members"{{if eq .Tab "members"}} class="on"{{end}}>{{t "set.members"}}</a>
112 <a href="?tab=branches">Branches</a>
120 <a href="?tab=branches"{{if eq .Tab "branches"}} class="on"{{end}}>{{t "set.branches"}}</a>
113 <a href="?tab=geheimen">Geheimen</a>
121 <a href="?tab=secrets"{{if eq .Tab "secrets"}} class="on"{{end}}>{{t "set.secrets"}}</a>
114 <a href="?tab=webhooks">Webhooks</a>
122 <a href="?tab=webhooks"{{if eq .Tab "webhooks"}} class="on"{{end}}>{{t "set.webhooks"}}</a>
115</p>
123</p>
116{{if eq .Tab "leden"}}
124{{if eq .Tab "members"}}
117<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/members">
125<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/members">
118 <input type="hidden" name="csrf" value="{{.CSRF}}">
126 <input type="hidden" name="csrf" value="{{.CSRF}}">
119 <div class="row">
127 <div class="row">
120 <input name="username" placeholder="gebruikersnaam" required>
128 <input name="username" placeholder="{{t "set.username"}}" required>
121 <select name="role"><option value="readonly">Alleen lezen</option><option value="developer">Ontwikkelaar</option><option value="maintainer">Beheerder</option></select>
129 {{template "roleselect" "developer"}}
122 <button type="submit">Opslaan</button>
130 <button type="submit">{{t "action.save"}}</button>
123 </div>
131 </div>
124</form>
132</form>
125<ul class="clean">
133<ul class="clean">
126 {{range .Members}}<li>{{.Username}} · {{.Role.Label}} {{if .Pending}}<span class="pill">wacht op eerste aanmelding</span>{{end}}
134 {{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
127 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">Weg</button></form>{{end}}
135 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
128 </li>{{end}}
136 </li>{{end}}
129</ul>
137</ul>
130{{else if eq .Tab "branches"}}
138{{else if eq .Tab "branches"}}
131<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/protected">
139<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/protected">
132 <input type="hidden" name="csrf" value="{{.CSRF}}">
140 <input type="hidden" name="csrf" value="{{.CSRF}}">
133 <div class="row"><input name="pattern" placeholder="master of release/*" required><button type="submit">Beschermen</button></div>
141 <div class="row"><input name="pattern" placeholder="{{t "set.pattern"}}" required><button type="submit">{{t "action.protect"}}</button></div>
134</form>
142</form>
135<ul class="clean">{{range .Patterns}}<li><code>{{.}}</code>
143<ul class="clean">{{range .Patterns}}<li><code>{{.}}</code>
136 <form method="post" action="/{{$.Repo.FullPath}}/-/protected/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="pattern" value="{{.}}"><button class="ghost" type="submit">Weg</button></form>
144 <form method="post" action="/{{$.Repo.FullPath}}/-/protected/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="pattern" value="{{.}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
137</li>{{end}}</ul>
145</li>{{end}}</ul>
138<p class="muted">Ontwikkelaars kunnen niet naar deze branches pushen.</p>
146<p class="muted">{{t "set.protectHint"}}</p>
139{{else if eq .Tab "geheimen"}}
147{{else if eq .Tab "secrets"}}
140<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/secrets">
148<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/secrets">
141 <input type="hidden" name="csrf" value="{{.CSRF}}">
149 <input type="hidden" name="csrf" value="{{.CSRF}}">
142 <label>Naam <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>
150 <label>{{t "set.secretName"}} <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>
143 <label>Waarde <textarea name="value" required></textarea></label>
151 <label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
144 <label class="row"><input type="checkbox" name="protected" value="1"> Alleen meesturen op een beschermde branch</label>
152 <label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
145 <button type="submit">Opslaan</button>
153 <button type="submit">{{t "action.save"}}</button>
146</form>
154</form>
147<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code> {{if .Protected}}<span class="pill">beschermd</span>{{end}}
155<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
148 <form method="post" action="/{{$.Repo.FullPath}}/-/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">Weg</button></form>
156 <form method="post" action="/{{$.Repo.FullPath}}/-/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
149</li>{{end}}</ul>
157</li>{{end}}</ul>
150<p class="muted">Waarden worden niet teruggetoond.</p>
158<p class="muted">{{t "set.valuesHidden"}}</p>
151{{else if eq .Tab "webhooks"}}
159{{else if eq .Tab "webhooks"}}
152{{template "webhookform" .}}
160{{template "webhookform" .}}
153{{else}}
161{{else}}
154<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/settings">
162<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/settings">
155 <input type="hidden" name="csrf" value="{{.CSRF}}">
163 <input type="hidden" name="csrf" value="{{.CSRF}}">
156 <label>Beschrijving <input name="description" value="{{.Repo.Description}}"></label>
164 <label>{{t "new.description"}} <input name="description" value="{{.Repo.Description}}"></label>
157 <label>Zichtbaarheid <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>Privé</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>Openbaar</option></select></label>
165 <label>{{t "new.visibility"}} <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option></select></label>
158 <button type="submit">Opslaan</button>
166 <button type="submit">{{t "action.save"}}</button>
167</form>
168<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">
169 <input type="hidden" name="csrf" value="{{.CSRF}}">
170 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
171 <p class="muted">{{t "logo.hint"}}</p>
172 <button type="submit">{{t "action.save"}}</button>
159</form>
173</form>
160<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/delete">
174<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/delete">
161 <h2>Verwijderen</h2>
175 <h2>{{t "set.delete"}}</h2>
162 <input type="hidden" name="csrf" value="{{.CSRF}}">
176 <input type="hidden" name="csrf" value="{{.CSRF}}">
163 <label>Typ {{.Repo.Name}} <input name="confirm"></label>
177 <label>{{t "set.typeName" .Repo.Name}} <input name="confirm"></label>
164 <button type="submit">Repository verwijderen</button>
178 <button type="submit">{{t "set.deleteRepo"}}</button>
165</form>
179</form>
166{{end}}
180{{end}}
167{{end}}
181{{end}}
@@ -171,26 +185,26 @@
171{{define "webhookform"}}
185{{define "webhookform"}}
172<form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}">
186<form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}">
173 <input type="hidden" name="csrf" value="{{.CSRF}}">
187 <input type="hidden" name="csrf" value="{{.CSRF}}">
174 <label>Naam <input name="name" required></label>
188 <label>{{t "set.whName"}} <input name="name" required></label>
175 <label>Preset
189 <label>{{t "set.preset"}}
176 <select name="preset">
190 <select name="preset">
177 <option value="generic">Generieke JSON</option>
191 <option value="generic">{{t "set.preset.generic"}}</option>
178 <option value="discord">Discord</option>
192 <option value="discord">{{t "set.preset.discord"}}</option>
179 <option value="grok">Grok Bot</option>
193 <option value="grok">{{t "set.preset.grok"}}</option>
180 </select>
194 </select>
181 </label>
195 </label>
182 <label>URL <input name="url" placeholder="https://example.test/hook" required></label>
196 <label>{{t "set.url"}} <input name="url" placeholder="https://example.test/hook" required></label>
183 <label>Branchfilter voor push <input name="branch_filter" placeholder="leeg, master, of re:^release/.*"></label>
197 <label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>
184 <label>Headers, één per regel <textarea name="headers" placeholder="Authorization: Bearer secret.GROK_TOKEN tussen dubbele accolades"></textarea></label>
198 <label>{{t "set.headers"}} <textarea name="headers" placeholder="Authorization: Bearer …"></textarea></label>
185 <label>Body-sjabloon, leeg is de gebeurtenis als JSON <textarea name="body" placeholder="Discord: een JSON-object met content"></textarea></label>
199 <label>{{t "set.body"}} <textarea name="body"></textarea></label>
186 <fieldset>
200 <fieldset>
187 <label><input type="checkbox" name="event_push" value="1"> push</label>
201 <label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>
188 <label><input type="checkbox" name="event_merge_request" value="1"> merge request</label>
202 <label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>
189 <label><input type="checkbox" name="event_pipeline_success" value="1"> pipeline geslaagd</label>
203 <label><input type="checkbox" name="event_pipeline_success" value="1"> {{t "set.ev.ok"}}</label>
190 <label><input type="checkbox" name="event_pipeline_failure" value="1"> pipeline mislukt</label>
204 <label><input type="checkbox" name="event_pipeline_failure" value="1"> {{t "set.ev.fail"}}</label>
191 <label><input type="checkbox" name="event_release_published" value="1"> release gepubliceerd</label>
205 <label><input type="checkbox" name="event_release_published" value="1"> {{t "set.ev.release"}}</label>
192 </fieldset>
206 </fieldset>
193 <button type="submit">Webhook opslaan</button>
207 <button type="submit">{{t "set.saveWebhook"}}</button>
194</form>
208</form>
195<ul class="clean">
209<ul class="clean">
196 {{range .Hooks}}<li><strong>{{.Name}}</strong> {{.Preset}} <span class="muted">{{.URL}}</span>
210 {{range .Hooks}}<li><strong>{{.Name}}</strong> {{.Preset}} <span class="muted">{{.URL}}</span>
@@ -198,7 +212,7 @@
198 {{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}
212 {{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}
199 <form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">
213 <form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">
200 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
214 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
201 <button class="ghost" type="submit">Weg</button>
215 <button class="ghost" type="submit">{{t "action.remove"}}</button>
202 </form>
216 </form>
203 </li>{{end}}
217 </li>{{end}}
204</ul>
218</ul>
@@ -206,34 +220,105 @@
206
220
207{{define "group"}}
221{{define "group"}}
208{{template "layout-start" .}}
222{{template "layout-start" .}}
209<h1>{{.Group.Name}}</h1>
223<div class="projhead">
210<p class="muted">{{.Group.Path}} · {{.Group.Description}}</p>
224 {{if .Group.HasLogo}}<img class="tile" src="/groups/{{.Group.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Group.Name}}</span>{{end}}
211{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
225 <h1>{{.Group.Name}}</h1>
212<h2>Repositories</h2>
226 {{template "visicon" .Group.Visibility}}
213<ul class="clean">{{range .Repos}}<li><a href="/{{.FullPath}}">{{.Name}}</a></li>{{else}}<li class="muted">Nog geen repositories.</li>{{end}}</ul>
227</div>
228{{if .Group.Description}}<p class="muted">{{.Group.Description}}</p>{{end}}
229<p class="sub">
230 <a href="/groups/{{.Group.Path}}"{{if ne .Tab "members"}}{{if ne .Tab "settings"}} class="on"{{end}}{{end}}>{{t "group.tab.repos"}}</a>
231 <a href="/groups/{{.Group.Path}}?tab=members"{{if eq .Tab "members"}} class="on"{{end}}>{{t "group.tab.members"}}</a>
232 {{if .CanAdmin}}<a href="/groups/{{.Group.Path}}?tab=settings"{{if eq .Tab "settings"}} class="on"{{end}}>{{t "group.tab.settings"}}</a>{{end}}
233</p>
234{{if eq .Tab "members"}}
214{{if .CanAdmin}}
235{{if .CanAdmin}}
215<h2>Leden</h2>
216<form class="panel" method="post" action="/groups/{{.Group.Path}}/members">
236<form class="panel" method="post" action="/groups/{{.Group.Path}}/members">
217 <input type="hidden" name="csrf" value="{{.CSRF}}">
237 <input type="hidden" name="csrf" value="{{.CSRF}}">
218 <div class="row">
238 <div class="row">
219 <input name="username" placeholder="gebruikersnaam" required>
239 <input name="username" placeholder="{{t "set.username"}}" required>
220 <select name="role"><option value="readonly">Alleen lezen</option><option value="developer">Ontwikkelaar</option><option value="maintainer">Beheerder</option></select>
240 {{template "roleselect" (printf "%s" .Group.DefaultRole)}}
221 <button type="submit">Opslaan</button>
241 <button type="submit">{{t "action.save"}}</button>
222 </div>
242 </div>
223</form>
243</form>
224<ul class="clean">{{range .Members}}<li>{{.Username}} · {{.Role.Label}} {{if .Pending}}<span class="pill">wacht</span>{{end}}</li>{{end}}</ul>
244{{end}}
225<h2>Geheimen</h2>
245<ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
246 {{if and $.CanAdmin (not .Pending)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
247</li>{{end}}</ul>
248{{else if eq .Tab "settings"}}
249<form class="panel" method="post" action="/groups/{{.Group.Path}}/settings">
250 <input type="hidden" name="csrf" value="{{.CSRF}}">
251 <label>{{t "new.description"}} <input name="description" value="{{.Group.Description}}"></label>
252 <label>{{t "new.visibility"}}
253 <select name="visibility">
254 <option value="private" {{if eq .Group.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option>
255 <option value="public" {{if eq .Group.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option>
256 </select>
257 </label>
258 <label>{{t "group.defaultRole"}}
259 <select name="default_role">
260 <option value="readonly" {{if eq (printf "%s" .Group.DefaultRole) "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
261 <option value="developer" {{if eq (printf "%s" .Group.DefaultRole) "developer"}}selected{{end}}>{{t "role.developer"}}</option>
262 <option value="maintainer" {{if eq (printf "%s" .Group.DefaultRole) "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
263 </select>
264 </label>
265 <p class="muted">{{t "new.roleHint"}}</p>
266 <button type="submit">{{t "action.save"}}</button>
267</form>
268<form class="panel" method="post" action="/groups/{{.Group.Path}}/logo" enctype="multipart/form-data">
269 <input type="hidden" name="csrf" value="{{.CSRF}}">
270 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
271 <p class="muted">{{t "logo.hint"}}</p>
272 <button type="submit">{{t "action.save"}}</button>
273</form>
274<h2>{{t "set.secrets"}}</h2>
226<form class="panel" method="post" action="/groups/{{.Group.Path}}/secrets">
275<form class="panel" method="post" action="/groups/{{.Group.Path}}/secrets">
227 <input type="hidden" name="csrf" value="{{.CSRF}}">
276 <input type="hidden" name="csrf" value="{{.CSRF}}">
228 <label>Naam <input name="name" required></label>
277 <label>{{t "set.secretName"}} <input name="name" required></label>
229 <label>Waarde <textarea name="value" required></textarea></label>
278 <label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
230 <label class="row"><input type="checkbox" name="protected" value="1"> Alleen op een beschermde branch</label>
279 <label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
231 <button type="submit">Opslaan</button>
280 <button type="submit">{{t "action.save"}}</button>
232</form>
281</form>
233<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code></li>{{end}}</ul>
282<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code>
234<h2>Webhooks</h2>
283 <form method="post" action="/groups/{{$.Group.Path}}/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
235<p class="muted">Alleen geheimen van deze groep.</p>
284</li>{{end}}</ul>
285<p class="muted">{{t "set.valuesHidden"}}</p>
286<h2>{{t "set.webhooks"}}</h2>
287<p class="muted">{{t "group.secretsNote"}}</p>
236{{template "webhookform" .}}
288{{template "webhookform" .}}
289{{else}}
290{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
291<form class="bar" method="get" action="/groups/{{.Group.Path}}">
292 <input type="search" name="q" value="{{.Query}}" placeholder="{{t "group.search"}}">
293 <input type="hidden" name="dir" value="{{.SortDir}}">
294 <span class="sortlabel">{{t "group.sort"}}</span>
295 <a class="iconbtn" href="/groups/{{.Group.Path}}?q={{urlquery .Query}}&amp;dir={{.FlipDir}}" aria-label="{{t "group.direction"}}">{{if eq .SortDir "desc"}}↓{{else}}↑{{end}}</a>
296</form>
297<ul class="repolist">
298 {{range .Cards}}
299 <li>
300 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
301 <a class="reponame" href="/{{.Repo.FullPath}}">{{.Repo.Name}}</a>
302 {{template "visicon" .Repo.Visibility}}
303 <span class="stars" aria-label="{{t "group.star"}}">★ {{.Stars}}</span>
304 <span class="muted grown">{{t "group.created" .When}}</span>
305 <details class="rowmenu">
306 <summary aria-label="{{t "group.menu"}}">⋯</summary>
307 <div class="menu-panel">
308 {{if $.User}}
309 <form method="post" action="/{{.Repo.FullPath}}/-/star">
310 <input type="hidden" name="csrf" value="{{$.CSRF}}">
311 <input type="hidden" name="back" value="/groups/{{$.Group.Path}}?q={{$.Query}}&amp;dir={{$.SortDir}}">
312 <button type="submit">{{if .Starred}}{{t "group.unstar"}}{{else}}{{t "group.star"}}{{end}}</button>
313 </form>
314 {{end}}
315 <button type="button" data-copy="{{.Repo.FullPath}}">{{t "action.copy"}}</button>
316 </div>
317 </details>
318 </li>
319 {{else}}<li class="muted">{{t "group.empty"}}</li>{{end}}
320</ul>
321<script src="/assets/repo.js"></script>
237{{end}}
322{{end}}
238{{template "layout-end" .}}
323{{template "layout-end" .}}
239{{end}}
324{{end}}
internal/server/templates/layout.html +15 −15
@@ -1,6 +1,6 @@
1 1 {{define "layout-start"}}
2 2 <!DOCTYPE html>
3 <html lang="nl">
3 <html lang="{{.HTMLLang}}"{{if .Cunei}} class="cunei"{{end}}>
4 4 <head>
5 5 <meta charset="utf-8">
6 6 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -8,18 +8,18 @@
8 8 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
9 9 <link rel="stylesheet" href="/assets/style.css">
10 10 </head>
11 <body>
11 <body data-copied="{{t "action.copied"}}">
12 12 <header class="top">
13 13 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
14 14 <nav>
15 15 {{if .User}}
16 <a href="/">Overzicht</a>
17 <a href="/new">Nieuw</a>
18 {{if .User.InstanceAdmin}}<a href="/setup">Opslag</a>{{end}}
16 <a href="/">{{t "nav.dashboard"}}</a>
17 <a href="/new">{{t "nav.new"}}</a>
18 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
19 19 <a href="/settings">{{.User.Username}}</a>
20 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">Afmelden</button></form>
20 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
21 21 {{else}}
22 <a class="btn" href="/login">Aanmelden</a>
22 <a class="btn" href="/login">{{t "nav.signin"}}</a>
23 23 {{end}}
24 24 </nav>
25 25 </header>
@@ -36,13 +36,13 @@
36 36
37 37 {{define "repotabs"}}
38 38 <p class="sub">
39 <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>Overzicht</a>
40 <a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>Bestanden</a>
41 <a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "commits"}} class="on"{{end}}>Commits</a>
42 <a href="/{{.Repo.FullPath}}/-/branches">Branches</a>
43 <a href="/{{.Repo.FullPath}}/-/merge-requests">Merge requests</a>
44 <a href="/{{.Repo.FullPath}}/-/pipelines">Pipelines</a>
45 <a href="/{{.Repo.FullPath}}/-/releases">Releases</a>
46 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings">Instellingen</a>{{end}}
39 <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>{{t "tab.overview"}}</a>
40 <a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>{{t "tab.files"}}</a>
41 <a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "commits"}} class="on"{{end}}>{{t "tab.commits"}}</a>
42 <a href="/{{.Repo.FullPath}}/-/branches">{{t "tab.branches"}}</a>
43 <a href="/{{.Repo.FullPath}}/-/merge-requests">{{t "tab.mrs"}}</a>
44 <a href="/{{.Repo.FullPath}}/-/pipelines">{{t "tab.pipelines"}}</a>
45 <a href="/{{.Repo.FullPath}}/-/releases">{{t "tab.releases"}}</a>
46 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings">{{t "tab.settings"}}</a>{{end}}
47 47 </p>
48 48 {{end}}
@@ -1,6 +1,6 @@
1{{define "layout-start"}}
1{{define "layout-start"}}
2<!DOCTYPE html>
2<!DOCTYPE html>
3<html lang="nl">
3<html lang="{{.HTMLLang}}"{{if .Cunei}} class="cunei"{{end}}>
4<head>
4<head>
5 <meta charset="utf-8">
5 <meta charset="utf-8">
6 <meta name="viewport" content="width=device-width, initial-scale=1">
6 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -8,18 +8,18 @@
8 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
8 <link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
9 <link rel="stylesheet" href="/assets/style.css">
9 <link rel="stylesheet" href="/assets/style.css">
10</head>
10</head>
11<body>
11<body data-copied="{{t "action.copied"}}">
12<header class="top">
12<header class="top">
13 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
13 <a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
14 <nav>
14 <nav>
15 {{if .User}}
15 {{if .User}}
16 <a href="/">Overzicht</a>
16 <a href="/">{{t "nav.dashboard"}}</a>
17 <a href="/new">Nieuw</a>
17 <a href="/new">{{t "nav.new"}}</a>
18 {{if .User.InstanceAdmin}}<a href="/setup">Opslag</a>{{end}}
18 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
19 <a href="/settings">{{.User.Username}}</a>
19 <a href="/settings">{{.User.Username}}</a>
20 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">Afmelden</button></form>
20 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
21 {{else}}
21 {{else}}
22 <a class="btn" href="/login">Aanmelden</a>
22 <a class="btn" href="/login">{{t "nav.signin"}}</a>
23 {{end}}
23 {{end}}
24 </nav>
24 </nav>
25</header>
25</header>
@@ -36,13 +36,13 @@
36
36
37{{define "repotabs"}}
37{{define "repotabs"}}
38<p class="sub">
38<p class="sub">
39 <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>Overzicht</a>
39 <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>{{t "tab.overview"}}</a>
40 <a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>Bestanden</a>
40 <a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>{{t "tab.files"}}</a>
41 <a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "commits"}} class="on"{{end}}>Commits</a>
41 <a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "commits"}} class="on"{{end}}>{{t "tab.commits"}}</a>
42 <a href="/{{.Repo.FullPath}}/-/branches">Branches</a>
42 <a href="/{{.Repo.FullPath}}/-/branches">{{t "tab.branches"}}</a>
43 <a href="/{{.Repo.FullPath}}/-/merge-requests">Merge requests</a>
43 <a href="/{{.Repo.FullPath}}/-/merge-requests">{{t "tab.mrs"}}</a>
44 <a href="/{{.Repo.FullPath}}/-/pipelines">Pipelines</a>
44 <a href="/{{.Repo.FullPath}}/-/pipelines">{{t "tab.pipelines"}}</a>
45 <a href="/{{.Repo.FullPath}}/-/releases">Releases</a>
45 <a href="/{{.Repo.FullPath}}/-/releases">{{t "tab.releases"}}</a>
46 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings">Instellingen</a>{{end}}
46 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings">{{t "tab.settings"}}</a>{{end}}
47</p>
47</p>
48{{end}}
48{{end}}
internal/server/templates/pages.html +112 −84
@@ -1,19 +1,19 @@
1 1 {{define "setup"}}
2 2 {{template "layout-start" .}}
3 <h1>{{if .StorageUnset}}Opslag kiezen{{else}}Opslagpad{{end}}</h1>
3 <h1>{{if .StorageUnset}}{{t "setup.choose"}}{{else}}{{t "setup.pathTitle"}}{{end}}</h1>
4 4 {{if not .StorageUnset}}
5 <p class="flash bad">Het pad wijzigen verplaatst geen repositories, artifacts of releases.</p>
5 <p class="flash bad">{{t "setup.changeWarn"}}</p>
6 6 {{end}}
7 7 <section class="panel">
8 {{if .StorageFree}}<p>Vrije ruimte: <strong>{{.StorageFree}}</strong> van {{.StorageTotal}}.</p>{{end}}
8 {{if .StorageFree}}<p>{{t "setup.free" .StorageFree .StorageTotal}}</p>{{end}}
9 9 <form method="post" action="/setup">
10 10 <input type="hidden" name="csrf" value="{{.CSRF}}">
11 <label>Pad op de schijf
12 <input name="path" value="{{.StoragePath}}" required placeholder="/absoluut/pad">
11 <label>{{t "setup.disk"}}
12 <input name="path" value="{{.StoragePath}}" required placeholder="/absolute/path">
13 13 </label>
14 <button type="submit">Opslaan</button>
14 <button type="submit">{{t "action.save"}}</button>
15 15 </form>
16 <p class="muted">Het pad moet bestaan, beschrijfbaar zijn en minstens {{.MinFree}} vrij hebben.</p>
16 <p class="muted">{{t "setup.rules" .MinFree}}</p>
17 17 </section>
18 18 {{template "layout-end" .}}
19 19 {{end}}
@@ -24,14 +24,14 @@
24 24 <img src="/assets/logo.svg" alt="BlueGit">
25 25 <div>
26 26 <h1>BlueGit</h1>
27 <p>Meld je aan om repositories te bekijken.</p>
28 {{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
29 <p><a class="btn" href="/login">Aanmelden</a></p>
27 <p>{{t "home.lead"}}</p>
28 {{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
29 <p><a class="btn" href="/login">{{t "nav.signin"}}</a></p>
30 30 </div>
31 31 </section>
32 32 {{if .Repos}}
33 33 <section class="panel">
34 <h2>Openbare repositories</h2>
34 <h2>{{t "home.public"}}</h2>
35 35 <ul class="clean">
36 36 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="muted">{{.Description}}</span></li>{{end}}
37 37 </ul>
@@ -42,20 +42,20 @@
42 42
43 43 {{define "dashboard"}}
44 44 {{template "layout-start" .}}
45 <h1>Overzicht</h1>
46 {{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
45 <h1>{{t "nav.dashboard"}}</h1>
46 {{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
47 47 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
48 48 <div class="grid-2">
49 49 <section class="panel">
50 <h2>Repositories</h2>
51 {{if not .Repos}}<p class="muted">Nog geen repositories.</p>{{end}}
50 <h2>{{t "dash.repos"}}</h2>
51 {{if not .Repos}}<p class="muted">{{t "dash.noRepos"}}</p>{{end}}
52 52 <ul class="clean">
53 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{.Visibility}}</span><div class="muted">{{.Description}}</div></li>{{end}}
53 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span><div class="muted">{{.Description}}</div></li>{{end}}
54 54 </ul>
55 55 </section>
56 56 <section class="panel">
57 <h2>Groepen</h2>
58 {{if not .Groups}}<p class="muted">Nog geen groepen.</p>{{end}}
57 <h2>{{t "dash.groups"}}</h2>
58 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
59 59 <ul class="clean">
60 60 {{range .Groups}}<li><a href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></li>{{end}}
61 61 </ul>
@@ -65,14 +65,14 @@
65 65 {{end}}
66 66
67 67 {{define "heatmap"}}
68 <section class="heat" aria-label="Activiteit">
69 <h2>Activiteit</h2>
68 <section class="heat" aria-label="{{t "heat.title"}}">
69 <h2>{{t "heat.title"}}</h2>
70 70 <div class="heat-scroll">
71 71 <div class="heat-months">
72 72 {{range .Weeks}}<span>{{.Label}}</span>{{end}}
73 73 </div>
74 74 <div class="heat-body">
75 <div class="heat-dow" aria-hidden="true"><span></span><span>M</span><span></span><span>W</span><span></span><span>F</span><span></span></div>
75 <div class="heat-dow" aria-hidden="true"><span></span><span>{{t "heat.mon"}}</span><span></span><span>{{t "heat.wed"}}</span><span></span><span>{{t "heat.fri"}}</span><span></span></div>
76 76 <div class="heat-cols">
77 77 {{range .Weeks}}
78 78 <div class="heat-col">
@@ -85,8 +85,8 @@
85 85 <div class="heat-foot">
86 86 <p class="heat-total">{{.TotalText}}</p>
87 87 <div>
88 <p class="heat-legend"><span>Minder</span><span class="sq lv0"></span><span class="sq lv1"></span><span class="sq lv2"></span><span class="sq lv3"></span><span class="sq lv4"></span><span>Meer</span></p>
89 <p class="muted">Commits, merge requests en reacties.</p>
88 <p class="heat-legend"><span>{{t "heat.less"}}</span><span class="sq lv0"></span><span class="sq lv1"></span><span class="sq lv2"></span><span class="sq lv3"></span><span class="sq lv4"></span><span>{{t "heat.more"}}</span></p>
89 <p class="muted">{{t "heat.note"}}</p>
90 90 </div>
91 91 </div>
92 92 </section>
@@ -94,76 +94,104 @@
94 94
95 95 {{define "new"}}
96 96 {{template "layout-start" .}}
97 <h1>Nieuw</h1>
98 <div class="grid-2">
99 <form class="panel" method="post" action="/new/repo" data-kind="repo">
100 <h2>Repository</h2>
97 <h1>{{t "title.new"}}</h1>
98 <div class="chooser" data-chooser>
99 <button type="button" class="pick" data-open="repo">{{t "new.repo"}}</button>
100 <button type="button" class="pick" data-open="group">{{t "new.group"}}</button>
101 </div>
102 <div class="sheet" data-sheet hidden>
103 <p><button type="button" class="ghost" data-close>{{t "action.close"}}</button></p>
104 <form class="panel" method="post" action="/new/repo" data-kind="repo" data-free="{{t "slug.free"}}" data-taken="{{t "slug.taken"}}" data-bad="{{t "slug.bad"}}" hidden>
105 <h2>{{t "new.repo"}}</h2>
101 106 <input type="hidden" name="csrf" value="{{.CSRF}}">
102 <label>Naam <input name="name" required autocomplete="off"></label>
103 <p class="preview" data-slug-out></p>
104 <label>Beschrijving <input name="description"></label>
105 <label>Eigenaar
107 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
108 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
109 <label>{{t "new.description"}} <input name="description"></label>
110 <label>{{t "new.owner"}}
106 111 <select name="group">
107 <option value="">Ikzelf</option>
112 <option value="">{{t "new.me"}}</option>
108 113 {{range .Groups}}<option value="{{.Path}}">{{.Name}}</option>{{end}}
109 114 </select>
110 115 </label>
111 <label>Zichtbaarheid
112 <select name="visibility"><option value="private">Privé</option><option value="public">Openbaar</option></select>
116 <label>{{t "new.visibility"}}
117 <select name="visibility"><option value="private">{{t "vis.private"}}</option><option value="public">{{t "vis.public"}}</option></select>
113 118 </label>
114 <button type="submit">Aanmaken</button>
119 <p class="form-err" data-form-err></p>
120 <button type="submit">{{t "action.save"}}</button>
115 121 </form>
116 <form class="panel" method="post" action="/new/group" data-kind="group">
117 <h2>Groep</h2>
122 <form class="panel" method="post" action="/new/group" data-kind="group" data-free="{{t "slug.free"}}" data-taken="{{t "slug.taken"}}" data-bad="{{t "slug.bad"}}" hidden>
123 <h2>{{t "new.group"}}</h2>
118 124 <input type="hidden" name="csrf" value="{{.CSRF}}">
119 <label>Naam <input name="name" required autocomplete="off"></label>
120 <p class="preview" data-slug-out></p>
121 <label>Beschrijving <input name="description"></label>
122 <button type="submit">Aanmaken</button>
125 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
126 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
127 <label>{{t "new.description"}} <input name="description"></label>
128 <label>{{t "new.role"}}
129 <select name="default_role">
130 <option value="readonly">{{t "role.readonly"}}</option>
131 <option value="developer" selected>{{t "role.developer"}}</option>
132 <option value="maintainer">{{t "role.maintainer"}}</option>
133 </select>
134 </label>
135 <p class="muted">{{t "new.roleHint"}}</p>
136 <p class="form-err" data-form-err></p>
137 <button type="submit">{{t "action.save"}}</button>
123 138 </form>
124 139 </div>
125 140 <script src="/assets/slug.js"></script>
141 <script src="/assets/new.js"></script>
126 142 {{template "layout-end" .}}
127 143 {{end}}
128 144
129 145 {{define "account"}}
130 146 {{template "layout-start" .}}
131 <h1>Account</h1>
132 <p class="muted">Voor git via HTTPS: je gebruikersnaam en een token als wachtwoord.</p>
147 <h1>{{t "title.account"}}</h1>
148 <p class="muted">{{t "acct.hint"}}</p>
149 <section class="panel">
150 <h2>{{t "acct.language"}}</h2>
151 <form method="post" action="/settings/language">
152 <input type="hidden" name="csrf" value="{{.CSRF}}">
153 <div class="row">
154 <select name="language">
155 {{range .Langs}}<option value="{{.Code}}" {{if eq .Code $.Lang}}selected{{end}}>{{.Label}}</option>{{end}}
156 </select>
157 <button type="submit">{{t "action.save"}}</button>
158 </div>
159 </form>
160 </section>
133 161 {{if .NewToken}}<p class="code">{{.NewToken}}</p>{{end}}
134 162 <section class="panel">
135 <h2>Toegangstokens</h2>
163 <h2>{{t "acct.tokens"}}</h2>
136 164 <form method="post" action="/settings/tokens">
137 165 <input type="hidden" name="csrf" value="{{.CSRF}}">
138 <div class="row"><input name="name" placeholder="naam, bijvoorbeeld laptop" required><button type="submit">Nieuw token</button></div>
166 <div class="row"><input name="name" placeholder="{{t "acct.tokenName"}}" required><button type="submit">{{t "acct.newToken"}}</button></div>
139 167 </form>
140 168 <ul class="clean">
141 169 {{range .Tokens}}<li>{{.Name}} <span class="muted">{{.Prefix}}…</span>
142 170 <form method="post" action="/settings/tokens/delete" class="row">
143 171 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
144 <button class="ghost" type="submit">Intrekken</button>
172 <button class="ghost" type="submit">{{t "acct.revoke"}}</button>
145 173 </form>
146 174 </li>{{end}}
147 175 </ul>
148 176 </section>
149 177 <section class="panel">
150 <h2>SSH-sleutels</h2>
178 <h2>{{t "acct.ssh"}}</h2>
151 179 <form method="post" action="/settings/ssh">
152 180 <input type="hidden" name="csrf" value="{{.CSRF}}">
153 <label>Naam <input name="name" placeholder="laptop"></label>
154 <label>Publieke sleutel <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
155 <button type="submit">Toevoegen</button>
181 <label>{{t "acct.keyName"}} <input name="name" placeholder="laptop"></label>
182 <label>{{t "acct.pubkey"}} <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
183 <button type="submit">{{t "acct.add"}}</button>
156 184 </form>
157 185 <ul class="clean">
158 186 {{range .Keys}}<li>{{.Name}} <span class="muted">{{.Fingerprint}}</span>
159 187 <form method="post" action="/settings/ssh/delete">
160 188 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
161 <button class="ghost" type="submit">Verwijderen</button>
189 <button class="ghost" type="submit">{{t "acct.remove"}}</button>
162 190 </form>
163 191 </li>{{end}}
164 192 </ul>
165 193 </section>
166 <p><a href="/settings/export">Gegevens downloaden (JSON)</a></p>
194 <p><a href="/settings/export">{{t "acct.export"}}</a></p>
167 195 {{template "layout-end" .}}
168 196 {{end}}
169 197
@@ -179,8 +207,8 @@
179 207 {{end}}
180 208
181 209 {{define "visicon"}}
182 {{if eq .Repo.Visibility "public"}}<svg class="vis" viewBox="0 0 16 16" aria-label="Openbaar"><circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.2" d="M2 8h12M8 2c1.8 1.8 1.8 10.2 0 12M8 2c-1.8 1.8-1.8 10.2 0 12"/></svg>
183 {{else}}<svg class="vis" viewBox="0 0 16 16" aria-label="Privé"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>
210 {{if eq . "public"}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.public"}}"><circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.2" d="M2 8h12M8 2c1.8 1.8 1.8 10.2 0 12M8 2c-1.8 1.8-1.8 10.2 0 12"/></svg>
211 {{else}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.private"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>
184 212 {{end}}
185 213 {{end}}
186 214
@@ -190,7 +218,7 @@
190 218 {{range .Branches}}<option value="{{.Name}}" {{if eq .Name $.Rev}}selected{{end}}>{{.Name}}</option>{{end}}
191 219 </select>
192 220 </label>
193 {{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="Beschermd"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}
221 {{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.protected"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}
194 222 {{end}}
195 223
196 224 {{define "commitbar"}}
@@ -202,23 +230,23 @@
202 230 <div class="muted">{{.Head.Author}} · {{.Head.When}}</div>
203 231 </div>
204 232 <code class="sha">{{slice .Head.SHA 0 8}}</code>
205 <button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="Kopieer">Kopieer</button>
206 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">Geschiedenis</a>
233 <button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>
234 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>
207 235 </div>
208 236 {{end}}
209 237 {{end}}
210 238
211 239 {{define "codemenu"}}
212 240 <details class="menu">
213 <summary class="btn ghost">Code</summary>
241 <summary class="btn ghost">{{t "repo.code"}}</summary>
214 242 <div class="menu-panel">
215 243 {{if .CloneSSH}}
216 <p class="muted">SSH</p>
217 <div class="copyline"><input readonly value="{{.CloneSSH}}"><button type="button" data-copy="{{.CloneSSH}}">Kopieer</button></div>
244 <p class="muted">{{t "repo.ssh"}}</p>
245 <div class="copyline"><input readonly value="{{.CloneSSH}}"><button type="button" data-copy="{{.CloneSSH}}">{{t "action.copy"}}</button></div>
218 246 {{end}}
219 <p class="muted">HTTPS</p>
220 <div class="copyline"><input readonly value="{{.CloneHTTP}}"><button type="button" data-copy="{{.CloneHTTP}}">Kopieer</button></div>
221 <p class="muted">Gebruikersnaam en een token als wachtwoord.</p>
247 <p class="muted">{{t "repo.https"}}</p>
248 <div class="copyline"><input readonly value="{{.CloneHTTP}}"><button type="button" data-copy="{{.CloneHTTP}}">{{t "action.copy"}}</button></div>
249 <p class="muted">{{t "repo.cloneHint"}}</p>
222 250 </div>
223 251 </details>
224 252 {{end}}
@@ -226,7 +254,7 @@
226 254 {{define "filetable"}}
227 255 {{if .Files}}
228 256 <table class="files">
229 <thead><tr><th>Naam</th><th>Laatste commit</th><th>Laatste wijziging</th></tr></thead>
257 <thead><tr><th>{{t "repo.name"}}</th><th>{{t "repo.lastCommit"}}</th><th>{{t "repo.lastChange"}}</th></tr></thead>
230 258 <tbody>
231 259 {{range .Files}}
232 260 <tr>
@@ -237,7 +265,7 @@
237 265 {{end}}
238 266 </tbody>
239 267 </table>
240 {{else if eq .Page "files"}}<p class="muted">Deze map is leeg.</p>{{else if not .Head}}<p class="panel">Nog geen commits.</p>{{end}}
268 {{else if eq .Page "files"}}<p class="muted">{{t "repo.emptyDir"}}</p>{{else if not .Head}}<p class="panel">{{t "repo.noCommits"}}</p>{{end}}
241 269 {{end}}
242 270
243 271 {{define "repo"}}
@@ -245,9 +273,9 @@
245 273 <p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <span>{{.Repo.Name}}</span></p>
246 274 {{template "repotabs" .}}
247 275 <div class="projhead">
248 <span class="tile">{{initial .Repo.Name}}</span>
276 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
249 277 <h1>{{.Repo.Name}}</h1>
250 {{template "visicon" .}}
278 {{template "visicon" .Repo.Visibility}}
251 279 </div>
252 280 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
253 281 <div class="proj">
@@ -255,7 +283,7 @@
255 283 <div class="toolbar">
256 284 <div class="left">{{template "branchpick" .}} <span class="pathnow">{{.Repo.Name}}</span></div>
257 285 <div class="right">
258 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">Bestand zoeken</a>
286 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">{{t "repo.searchFile"}}</a>
259 287 {{template "codemenu" .}}
260 288 </div>
261 289 </div>
@@ -269,17 +297,17 @@
269 297 {{end}}
270 298 </div>
271 299 <aside class="side">
272 <h2>Projectinformatie</h2>
300 <h2>{{t "repo.project"}}</h2>
273 301 {{if .Repo.Description}}<p>{{.Repo.Description}}</p>{{end}}
274 302 <ul class="counts">
275 <li><a href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{.NCommits}} {{if eq .NCommits 1}}commit{{else}}commits{{end}}</a></li>
276 <li><a href="/{{.Repo.FullPath}}/-/branches">{{.NBranches}} {{if eq .NBranches 1}}branch{{else}}branches{{end}}</a></li>
277 <li><a href="/{{.Repo.FullPath}}/-/tags">{{.NTags}} {{if eq .NTags 1}}tag{{else}}tags{{end}}</a></li>
278 <li><a href="/{{.Repo.FullPath}}/-/releases">{{.NReleases}} {{if eq .NReleases 1}}release{{else}}releases{{end}}</a></li>
303 <li><a href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{tn .NCommits "count.commit.one" "count.commit.many"}}</a></li>
304 <li><a href="/{{.Repo.FullPath}}/-/branches">{{tn .NBranches "count.branch.one" "count.branch.many"}}</a></li>
305 <li><a href="/{{.Repo.FullPath}}/-/tags">{{tn .NTags "count.tag.one" "count.tag.many"}}</a></li>
306 <li><a href="/{{.Repo.FullPath}}/-/releases">{{tn .NReleases "count.release.one" "count.release.many"}}</a></li>
279 307 </ul>
280 308 {{if .ReadmeName}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.ReadmeName}}?rev={{.Rev}}">README</a></p>{{end}}
281 309 {{if .LicensePath}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.LicensePath}}?rev={{.Rev}}">LICENSE</a></p>{{end}}
282 {{if .Created}}<p class="muted">Aangemaakt op {{.Created}}</p>{{end}}
310 {{if .Created}}<p class="muted">{{t "repo.created" .Created}}</p>{{end}}
283 311 </aside>
284 312 </div>
285 313 <script src="/assets/repo.js"></script>
@@ -292,8 +320,8 @@
292 320 {{template "repotabs" .}}
293 321 <div class="fileview">
294 322 <aside class="treebox">
295 <h2>Bestanden</h2>
296 <input type="search" placeholder="Zoeken" data-tree-filter>
323 <h2>{{t "repo.files"}}</h2>
324 <input type="search" placeholder="{{t "group.search"}}" data-tree-filter>
297 325 <ul class="treelist">
298 326 {{range .Tree}}
299 327 <li class="depth-{{.Depth}}{{if .Active}} active{{end}}" data-path="{{.Path}}">
@@ -311,7 +339,7 @@
311 339 <a href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}">{{.Repo.Name}}</a>
312 340 {{if .BlobPath}}{{range splitPath .BlobPath}} / <span>{{.}}</span>{{end}}{{else if .TreePath}}{{range splitPath .TreePath}} / <span>{{.}}</span>{{end}}{{end}}
313 341 </span>
314 {{if or .BlobPath .TreePath}}<button type="button" class="iconbtn" data-copy="{{if .BlobPath}}{{.BlobPath}}{{else}}{{.TreePath}}{{end}}" aria-label="Kopieer">Kopieer</button>{{end}}
342 {{if or .BlobPath .TreePath}}<button type="button" class="iconbtn" data-copy="{{if .BlobPath}}{{.BlobPath}}{{else}}{{.TreePath}}{{end}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{end}}
315 343 </div>
316 344 </div>
317 345 {{if .BlobPath}}
@@ -319,7 +347,7 @@
319 347 {{template "commitbar" .}}
320 348 <article class="codebox">
321 349 <header>{{template "ficon" (iconOf .FileName)}} {{.FileName}} <span class="muted">{{.BlobSize}}</span></header>
322 {{if .Binary}}<p>Binair bestand.</p>{{else}}
350 {{if .Binary}}<p>{{t "repo.binary"}}</p>{{else}}
323 351 <table class="code">
324 352 {{range .Lines}}<tr><td class="ln">{{.N}}</td><td class="src">{{.HTML}}</td></tr>{{end}}
325 353 </table>
@@ -336,20 +364,20 @@
336 364
337 365 {{define "tags"}}
338 366 {{template "layout-start" .}}
339 <h1>Tags</h1>
367 <h1>{{t "title.tags"}}</h1>
340 368 {{template "repotabs" .}}
341 369 <ul class="clean">
342 {{range .TagNames}}<li><code>{{.}}</code></li>{{else}}<li class="muted">Nog geen tags.</li>{{end}}
370 {{range .TagNames}}<li><code>{{.}}</code></li>{{else}}<li class="muted">{{t "repo.noTags"}}</li>{{end}}
343 371 </ul>
344 372 {{template "layout-end" .}}
345 373 {{end}}
346 374
347 375 {{define "commits"}}
348 376 {{template "layout-start" .}}
349 <h1>Commits</h1>
377 <h1>{{t "title.commits"}}</h1>
350 378 {{template "repotabs" .}}
351 379 <ul class="clean">
352 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{else}}<li class="muted">Nog geen commits.</li>{{end}}
380 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{else}}<li class="muted">{{t "repo.noCommits"}}</li>{{end}}
353 381 </ul>
354 382 {{template "layout-end" .}}
355 383 {{end}}
@@ -365,10 +393,10 @@
365 393
366 394 {{define "branches"}}
367 395 {{template "layout-start" .}}
368 <h1>Branches</h1>
396 <h1>{{t "title.branches"}}</h1>
369 397 {{template "repotabs" .}}
370 398 <ul class="clean">
371 {{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">beschermd</span>{{end}}</li>{{else}}<li class="muted">Nog geen branches.</li>{{end}}
399 {{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}</li>{{else}}<li class="muted">{{t "repo.noBranches"}}</li>{{end}}
372 400 </ul>
373 401 {{template "layout-end" .}}
374 402 {{end}}
@@ -1,19 +1,19 @@
1{{define "setup"}}
1{{define "setup"}}
2{{template "layout-start" .}}
2{{template "layout-start" .}}
3<h1>{{if .StorageUnset}}Opslag kiezen{{else}}Opslagpad{{end}}</h1>
3<h1>{{if .StorageUnset}}{{t "setup.choose"}}{{else}}{{t "setup.pathTitle"}}{{end}}</h1>
4{{if not .StorageUnset}}
4{{if not .StorageUnset}}
5<p class="flash bad">Het pad wijzigen verplaatst geen repositories, artifacts of releases.</p>
5<p class="flash bad">{{t "setup.changeWarn"}}</p>
6{{end}}
6{{end}}
7<section class="panel">
7<section class="panel">
8 {{if .StorageFree}}<p>Vrije ruimte: <strong>{{.StorageFree}}</strong> van {{.StorageTotal}}.</p>{{end}}
8 {{if .StorageFree}}<p>{{t "setup.free" .StorageFree .StorageTotal}}</p>{{end}}
9 <form method="post" action="/setup">
9 <form method="post" action="/setup">
10 <input type="hidden" name="csrf" value="{{.CSRF}}">
10 <input type="hidden" name="csrf" value="{{.CSRF}}">
11 <label>Pad op de schijf
11 <label>{{t "setup.disk"}}
12 <input name="path" value="{{.StoragePath}}" required placeholder="/absoluut/pad">
12 <input name="path" value="{{.StoragePath}}" required placeholder="/absolute/path">
13 </label>
13 </label>
14 <button type="submit">Opslaan</button>
14 <button type="submit">{{t "action.save"}}</button>
15 </form>
15 </form>
16 <p class="muted">Het pad moet bestaan, beschrijfbaar zijn en minstens {{.MinFree}} vrij hebben.</p>
16 <p class="muted">{{t "setup.rules" .MinFree}}</p>
17</section>
17</section>
18{{template "layout-end" .}}
18{{template "layout-end" .}}
19{{end}}
19{{end}}
@@ -24,14 +24,14 @@
24 <img src="/assets/logo.svg" alt="BlueGit">
24 <img src="/assets/logo.svg" alt="BlueGit">
25 <div>
25 <div>
26 <h1>BlueGit</h1>
26 <h1>BlueGit</h1>
27 <p>Meld je aan om repositories te bekijken.</p>
27 <p>{{t "home.lead"}}</p>
28 {{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
28 {{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
29 <p><a class="btn" href="/login">Aanmelden</a></p>
29 <p><a class="btn" href="/login">{{t "nav.signin"}}</a></p>
30 </div>
30 </div>
31</section>
31</section>
32{{if .Repos}}
32{{if .Repos}}
33<section class="panel">
33<section class="panel">
34 <h2>Openbare repositories</h2>
34 <h2>{{t "home.public"}}</h2>
35 <ul class="clean">
35 <ul class="clean">
36 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="muted">{{.Description}}</span></li>{{end}}
36 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="muted">{{.Description}}</span></li>{{end}}
37 </ul>
37 </ul>
@@ -42,20 +42,20 @@
42
42
43{{define "dashboard"}}
43{{define "dashboard"}}
44{{template "layout-start" .}}
44{{template "layout-start" .}}
45<h1>Overzicht</h1>
45<h1>{{t "nav.dashboard"}}</h1>
46{{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
46{{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
47{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
47{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
48<div class="grid-2">
48<div class="grid-2">
49 <section class="panel">
49 <section class="panel">
50 <h2>Repositories</h2>
50 <h2>{{t "dash.repos"}}</h2>
51 {{if not .Repos}}<p class="muted">Nog geen repositories.</p>{{end}}
51 {{if not .Repos}}<p class="muted">{{t "dash.noRepos"}}</p>{{end}}
52 <ul class="clean">
52 <ul class="clean">
53 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{.Visibility}}</span><div class="muted">{{.Description}}</div></li>{{end}}
53 {{range .Repos}}<li><a href="/{{.FullPath}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span><div class="muted">{{.Description}}</div></li>{{end}}
54 </ul>
54 </ul>
55 </section>
55 </section>
56 <section class="panel">
56 <section class="panel">
57 <h2>Groepen</h2>
57 <h2>{{t "dash.groups"}}</h2>
58 {{if not .Groups}}<p class="muted">Nog geen groepen.</p>{{end}}
58 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
59 <ul class="clean">
59 <ul class="clean">
60 {{range .Groups}}<li><a href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></li>{{end}}
60 {{range .Groups}}<li><a href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></li>{{end}}
61 </ul>
61 </ul>
@@ -65,14 +65,14 @@
65{{end}}
65{{end}}
66
66
67{{define "heatmap"}}
67{{define "heatmap"}}
68<section class="heat" aria-label="Activiteit">
68<section class="heat" aria-label="{{t "heat.title"}}">
69 <h2>Activiteit</h2>
69 <h2>{{t "heat.title"}}</h2>
70 <div class="heat-scroll">
70 <div class="heat-scroll">
71 <div class="heat-months">
71 <div class="heat-months">
72 {{range .Weeks}}<span>{{.Label}}</span>{{end}}
72 {{range .Weeks}}<span>{{.Label}}</span>{{end}}
73 </div>
73 </div>
74 <div class="heat-body">
74 <div class="heat-body">
75 <div class="heat-dow" aria-hidden="true"><span></span><span>M</span><span></span><span>W</span><span></span><span>F</span><span></span></div>
75 <div class="heat-dow" aria-hidden="true"><span></span><span>{{t "heat.mon"}}</span><span></span><span>{{t "heat.wed"}}</span><span></span><span>{{t "heat.fri"}}</span><span></span></div>
76 <div class="heat-cols">
76 <div class="heat-cols">
77 {{range .Weeks}}
77 {{range .Weeks}}
78 <div class="heat-col">
78 <div class="heat-col">
@@ -85,8 +85,8 @@
85 <div class="heat-foot">
85 <div class="heat-foot">
86 <p class="heat-total">{{.TotalText}}</p>
86 <p class="heat-total">{{.TotalText}}</p>
87 <div>
87 <div>
88 <p class="heat-legend"><span>Minder</span><span class="sq lv0"></span><span class="sq lv1"></span><span class="sq lv2"></span><span class="sq lv3"></span><span class="sq lv4"></span><span>Meer</span></p>
88 <p class="heat-legend"><span>{{t "heat.less"}}</span><span class="sq lv0"></span><span class="sq lv1"></span><span class="sq lv2"></span><span class="sq lv3"></span><span class="sq lv4"></span><span>{{t "heat.more"}}</span></p>
89 <p class="muted">Commits, merge requests en reacties.</p>
89 <p class="muted">{{t "heat.note"}}</p>
90 </div>
90 </div>
91 </div>
91 </div>
92</section>
92</section>
@@ -94,76 +94,104 @@
94
94
95{{define "new"}}
95{{define "new"}}
96{{template "layout-start" .}}
96{{template "layout-start" .}}
97<h1>Nieuw</h1>
97<h1>{{t "title.new"}}</h1>
98<div class="grid-2">
98<div class="chooser" data-chooser>
99 <form class="panel" method="post" action="/new/repo" data-kind="repo">
99 <button type="button" class="pick" data-open="repo">{{t "new.repo"}}</button>
100 <h2>Repository</h2>
100 <button type="button" class="pick" data-open="group">{{t "new.group"}}</button>
101</div>
102<div class="sheet" data-sheet hidden>
103 <p><button type="button" class="ghost" data-close>{{t "action.close"}}</button></p>
104 <form class="panel" method="post" action="/new/repo" data-kind="repo" data-free="{{t "slug.free"}}" data-taken="{{t "slug.taken"}}" data-bad="{{t "slug.bad"}}" hidden>
105 <h2>{{t "new.repo"}}</h2>
101 <input type="hidden" name="csrf" value="{{.CSRF}}">
106 <input type="hidden" name="csrf" value="{{.CSRF}}">
102 <label>Naam <input name="name" required autocomplete="off"></label>
107 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
103 <p class="preview" data-slug-out></p>
108 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
104 <label>Beschrijving <input name="description"></label>
109 <label>{{t "new.description"}} <input name="description"></label>
105 <label>Eigenaar
110 <label>{{t "new.owner"}}
106 <select name="group">
111 <select name="group">
107 <option value="">Ikzelf</option>
112 <option value="">{{t "new.me"}}</option>
108 {{range .Groups}}<option value="{{.Path}}">{{.Name}}</option>{{end}}
113 {{range .Groups}}<option value="{{.Path}}">{{.Name}}</option>{{end}}
109 </select>
114 </select>
110 </label>
115 </label>
111 <label>Zichtbaarheid
116 <label>{{t "new.visibility"}}
112 <select name="visibility"><option value="private">Privé</option><option value="public">Openbaar</option></select>
117 <select name="visibility"><option value="private">{{t "vis.private"}}</option><option value="public">{{t "vis.public"}}</option></select>
113 </label>
118 </label>
114 <button type="submit">Aanmaken</button>
119 <p class="form-err" data-form-err></p>
120 <button type="submit">{{t "action.save"}}</button>
115 </form>
121 </form>
116 <form class="panel" method="post" action="/new/group" data-kind="group">
122 <form class="panel" method="post" action="/new/group" data-kind="group" data-free="{{t "slug.free"}}" data-taken="{{t "slug.taken"}}" data-bad="{{t "slug.bad"}}" hidden>
117 <h2>Groep</h2>
123 <h2>{{t "new.group"}}</h2>
118 <input type="hidden" name="csrf" value="{{.CSRF}}">
124 <input type="hidden" name="csrf" value="{{.CSRF}}">
119 <label>Naam <input name="name" required autocomplete="off"></label>
125 <label>{{t "new.name"}} <input name="name" required autocomplete="off"></label>
120 <p class="preview" data-slug-out></p>
126 <p class="preview"><span data-slug-text></span> <span data-slug-flag></span></p>
121 <label>Beschrijving <input name="description"></label>
127 <label>{{t "new.description"}} <input name="description"></label>
122 <button type="submit">Aanmaken</button>
128 <label>{{t "new.role"}}
129 <select name="default_role">
130 <option value="readonly">{{t "role.readonly"}}</option>
131 <option value="developer" selected>{{t "role.developer"}}</option>
132 <option value="maintainer">{{t "role.maintainer"}}</option>
133 </select>
134 </label>
135 <p class="muted">{{t "new.roleHint"}}</p>
136 <p class="form-err" data-form-err></p>
137 <button type="submit">{{t "action.save"}}</button>
123 </form>
138 </form>
124</div>
139</div>
125<script src="/assets/slug.js"></script>
140<script src="/assets/slug.js"></script>
141<script src="/assets/new.js"></script>
126{{template "layout-end" .}}
142{{template "layout-end" .}}
127{{end}}
143{{end}}
128
144
129{{define "account"}}
145{{define "account"}}
130{{template "layout-start" .}}
146{{template "layout-start" .}}
131<h1>Account</h1>
147<h1>{{t "title.account"}}</h1>
132<p class="muted">Voor git via HTTPS: je gebruikersnaam en een token als wachtwoord.</p>
148<p class="muted">{{t "acct.hint"}}</p>
149<section class="panel">
150 <h2>{{t "acct.language"}}</h2>
151 <form method="post" action="/settings/language">
152 <input type="hidden" name="csrf" value="{{.CSRF}}">
153 <div class="row">
154 <select name="language">
155 {{range .Langs}}<option value="{{.Code}}" {{if eq .Code $.Lang}}selected{{end}}>{{.Label}}</option>{{end}}
156 </select>
157 <button type="submit">{{t "action.save"}}</button>
158 </div>
159 </form>
160</section>
133{{if .NewToken}}<p class="code">{{.NewToken}}</p>{{end}}
161{{if .NewToken}}<p class="code">{{.NewToken}}</p>{{end}}
134<section class="panel">
162<section class="panel">
135 <h2>Toegangstokens</h2>
163 <h2>{{t "acct.tokens"}}</h2>
136 <form method="post" action="/settings/tokens">
164 <form method="post" action="/settings/tokens">
137 <input type="hidden" name="csrf" value="{{.CSRF}}">
165 <input type="hidden" name="csrf" value="{{.CSRF}}">
138 <div class="row"><input name="name" placeholder="naam, bijvoorbeeld laptop" required><button type="submit">Nieuw token</button></div>
166 <div class="row"><input name="name" placeholder="{{t "acct.tokenName"}}" required><button type="submit">{{t "acct.newToken"}}</button></div>
139 </form>
167 </form>
140 <ul class="clean">
168 <ul class="clean">
141 {{range .Tokens}}<li>{{.Name}} <span class="muted">{{.Prefix}}…</span>
169 {{range .Tokens}}<li>{{.Name}} <span class="muted">{{.Prefix}}…</span>
142 <form method="post" action="/settings/tokens/delete" class="row">
170 <form method="post" action="/settings/tokens/delete" class="row">
143 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
171 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
144 <button class="ghost" type="submit">Intrekken</button>
172 <button class="ghost" type="submit">{{t "acct.revoke"}}</button>
145 </form>
173 </form>
146 </li>{{end}}
174 </li>{{end}}
147 </ul>
175 </ul>
148</section>
176</section>
149<section class="panel">
177<section class="panel">
150 <h2>SSH-sleutels</h2>
178 <h2>{{t "acct.ssh"}}</h2>
151 <form method="post" action="/settings/ssh">
179 <form method="post" action="/settings/ssh">
152 <input type="hidden" name="csrf" value="{{.CSRF}}">
180 <input type="hidden" name="csrf" value="{{.CSRF}}">
153 <label>Naam <input name="name" placeholder="laptop"></label>
181 <label>{{t "acct.keyName"}} <input name="name" placeholder="laptop"></label>
154 <label>Publieke sleutel <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
182 <label>{{t "acct.pubkey"}} <textarea name="key" placeholder="ssh-ed25519 AAAA... " required></textarea></label>
155 <button type="submit">Toevoegen</button>
183 <button type="submit">{{t "acct.add"}}</button>
156 </form>
184 </form>
157 <ul class="clean">
185 <ul class="clean">
158 {{range .Keys}}<li>{{.Name}} <span class="muted">{{.Fingerprint}}</span>
186 {{range .Keys}}<li>{{.Name}} <span class="muted">{{.Fingerprint}}</span>
159 <form method="post" action="/settings/ssh/delete">
187 <form method="post" action="/settings/ssh/delete">
160 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
188 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
161 <button class="ghost" type="submit">Verwijderen</button>
189 <button class="ghost" type="submit">{{t "acct.remove"}}</button>
162 </form>
190 </form>
163 </li>{{end}}
191 </li>{{end}}
164 </ul>
192 </ul>
165</section>
193</section>
166<p><a href="/settings/export">Gegevens downloaden (JSON)</a></p>
194<p><a href="/settings/export">{{t "acct.export"}}</a></p>
167{{template "layout-end" .}}
195{{template "layout-end" .}}
168{{end}}
196{{end}}
169
197
@@ -179,8 +207,8 @@
179{{end}}
207{{end}}
180
208
181{{define "visicon"}}
209{{define "visicon"}}
182{{if eq .Repo.Visibility "public"}}<svg class="vis" viewBox="0 0 16 16" aria-label="Openbaar"><circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.2" d="M2 8h12M8 2c1.8 1.8 1.8 10.2 0 12M8 2c-1.8 1.8-1.8 10.2 0 12"/></svg>
210{{if eq . "public"}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.public"}}"><circle cx="8" cy="8" r="6" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.2" d="M2 8h12M8 2c1.8 1.8 1.8 10.2 0 12M8 2c-1.8 1.8-1.8 10.2 0 12"/></svg>
183{{else}}<svg class="vis" viewBox="0 0 16 16" aria-label="Privé"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>
211{{else}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.private"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>
184{{end}}
212{{end}}
185{{end}}
213{{end}}
186
214
@@ -190,7 +218,7 @@
190 {{range .Branches}}<option value="{{.Name}}" {{if eq .Name $.Rev}}selected{{end}}>{{.Name}}</option>{{end}}
218 {{range .Branches}}<option value="{{.Name}}" {{if eq .Name $.Rev}}selected{{end}}>{{.Name}}</option>{{end}}
191 </select>
219 </select>
192</label>
220</label>
193{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="Beschermd"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}
221{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.protected"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}
194{{end}}
222{{end}}
195
223
196{{define "commitbar"}}
224{{define "commitbar"}}
@@ -202,23 +230,23 @@
202 <div class="muted">{{.Head.Author}} · {{.Head.When}}</div>
230 <div class="muted">{{.Head.Author}} · {{.Head.When}}</div>
203 </div>
231 </div>
204 <code class="sha">{{slice .Head.SHA 0 8}}</code>
232 <code class="sha">{{slice .Head.SHA 0 8}}</code>
205 <button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="Kopieer">Kopieer</button>
233 <button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>
206 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">Geschiedenis</a>
234 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>
207</div>
235</div>
208{{end}}
236{{end}}
209{{end}}
237{{end}}
210
238
211{{define "codemenu"}}
239{{define "codemenu"}}
212<details class="menu">
240<details class="menu">
213 <summary class="btn ghost">Code</summary>
241 <summary class="btn ghost">{{t "repo.code"}}</summary>
214 <div class="menu-panel">
242 <div class="menu-panel">
215 {{if .CloneSSH}}
243 {{if .CloneSSH}}
216 <p class="muted">SSH</p>
244 <p class="muted">{{t "repo.ssh"}}</p>
217 <div class="copyline"><input readonly value="{{.CloneSSH}}"><button type="button" data-copy="{{.CloneSSH}}">Kopieer</button></div>
245 <div class="copyline"><input readonly value="{{.CloneSSH}}"><button type="button" data-copy="{{.CloneSSH}}">{{t "action.copy"}}</button></div>
218 {{end}}
246 {{end}}
219 <p class="muted">HTTPS</p>
247 <p class="muted">{{t "repo.https"}}</p>
220 <div class="copyline"><input readonly value="{{.CloneHTTP}}"><button type="button" data-copy="{{.CloneHTTP}}">Kopieer</button></div>
248 <div class="copyline"><input readonly value="{{.CloneHTTP}}"><button type="button" data-copy="{{.CloneHTTP}}">{{t "action.copy"}}</button></div>
221 <p class="muted">Gebruikersnaam en een token als wachtwoord.</p>
249 <p class="muted">{{t "repo.cloneHint"}}</p>
222 </div>
250 </div>
223</details>
251</details>
224{{end}}
252{{end}}
@@ -226,7 +254,7 @@
226{{define "filetable"}}
254{{define "filetable"}}
227{{if .Files}}
255{{if .Files}}
228<table class="files">
256<table class="files">
229 <thead><tr><th>Naam</th><th>Laatste commit</th><th>Laatste wijziging</th></tr></thead>
257 <thead><tr><th>{{t "repo.name"}}</th><th>{{t "repo.lastCommit"}}</th><th>{{t "repo.lastChange"}}</th></tr></thead>
230 <tbody>
258 <tbody>
231 {{range .Files}}
259 {{range .Files}}
232 <tr>
260 <tr>
@@ -237,7 +265,7 @@
237 {{end}}
265 {{end}}
238 </tbody>
266 </tbody>
239</table>
267</table>
240{{else if eq .Page "files"}}<p class="muted">Deze map is leeg.</p>{{else if not .Head}}<p class="panel">Nog geen commits.</p>{{end}}
268{{else if eq .Page "files"}}<p class="muted">{{t "repo.emptyDir"}}</p>{{else if not .Head}}<p class="panel">{{t "repo.noCommits"}}</p>{{end}}
241{{end}}
269{{end}}
242
270
243{{define "repo"}}
271{{define "repo"}}
@@ -245,9 +273,9 @@
245<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <span>{{.Repo.Name}}</span></p>
273<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<span>{{.Repo.OwnerPath}}</span>{{end}} / <span>{{.Repo.Name}}</span></p>
246{{template "repotabs" .}}
274{{template "repotabs" .}}
247<div class="projhead">
275<div class="projhead">
248 <span class="tile">{{initial .Repo.Name}}</span>
276 {{if .Repo.HasLogo}}<img class="tile" src="/{{.Repo.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Repo.Name}}</span>{{end}}
249 <h1>{{.Repo.Name}}</h1>
277 <h1>{{.Repo.Name}}</h1>
250 {{template "visicon" .}}
278 {{template "visicon" .Repo.Visibility}}
251</div>
279</div>
252{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
280{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
253<div class="proj">
281<div class="proj">
@@ -255,7 +283,7 @@
255 <div class="toolbar">
283 <div class="toolbar">
256 <div class="left">{{template "branchpick" .}} <span class="pathnow">{{.Repo.Name}}</span></div>
284 <div class="left">{{template "branchpick" .}} <span class="pathnow">{{.Repo.Name}}</span></div>
257 <div class="right">
285 <div class="right">
258 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">Bestand zoeken</a>
286 <a class="btn ghost" href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}&amp;focus=1">{{t "repo.searchFile"}}</a>
259 {{template "codemenu" .}}
287 {{template "codemenu" .}}
260 </div>
288 </div>
261 </div>
289 </div>
@@ -269,17 +297,17 @@
269 {{end}}
297 {{end}}
270 </div>
298 </div>
271 <aside class="side">
299 <aside class="side">
272 <h2>Projectinformatie</h2>
300 <h2>{{t "repo.project"}}</h2>
273 {{if .Repo.Description}}<p>{{.Repo.Description}}</p>{{end}}
301 {{if .Repo.Description}}<p>{{.Repo.Description}}</p>{{end}}
274 <ul class="counts">
302 <ul class="counts">
275 <li><a href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{.NCommits}} {{if eq .NCommits 1}}commit{{else}}commits{{end}}</a></li>
303 <li><a href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{tn .NCommits "count.commit.one" "count.commit.many"}}</a></li>
276 <li><a href="/{{.Repo.FullPath}}/-/branches">{{.NBranches}} {{if eq .NBranches 1}}branch{{else}}branches{{end}}</a></li>
304 <li><a href="/{{.Repo.FullPath}}/-/branches">{{tn .NBranches "count.branch.one" "count.branch.many"}}</a></li>
277 <li><a href="/{{.Repo.FullPath}}/-/tags">{{.NTags}} {{if eq .NTags 1}}tag{{else}}tags{{end}}</a></li>
305 <li><a href="/{{.Repo.FullPath}}/-/tags">{{tn .NTags "count.tag.one" "count.tag.many"}}</a></li>
278 <li><a href="/{{.Repo.FullPath}}/-/releases">{{.NReleases}} {{if eq .NReleases 1}}release{{else}}releases{{end}}</a></li>
306 <li><a href="/{{.Repo.FullPath}}/-/releases">{{tn .NReleases "count.release.one" "count.release.many"}}</a></li>
279 </ul>
307 </ul>
280 {{if .ReadmeName}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.ReadmeName}}?rev={{.Rev}}">README</a></p>{{end}}
308 {{if .ReadmeName}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.ReadmeName}}?rev={{.Rev}}">README</a></p>{{end}}
281 {{if .LicensePath}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.LicensePath}}?rev={{.Rev}}">LICENSE</a></p>{{end}}
309 {{if .LicensePath}}<p><a href="/{{.Repo.FullPath}}/-/blob/{{.LicensePath}}?rev={{.Rev}}">LICENSE</a></p>{{end}}
282 {{if .Created}}<p class="muted">Aangemaakt op {{.Created}}</p>{{end}}
310 {{if .Created}}<p class="muted">{{t "repo.created" .Created}}</p>{{end}}
283 </aside>
311 </aside>
284</div>
312</div>
285<script src="/assets/repo.js"></script>
313<script src="/assets/repo.js"></script>
@@ -292,8 +320,8 @@
292{{template "repotabs" .}}
320{{template "repotabs" .}}
293<div class="fileview">
321<div class="fileview">
294 <aside class="treebox">
322 <aside class="treebox">
295 <h2>Bestanden</h2>
323 <h2>{{t "repo.files"}}</h2>
296 <input type="search" placeholder="Zoeken" data-tree-filter>
324 <input type="search" placeholder="{{t "group.search"}}" data-tree-filter>
297 <ul class="treelist">
325 <ul class="treelist">
298 {{range .Tree}}
326 {{range .Tree}}
299 <li class="depth-{{.Depth}}{{if .Active}} active{{end}}" data-path="{{.Path}}">
327 <li class="depth-{{.Depth}}{{if .Active}} active{{end}}" data-path="{{.Path}}">
@@ -311,7 +339,7 @@
311 <a href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}">{{.Repo.Name}}</a>
339 <a href="/{{.Repo.FullPath}}/-/tree?rev={{.Rev}}">{{.Repo.Name}}</a>
312 {{if .BlobPath}}{{range splitPath .BlobPath}} / <span>{{.}}</span>{{end}}{{else if .TreePath}}{{range splitPath .TreePath}} / <span>{{.}}</span>{{end}}{{end}}
340 {{if .BlobPath}}{{range splitPath .BlobPath}} / <span>{{.}}</span>{{end}}{{else if .TreePath}}{{range splitPath .TreePath}} / <span>{{.}}</span>{{end}}{{end}}
313 </span>
341 </span>
314 {{if or .BlobPath .TreePath}}<button type="button" class="iconbtn" data-copy="{{if .BlobPath}}{{.BlobPath}}{{else}}{{.TreePath}}{{end}}" aria-label="Kopieer">Kopieer</button>{{end}}
342 {{if or .BlobPath .TreePath}}<button type="button" class="iconbtn" data-copy="{{if .BlobPath}}{{.BlobPath}}{{else}}{{.TreePath}}{{end}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{end}}
315 </div>
343 </div>
316 </div>
344 </div>
317 {{if .BlobPath}}
345 {{if .BlobPath}}
@@ -319,7 +347,7 @@
319 {{template "commitbar" .}}
347 {{template "commitbar" .}}
320 <article class="codebox">
348 <article class="codebox">
321 <header>{{template "ficon" (iconOf .FileName)}} {{.FileName}} <span class="muted">{{.BlobSize}}</span></header>
349 <header>{{template "ficon" (iconOf .FileName)}} {{.FileName}} <span class="muted">{{.BlobSize}}</span></header>
322 {{if .Binary}}<p>Binair bestand.</p>{{else}}
350 {{if .Binary}}<p>{{t "repo.binary"}}</p>{{else}}
323 <table class="code">
351 <table class="code">
324 {{range .Lines}}<tr><td class="ln">{{.N}}</td><td class="src">{{.HTML}}</td></tr>{{end}}
352 {{range .Lines}}<tr><td class="ln">{{.N}}</td><td class="src">{{.HTML}}</td></tr>{{end}}
325 </table>
353 </table>
@@ -336,20 +364,20 @@
336
364
337{{define "tags"}}
365{{define "tags"}}
338{{template "layout-start" .}}
366{{template "layout-start" .}}
339<h1>Tags</h1>
367<h1>{{t "title.tags"}}</h1>
340{{template "repotabs" .}}
368{{template "repotabs" .}}
341<ul class="clean">
369<ul class="clean">
342 {{range .TagNames}}<li><code>{{.}}</code></li>{{else}}<li class="muted">Nog geen tags.</li>{{end}}
370 {{range .TagNames}}<li><code>{{.}}</code></li>{{else}}<li class="muted">{{t "repo.noTags"}}</li>{{end}}
343</ul>
371</ul>
344{{template "layout-end" .}}
372{{template "layout-end" .}}
345{{end}}
373{{end}}
346
374
347{{define "commits"}}
375{{define "commits"}}
348{{template "layout-start" .}}
376{{template "layout-start" .}}
349<h1>Commits</h1>
377<h1>{{t "title.commits"}}</h1>
350{{template "repotabs" .}}
378{{template "repotabs" .}}
351<ul class="clean">
379<ul class="clean">
352 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{else}}<li class="muted">Nog geen commits.</li>{{end}}
380 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{else}}<li class="muted">{{t "repo.noCommits"}}</li>{{end}}
353</ul>
381</ul>
354{{template "layout-end" .}}
382{{template "layout-end" .}}
355{{end}}
383{{end}}
@@ -365,10 +393,10 @@
365
393
366{{define "branches"}}
394{{define "branches"}}
367{{template "layout-start" .}}
395{{template "layout-start" .}}
368<h1>Branches</h1>
396<h1>{{t "title.branches"}}</h1>
369{{template "repotabs" .}}
397{{template "repotabs" .}}
370<ul class="clean">
398<ul class="clean">
371 {{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">beschermd</span>{{end}}</li>{{else}}<li class="muted">Nog geen branches.</li>{{end}}
399 {{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}</li>{{else}}<li class="muted">{{t "repo.noBranches"}}</li>{{end}}
372</ul>
400</ul>
373{{template "layout-end" .}}
401{{template "layout-end" .}}
374{{end}}
402{{end}}
internal/ssrf/ssrf.go +12 −11
@@ -7,12 +7,13 @@ package ssrf
7 7
8 8 import (
9 9 "context"
10 "fmt"
11 10 "net"
12 11 "net/http"
13 12 "net/url"
14 13 "strings"
15 14 "time"
15
16 "gitlab.com/Timfa/bluegit/internal/i18n"
16 17 )
17 18
18 19 // MaxRedirects is het aantal hops dat een webhook nog volgt.
@@ -146,11 +147,11 @@ func defaultLookup(ctx context.Context, host string) ([]net.IP, error) {
146 147 func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
147 148 host = strings.TrimSuffix(strings.TrimSpace(host), ".")
148 149 if host == "" {
149 return nil, fmt.Errorf("webhook-host ontbreekt")
150 return nil, i18n.E("err.whHost")
150 151 }
151 152 if ip := net.ParseIP(host); ip != nil {
152 153 if Private(ip) {
153 return nil, fmt.Errorf("%s ligt in een geblokkeerd bereik", ip)
154 return nil, i18n.E("err.whBlockedIP", ip.String())
154 155 }
155 156 return ip, nil
156 157 }
@@ -159,14 +160,14 @@ func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
159 160 }
160 161 ips, err := lookup(ctx, host)
161 162 if err != nil {
162 return nil, fmt.Errorf("dns voor %s: %w", host, err)
163 return nil, i18n.E("err.whDNS", host, err.Error())
163 164 }
164 165 if len(ips) == 0 {
165 return nil, fmt.Errorf("geen adres voor %s", host)
166 return nil, i18n.E("err.whNoAddr", host)
166 167 }
167 168 for _, ip := range ips {
168 169 if Private(ip) {
169 return nil, fmt.Errorf("%s wijst naar %s in een geblokkeerd bereik", host, ip)
170 return nil, i18n.E("err.whBlockedHost", host, ip.String())
170 171 }
171 172 }
172 173 return ips[0], nil
@@ -175,20 +176,20 @@ func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
175 176 // ValidateURL keurt het schema, een userinfo en een letterlijk privéadres af.
176 177 func ValidateURL(u *url.URL) error {
177 178 if u == nil || u.Hostname() == "" || u.User != nil {
178 return fmt.Errorf("webhook-URL is ongeldig")
179 return i18n.E("err.whURL")
179 180 }
180 181 if u.Scheme != "http" && u.Scheme != "https" {
181 return fmt.Errorf("webhook-URL moet http of https zijn")
182 return i18n.E("err.whScheme")
182 183 }
183 184 if ip := net.ParseIP(u.Hostname()); ip != nil && Private(ip) {
184 return fmt.Errorf("%s ligt in een geblokkeerd bereik", ip)
185 return i18n.E("err.whBlockedIP", ip.String())
185 186 }
186 187 return nil
187 188 }
188 189
189 190 func checkRedirect(req *http.Request, via []*http.Request) error {
190 191 if len(via) >= MaxRedirects {
191 return fmt.Errorf("te veel redirects")
192 return i18n.E("err.whRedirects")
192 193 }
193 194 if err := ValidateURL(req.URL); err != nil {
194 195 return err
@@ -197,7 +198,7 @@ func checkRedirect(req *http.Request, via []*http.Request) error {
197 198 return nil
198 199 }
199 200 if req.Response != nil && (req.Response.StatusCode == http.StatusTemporaryRedirect || req.Response.StatusCode == http.StatusPermanentRedirect) {
200 return fmt.Errorf("redirect naar een andere host met de oorspronkelijke body is geweigerd")
201 return i18n.E("err.whRedirectHost")
201 202 }
202 203 for k := range req.Header {
203 204 if strings.EqualFold(k, "Content-Type") || strings.EqualFold(k, "User-Agent") {
@@ -7,12 +7,13 @@ package ssrf
7
7
8import (
8import (
9 "context"
9 "context"
10 "fmt"
11 "net"
10 "net"
12 "net/http"
11 "net/http"
13 "net/url"
12 "net/url"
14 "strings"
13 "strings"
15 "time"
14 "time"
15
16 "gitlab.com/Timfa/bluegit/internal/i18n"
16)
17)
17
18
18// MaxRedirects is het aantal hops dat een webhook nog volgt.
19// MaxRedirects is het aantal hops dat een webhook nog volgt.
@@ -146,11 +147,11 @@ func defaultLookup(ctx context.Context, host string) ([]net.IP, error) {
146func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
147func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
147 host = strings.TrimSuffix(strings.TrimSpace(host), ".")
148 host = strings.TrimSuffix(strings.TrimSpace(host), ".")
148 if host == "" {
149 if host == "" {
149 return nil, fmt.Errorf("webhook-host ontbreekt")
150 return nil, i18n.E("err.whHost")
150 }
151 }
151 if ip := net.ParseIP(host); ip != nil {
152 if ip := net.ParseIP(host); ip != nil {
152 if Private(ip) {
153 if Private(ip) {
153 return nil, fmt.Errorf("%s ligt in een geblokkeerd bereik", ip)
154 return nil, i18n.E("err.whBlockedIP", ip.String())
154 }
155 }
155 return ip, nil
156 return ip, nil
156 }
157 }
@@ -159,14 +160,14 @@ func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
159 }
160 }
160 ips, err := lookup(ctx, host)
161 ips, err := lookup(ctx, host)
161 if err != nil {
162 if err != nil {
162 return nil, fmt.Errorf("dns voor %s: %w", host, err)
163 return nil, i18n.E("err.whDNS", host, err.Error())
163 }
164 }
164 if len(ips) == 0 {
165 if len(ips) == 0 {
165 return nil, fmt.Errorf("geen adres voor %s", host)
166 return nil, i18n.E("err.whNoAddr", host)
166 }
167 }
167 for _, ip := range ips {
168 for _, ip := range ips {
168 if Private(ip) {
169 if Private(ip) {
169 return nil, fmt.Errorf("%s wijst naar %s in een geblokkeerd bereik", host, ip)
170 return nil, i18n.E("err.whBlockedHost", host, ip.String())
170 }
171 }
171 }
172 }
172 return ips[0], nil
173 return ips[0], nil
@@ -175,20 +176,20 @@ func Pin(ctx context.Context, host string, lookup Lookup) (net.IP, error) {
175// ValidateURL keurt het schema, een userinfo en een letterlijk privéadres af.
176// ValidateURL keurt het schema, een userinfo en een letterlijk privéadres af.
176func ValidateURL(u *url.URL) error {
177func ValidateURL(u *url.URL) error {
177 if u == nil || u.Hostname() == "" || u.User != nil {
178 if u == nil || u.Hostname() == "" || u.User != nil {
178 return fmt.Errorf("webhook-URL is ongeldig")
179 return i18n.E("err.whURL")
179 }
180 }
180 if u.Scheme != "http" && u.Scheme != "https" {
181 if u.Scheme != "http" && u.Scheme != "https" {
181 return fmt.Errorf("webhook-URL moet http of https zijn")
182 return i18n.E("err.whScheme")
182 }
183 }
183 if ip := net.ParseIP(u.Hostname()); ip != nil && Private(ip) {
184 if ip := net.ParseIP(u.Hostname()); ip != nil && Private(ip) {
184 return fmt.Errorf("%s ligt in een geblokkeerd bereik", ip)
185 return i18n.E("err.whBlockedIP", ip.String())
185 }
186 }
186 return nil
187 return nil
187}
188}
188
189
189func checkRedirect(req *http.Request, via []*http.Request) error {
190func checkRedirect(req *http.Request, via []*http.Request) error {
190 if len(via) >= MaxRedirects {
191 if len(via) >= MaxRedirects {
191 return fmt.Errorf("te veel redirects")
192 return i18n.E("err.whRedirects")
192 }
193 }
193 if err := ValidateURL(req.URL); err != nil {
194 if err := ValidateURL(req.URL); err != nil {
194 return err
195 return err
@@ -197,7 +198,7 @@ func checkRedirect(req *http.Request, via []*http.Request) error {
197 return nil
198 return nil
198 }
199 }
199 if req.Response != nil && (req.Response.StatusCode == http.StatusTemporaryRedirect || req.Response.StatusCode == http.StatusPermanentRedirect) {
200 if req.Response != nil && (req.Response.StatusCode == http.StatusTemporaryRedirect || req.Response.StatusCode == http.StatusPermanentRedirect) {
200 return fmt.Errorf("redirect naar een andere host met de oorspronkelijke body is geweigerd")
201 return i18n.E("err.whRedirectHost")
201 }
202 }
202 for k := range req.Header {
203 for k := range req.Header {
203 if strings.EqualFold(k, "Content-Type") || strings.EqualFold(k, "User-Agent") {
204 if strings.EqualFold(k, "Content-Type") || strings.EqualFold(k, "User-Agent") {
internal/state/state.go +11 −9
@@ -10,6 +10,8 @@ import (
10 10 "path/filepath"
11 11 "strings"
12 12 "syscall"
13
14 "gitlab.com/Timfa/bluegit/internal/i18n"
13 15 )
14 16
15 17 // DefaultDir is de state-map als state_path leeg is.
@@ -68,41 +70,41 @@ type Info struct {
68 70 func Inspect(path string) (Info, error) {
69 71 path = strings.TrimSpace(path)
70 72 if path == "" {
71 return Info{}, fmt.Errorf("pad ontbreekt")
73 return Info{}, i18n.E("err.pathMissing")
72 74 }
73 75 if strings.ContainsAny(path, "\r\n") {
74 return Info{}, fmt.Errorf("pad bevat een regeleinde")
76 return Info{}, i18n.E("err.pathNewline")
75 77 }
76 78 if !filepath.IsAbs(path) {
77 return Info{}, fmt.Errorf("pad moet absoluut zijn")
79 return Info{}, i18n.E("err.pathAbsolute")
78 80 }
79 81 path = filepath.Clean(path)
80 82 info := Info{Path: path}
81 83 st, err := os.Stat(path)
82 84 if err != nil {
83 85 if errors.Is(err, os.ErrNotExist) {
84 return info, fmt.Errorf("pad bestaat niet")
86 return info, i18n.E("err.pathAbsent")
85 87 }
86 return info, fmt.Errorf("pad niet te lezen: %w", err)
88 return info, i18n.E("err.pathRead", err.Error())
87 89 }
88 90 if !st.IsDir() {
89 return info, fmt.Errorf("pad is geen map")
91 return info, i18n.E("err.pathDir")
90 92 }
91 93 var fs syscall.Statfs_t
92 94 if err := syscall.Statfs(path, &fs); err != nil {
93 return info, fmt.Errorf("vrije ruimte niet te bepalen: %w", err)
95 return info, i18n.E("err.pathFree", err.Error())
94 96 }
95 97 info.Free = uint64(fs.Bavail) * uint64(fs.Bsize)
96 98 info.Total = uint64(fs.Blocks) * uint64(fs.Bsize)
97 99 probe := filepath.Join(path, ".bluegit-write-test")
98 100 f, err := os.OpenFile(probe, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o600)
99 101 if err != nil {
100 return info, fmt.Errorf("pad is niet beschrijfbaar")
102 return info, i18n.E("err.pathWrite")
101 103 }
102 104 _ = f.Close()
103 105 _ = os.Remove(probe)
104 106 if info.Free < MinFreeBytes {
105 return info, fmt.Errorf("te weinig vrije ruimte: %s vrij, minimaal %s", Format(info.Free), Format(MinFreeBytes))
107 return info, i18n.E("err.pathSpace", Format(info.Free), Format(MinFreeBytes))
106 108 }
107 109 return info, nil
108 110 }
@@ -10,6 +10,8 @@ import (
10 "path/filepath"
10 "path/filepath"
11 "strings"
11 "strings"
12 "syscall"
12 "syscall"
13
14 "gitlab.com/Timfa/bluegit/internal/i18n"
13)
15)
14
16
15// DefaultDir is de state-map als state_path leeg is.
17// DefaultDir is de state-map als state_path leeg is.
@@ -68,41 +70,41 @@ type Info struct {
68func Inspect(path string) (Info, error) {
70func Inspect(path string) (Info, error) {
69 path = strings.TrimSpace(path)
71 path = strings.TrimSpace(path)
70 if path == "" {
72 if path == "" {
71 return Info{}, fmt.Errorf("pad ontbreekt")
73 return Info{}, i18n.E("err.pathMissing")
72 }
74 }
73 if strings.ContainsAny(path, "\r\n") {
75 if strings.ContainsAny(path, "\r\n") {
74 return Info{}, fmt.Errorf("pad bevat een regeleinde")
76 return Info{}, i18n.E("err.pathNewline")
75 }
77 }
76 if !filepath.IsAbs(path) {
78 if !filepath.IsAbs(path) {
77 return Info{}, fmt.Errorf("pad moet absoluut zijn")
79 return Info{}, i18n.E("err.pathAbsolute")
78 }
80 }
79 path = filepath.Clean(path)
81 path = filepath.Clean(path)
80 info := Info{Path: path}
82 info := Info{Path: path}
81 st, err := os.Stat(path)
83 st, err := os.Stat(path)
82 if err != nil {
84 if err != nil {
83 if errors.Is(err, os.ErrNotExist) {
85 if errors.Is(err, os.ErrNotExist) {
84 return info, fmt.Errorf("pad bestaat niet")
86 return info, i18n.E("err.pathAbsent")
85 }
87 }
86 return info, fmt.Errorf("pad niet te lezen: %w", err)
88 return info, i18n.E("err.pathRead", err.Error())
87 }
89 }
88 if !st.IsDir() {
90 if !st.IsDir() {
89 return info, fmt.Errorf("pad is geen map")
91 return info, i18n.E("err.pathDir")
90 }
92 }
91 var fs syscall.Statfs_t
93 var fs syscall.Statfs_t
92 if err := syscall.Statfs(path, &fs); err != nil {
94 if err := syscall.Statfs(path, &fs); err != nil {
93 return info, fmt.Errorf("vrije ruimte niet te bepalen: %w", err)
95 return info, i18n.E("err.pathFree", err.Error())
94 }
96 }
95 info.Free = uint64(fs.Bavail) * uint64(fs.Bsize)
97 info.Free = uint64(fs.Bavail) * uint64(fs.Bsize)
96 info.Total = uint64(fs.Blocks) * uint64(fs.Bsize)
98 info.Total = uint64(fs.Blocks) * uint64(fs.Bsize)
97 probe := filepath.Join(path, ".bluegit-write-test")
99 probe := filepath.Join(path, ".bluegit-write-test")
98 f, err := os.OpenFile(probe, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o600)
100 f, err := os.OpenFile(probe, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o600)
99 if err != nil {
101 if err != nil {
100 return info, fmt.Errorf("pad is niet beschrijfbaar")
102 return info, i18n.E("err.pathWrite")
101 }
103 }
102 _ = f.Close()
104 _ = f.Close()
103 _ = os.Remove(probe)
105 _ = os.Remove(probe)
104 if info.Free < MinFreeBytes {
106 if info.Free < MinFreeBytes {
105 return info, fmt.Errorf("te weinig vrije ruimte: %s vrij, minimaal %s", Format(info.Free), Format(MinFreeBytes))
107 return info, i18n.E("err.pathSpace", Format(info.Free), Format(MinFreeBytes))
106 }
108 }
107 return info, nil
109 return info, nil
108}
110}
internal/state/state_test.go +2 −2
@@ -26,14 +26,14 @@ func TestInspect(t *testing.T) {
26 26 if _, err := Inspect("relatief/pad"); err == nil {
27 27 t.Fatal("relatief pad hoort geweigerd")
28 28 }
29 if _, err := Inspect("/dit/pad/bestaat/niet/bluegit"); err == nil || !strings.Contains(err.Error(), "bestaat niet") {
29 if _, err := Inspect("/dit/pad/bestaat/niet/bluegit"); err == nil || !strings.Contains(err.Error(), "does not exist") {
30 30 t.Fatalf("ontbrekend pad: %v", err)
31 31 }
32 32 file := filepath.Join(t.TempDir(), "bestand")
33 33 if err := os.WriteFile(file, []byte("x"), 0o644); err != nil {
34 34 t.Fatal(err)
35 35 }
36 if _, err := Inspect(file); err == nil || !strings.Contains(err.Error(), "geen map") {
36 if _, err := Inspect(file); err == nil || !strings.Contains(err.Error(), "not a directory") {
37 37 t.Fatalf("bestand: %v", err)
38 38 }
39 39 dir := t.TempDir()
@@ -26,14 +26,14 @@ func TestInspect(t *testing.T) {
26 if _, err := Inspect("relatief/pad"); err == nil {
26 if _, err := Inspect("relatief/pad"); err == nil {
27 t.Fatal("relatief pad hoort geweigerd")
27 t.Fatal("relatief pad hoort geweigerd")
28 }
28 }
29 if _, err := Inspect("/dit/pad/bestaat/niet/bluegit"); err == nil || !strings.Contains(err.Error(), "bestaat niet") {
29 if _, err := Inspect("/dit/pad/bestaat/niet/bluegit"); err == nil || !strings.Contains(err.Error(), "does not exist") {
30 t.Fatalf("ontbrekend pad: %v", err)
30 t.Fatalf("ontbrekend pad: %v", err)
31 }
31 }
32 file := filepath.Join(t.TempDir(), "bestand")
32 file := filepath.Join(t.TempDir(), "bestand")
33 if err := os.WriteFile(file, []byte("x"), 0o644); err != nil {
33 if err := os.WriteFile(file, []byte("x"), 0o644); err != nil {
34 t.Fatal(err)
34 t.Fatal(err)
35 }
35 }
36 if _, err := Inspect(file); err == nil || !strings.Contains(err.Error(), "geen map") {
36 if _, err := Inspect(file); err == nil || !strings.Contains(err.Error(), "not a directory") {
37 t.Fatalf("bestand: %v", err)
37 t.Fatalf("bestand: %v", err)
38 }
38 }
39 dir := t.TempDir()
39 dir := t.TempDir()
internal/store/flow.go +3 −3
@@ -5,9 +5,9 @@ import (
5 5 "database/sql"
6 6 "encoding/json"
7 7 "errors"
8 "fmt"
9 8 "time"
10 9
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 11 "gitlab.com/Timfa/bluegit/internal/names"
12 12 )
13 13
@@ -145,7 +145,7 @@ type MergeRequest struct {
145 145 func (s *Store) CreateMergeRequest(ctx context.Context, repoID, authorID int64, title, description, source, target string) (MergeRequest, error) {
146 146 title = trim(title, 200)
147 147 if title == "" {
148 return MergeRequest{}, fmt.Errorf("een merge request heeft een titel nodig")
148 return MergeRequest{}, i18n.E("err.mrTitle")
149 149 }
150 150 tx, err := s.db.BeginTx(ctx, nil)
151 151 if err != nil {
@@ -594,7 +594,7 @@ func (s *Store) CreateRelease(ctx context.Context, repoID int64, tag, sha, name,
594 594 repoID, tag, sha, name, body, author, job, now())
595 595 if err != nil {
596 596 if containsUnique(err) {
597 return 0, fmt.Errorf("tag %s bestaat al", tag)
597 return 0, i18n.E("err.tagExists", tag)
598 598 }
599 599 return 0, err
600 600 }
@@ -5,9 +5,9 @@ import (
5 "database/sql"
5 "database/sql"
6 "encoding/json"
6 "encoding/json"
7 "errors"
7 "errors"
8 "fmt"
9 "time"
8 "time"
10
9
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/names"
12)
12)
13
13
@@ -145,7 +145,7 @@ type MergeRequest struct {
145func (s *Store) CreateMergeRequest(ctx context.Context, repoID, authorID int64, title, description, source, target string) (MergeRequest, error) {
145func (s *Store) CreateMergeRequest(ctx context.Context, repoID, authorID int64, title, description, source, target string) (MergeRequest, error) {
146 title = trim(title, 200)
146 title = trim(title, 200)
147 if title == "" {
147 if title == "" {
148 return MergeRequest{}, fmt.Errorf("een merge request heeft een titel nodig")
148 return MergeRequest{}, i18n.E("err.mrTitle")
149 }
149 }
150 tx, err := s.db.BeginTx(ctx, nil)
150 tx, err := s.db.BeginTx(ctx, nil)
151 if err != nil {
151 if err != nil {
@@ -594,7 +594,7 @@ func (s *Store) CreateRelease(ctx context.Context, repoID int64, tag, sha, name,
594 repoID, tag, sha, name, body, author, job, now())
594 repoID, tag, sha, name, body, author, job, now())
595 if err != nil {
595 if err != nil {
596 if containsUnique(err) {
596 if containsUnique(err) {
597 return 0, fmt.Errorf("tag %s bestaat al", tag)
597 return 0, i18n.E("err.tagExists", tag)
598 }
598 }
599 return 0, err
599 return 0, err
600 }
600 }
internal/store/notes.go +3 −2
@@ -2,8 +2,9 @@ package store
2 2
3 3 import (
4 4 "context"
5 "fmt"
6 5 "strconv"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
7 8 "strings"
8 9 "time"
9 10 )
@@ -23,7 +24,7 @@ type Note struct {
23 24 func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
24 25 body = strings.TrimSpace(body)
25 26 if body == "" {
26 return Note{}, fmt.Errorf("een reactie is leeg")
27 return Note{}, i18n.E("err.noteEmpty")
27 28 }
28 29 body = trim(body, 4000)
29 30 tx, err := s.db.BeginTx(ctx, nil)
@@ -2,8 +2,9 @@ package store
2
2
3import (
3import (
4 "context"
4 "context"
5 "fmt"
6 "strconv"
5 "strconv"
6
7 "gitlab.com/Timfa/bluegit/internal/i18n"
7 "strings"
8 "strings"
8 "time"
9 "time"
9)
10)
@@ -23,7 +24,7 @@ type Note struct {
23func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
24func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
24 body = strings.TrimSpace(body)
25 body = strings.TrimSpace(body)
25 if body == "" {
26 if body == "" {
26 return Note{}, fmt.Errorf("een reactie is leeg")
27 return Note{}, i18n.E("err.noteEmpty")
27 }
28 }
28 body = trim(body, 4000)
29 body = trim(body, 4000)
29 tx, err := s.db.BeginTx(ctx, nil)
30 tx, err := s.db.BeginTx(ctx, nil)
internal/store/repos.go +52 −26
@@ -4,11 +4,11 @@ import (
4 4 "context"
5 5 "database/sql"
6 6 "errors"
7 "fmt"
8 7 "strings"
9 8 "time"
10 9
11 10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 12 "gitlab.com/Timfa/bluegit/internal/names"
13 13 )
14 14
@@ -18,10 +18,16 @@ type Group struct {
18 18 Name string
19 19 Path string
20 20 Description string
21 Visibility string
22 DefaultRole access.Role
23 LogoMIME string
21 24 CreatedBy int64
22 25 CreatedAt time.Time
23 26 }
24 27
28 // HasLogo meldt of er een geüpload logo is.
29 func (g Group) HasLogo() bool { return g.LogoMIME != "" }
30
25 31 // Repo is een git-repository van een gebruiker of een groep.
26 32 type Repo struct {
27 33 ID int64
@@ -32,18 +38,29 @@ type Repo struct {
32 38 Description string
33 39 DefaultBranch string
34 40 Visibility string
41 LogoMIME string
35 42 CreatedAt time.Time
36 43 }
37 44
45 // HasLogo meldt of er een geüpload logo is.
46 func (r Repo) HasLogo() bool { return r.LogoMIME != "" }
47
38 48 // FullPath is owner/naam.
39 49 func (r Repo) FullPath() string { return r.OwnerPath + "/" + r.Name }
40 50
41 51 // CreateGroup maakt een groep. De maker wordt beheerder.
42 func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, description string) (Group, error) {
52 // defaultRole is de rol die leden krijgen op een repository die daarna ontstaat.
53 func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, description string, defaultRole access.Role) (Group, error) {
43 54 name = strings.TrimSpace(name)
44 55 path = strings.ToLower(strings.TrimSpace(path))
45 56 if name == "" {
46 return Group{}, fmt.Errorf("de groep heeft een naam nodig")
57 return Group{}, i18n.E("err.groupNeedsName")
58 }
59 if defaultRole == "" {
60 defaultRole = access.RoleDeveloper
61 }
62 if _, err := access.ParseRole(string(defaultRole)); err != nil {
63 return Group{}, err
47 64 }
48 65 if err := names.ValidGroupPath(path); err != nil {
49 66 return Group{}, err
@@ -51,8 +68,8 @@ func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, desc
51 68 if err := s.ensurePathFree(ctx, path); err != nil {
52 69 return Group{}, err
53 70 }
54 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, created_by, created_at) VALUES (?, ?, ?, ?, ?)`,
55 name, path, strings.TrimSpace(description), creator, now())
71 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, visibility, default_role, created_by, created_at) VALUES (?, ?, ?, 'private', ?, ?, ?)`,
72 name, path, strings.TrimSpace(description), string(defaultRole), creator, now())
56 73 if err != nil {
57 74 return Group{}, err
58 75 }
@@ -69,38 +86,41 @@ func (s *Store) ensurePathFree(ctx context.Context, path string) error {
69 86 return err
70 87 }
71 88 if n > 0 {
72 return fmt.Errorf("pad %s is al een gebruiker", path)
89 return i18n.E("err.pathUser", path)
73 90 }
74 91 if err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM groups WHERE path = ?`, path).Scan(&n); err != nil {
75 92 return err
76 93 }
77 94 if n > 0 {
78 return fmt.Errorf("pad %s is al een groep", path)
95 return i18n.E("err.pathGroup", path)
79 96 }
80 97 return nil
81 98 }
82 99
83 100 // GroupByPath leest een groep.
84 101 func (s *Store) GroupByPath(ctx context.Context, path string) (Group, error) {
85 row := s.db.QueryRowContext(ctx, `SELECT id, name, path, description, created_by, created_at FROM groups WHERE path = ?`, path)
102 row := s.db.QueryRowContext(ctx, `SELECT `+groupCols+` FROM groups WHERE path = ?`, path)
86 103 return scanGroup(row)
87 104 }
88 105
89 106 // GroupByID leest een groep.
90 107 func (s *Store) GroupByID(ctx context.Context, id int64) (Group, error) {
91 row := s.db.QueryRowContext(ctx, `SELECT id, name, path, description, created_by, created_at FROM groups WHERE id = ?`, id)
108 row := s.db.QueryRowContext(ctx, `SELECT `+groupCols+` FROM groups WHERE id = ?`, id)
92 109 return scanGroup(row)
93 110 }
94 111
112 const groupCols = `id, name, path, description, created_by, created_at, visibility, default_role, logo_mime`
113
95 114 func scanGroup(row *sql.Row) (Group, error) {
96 115 var g Group
97 var created string
98 if err := row.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created); err != nil {
116 var created, role string
117 if err := row.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created, &g.Visibility, &role, &g.LogoMIME); err != nil {
99 118 if errors.Is(err, sql.ErrNoRows) {
100 119 return Group{}, errNotFound
101 120 }
102 121 return Group{}, err
103 122 }
123 g.DefaultRole = access.Role(role)
104 124 g.CreatedAt = parseTime(created)
105 125 return g, nil
106 126 }
@@ -124,7 +144,7 @@ func (s *Store) GroupRole(ctx context.Context, groupID, userID int64) (access.Ro
124 144
125 145 // ListGroups geeft de groepen waarvan deze gebruiker lid is.
126 146 func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
127 q := `SELECT id, name, path, description, created_by, created_at FROM groups WHERE id IN (SELECT group_id FROM group_members WHERE user_id = ?) ORDER BY path`
147 q := `SELECT ` + groupCols + ` FROM groups WHERE id IN (SELECT group_id FROM group_members WHERE user_id = ?) ORDER BY path`
128 148 args := []any{userID}
129 149 rows, err := s.db.QueryContext(ctx, q, args...)
130 150 if err != nil {
@@ -134,10 +154,11 @@ func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
134 154 var out []Group
135 155 for rows.Next() {
136 156 var g Group
137 var created string
138 if err := rows.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created); err != nil {
157 var created, role string
158 if err := rows.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created, &g.Visibility, &role, &g.LogoMIME); err != nil {
139 159 return nil, err
140 160 }
161 g.DefaultRole = access.Role(role)
141 162 g.CreatedAt = parseTime(created)
142 163 out = append(out, g)
143 164 }
@@ -147,13 +168,13 @@ func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
147 168 // CreateRepo maakt de metadata. De schijfmap maakt de aanroeper.
148 169 func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64, name, description, defaultBranch, visibility string) (Repo, error) {
149 170 if ownerKind != "user" && ownerKind != "group" {
150 return Repo{}, fmt.Errorf("eigenaar moet user of group zijn")
171 return Repo{}, i18n.E("err.ownerKind")
151 172 }
152 173 if err := names.ValidRepoName(name); err != nil {
153 174 return Repo{}, err
154 175 }
155 176 if visibility != "public" && visibility != "private" {
156 return Repo{}, fmt.Errorf("zichtbaarheid moet public of private zijn")
177 return Repo{}, i18n.E("err.visibility")
157 178 }
158 179 if defaultBranch == "" {
159 180 defaultBranch = "master"
@@ -168,14 +189,14 @@ func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64,
168 189 return Repo{}, err
169 190 }
170 191 if n > 0 {
171 return Repo{}, fmt.Errorf("er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar", u.Username)
192 return Repo{}, i18n.E("err.userGroupClash", u.Username)
172 193 }
173 194 }
174 195 res, err := s.db.ExecContext(ctx, `INSERT INTO repos (owner_kind, owner_id, name, description, default_branch, visibility, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)`,
175 196 ownerKind, ownerID, name, strings.TrimSpace(description), defaultBranch, visibility, now())
176 197 if err != nil {
177 198 if strings.Contains(err.Error(), "UNIQUE") {
178 return Repo{}, fmt.Errorf("er is al een repository %s", name)
199 return Repo{}, i18n.E("err.repoExists", name)
179 200 }
180 201 return Repo{}, err
181 202 }
@@ -183,6 +204,11 @@ func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64,
183 204 if err := s.AddProtected(ctx, id, defaultBranch); err != nil {
184 205 return Repo{}, err
185 206 }
207 if ownerKind == "group" {
208 if err := s.GrantDefaultRoles(ctx, ownerID, id); err != nil {
209 return Repo{}, err
210 }
211 }
186 212 return s.RepoByID(ctx, id)
187 213 }
188 214
@@ -205,14 +231,14 @@ func (s *Store) RepoByPath(ctx context.Context, owner, name string) (Repo, error
205 231 const repoSelect = `
206 232 SELECT r.id, r.owner_kind, r.owner_id,
207 233 CASE r.owner_kind WHEN 'user' THEN (SELECT username FROM users WHERE id = r.owner_id) ELSE (SELECT path FROM groups WHERE id = r.owner_id) END,
208 r.name, r.description, r.default_branch, r.visibility, r.created_at
234 r.name, r.description, r.default_branch, r.visibility, r.created_at, r.logo_mime
209 235 FROM repos r`
210 236
211 237 func scanRepo(row *sql.Row) (Repo, error) {
212 238 var r Repo
213 239 var created string
214 240 var owner sql.NullString
215 if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created); err != nil {
241 if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {
216 242 if errors.Is(err, sql.ErrNoRows) {
217 243 return Repo{}, errNotFound
218 244 }
@@ -226,7 +252,7 @@ func scanRepo(row *sql.Row) (Repo, error) {
226 252 // UpdateRepo wijzigt beschrijving en zichtbaarheid.
227 253 func (s *Store) UpdateRepo(ctx context.Context, id int64, description, visibility string) error {
228 254 if visibility != "public" && visibility != "private" {
229 return fmt.Errorf("zichtbaarheid moet public of private zijn")
255 return i18n.E("err.visibility")
230 256 }
231 257 _, err := s.db.ExecContext(ctx, `UPDATE repos SET description = ?, visibility = ? WHERE id = ?`, strings.TrimSpace(description), visibility, id)
232 258 return err
@@ -298,7 +324,7 @@ func scanRepos(rows *sql.Rows) ([]Repo, error) {
298 324 var r Repo
299 325 var created string
300 326 var owner sql.NullString
301 if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created); err != nil {
327 if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {
302 328 return nil, err
303 329 }
304 330 r.OwnerPath = owner.String
@@ -366,7 +392,7 @@ type Member struct {
366 392 // SetMember zet een lidmaatschap. Een onbekende naam blijft wachten tot de eerste login.
367 393 func (s *Store) SetMember(ctx context.Context, scopeKind string, scopeID int64, username string, role access.Role) error {
368 394 if scopeKind != "repo" && scopeKind != "group" {
369 return fmt.Errorf("scope moet repo of group zijn")
395 return i18n.E("err.scope")
370 396 }
371 397 if _, err := access.ParseRole(string(role)); err != nil {
372 398 return err
@@ -481,7 +507,7 @@ func (s *Store) ProtectedPatterns(ctx context.Context, repoID int64) ([]string,
481 507 func (s *Store) AddProtected(ctx context.Context, repoID int64, pattern string) error {
482 508 pattern = strings.TrimSpace(pattern)
483 509 if pattern == "" || strings.Contains(pattern, " ") || strings.Contains(pattern, "..") {
484 return fmt.Errorf("patroon %q is niet bruikbaar", pattern)
510 return i18n.E("err.pattern", pattern)
485 511 }
486 512 _, err := s.db.ExecContext(ctx, `INSERT INTO protected_branches (repo_id, pattern) VALUES (?, ?)`, repoID, pattern)
487 513 if err != nil && strings.Contains(err.Error(), "UNIQUE") {
@@ -506,13 +532,13 @@ type SecretMeta struct {
506 532 // PutSecret bewaart een versleutelde waarde. De naam is een omgevingsvariabele.
507 533 func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {
508 534 if scopeKind != "repo" && scopeKind != "group" {
509 return fmt.Errorf("scope moet repo of group zijn")
535 return i18n.E("err.scope")
510 536 }
511 537 if err := access.ValidSecretName(name); err != nil {
512 538 return err
513 539 }
514 540 if strings.TrimSpace(value) == "" {
515 return fmt.Errorf("de waarde is leeg")
541 return i18n.E("err.emptyValue")
516 542 }
517 543 nonce, ct, err := s.encrypt(value)
518 544 if err != nil {
@@ -4,11 +4,11 @@ import (
4 "context"
4 "context"
5 "database/sql"
5 "database/sql"
6 "errors"
6 "errors"
7 "fmt"
8 "strings"
7 "strings"
9 "time"
8 "time"
10
9
11 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/names"
12 "gitlab.com/Timfa/bluegit/internal/names"
13)
13)
14
14
@@ -18,10 +18,16 @@ type Group struct {
18 Name string
18 Name string
19 Path string
19 Path string
20 Description string
20 Description string
21 Visibility string
22 DefaultRole access.Role
23 LogoMIME string
21 CreatedBy int64
24 CreatedBy int64
22 CreatedAt time.Time
25 CreatedAt time.Time
23}
26}
24
27
28// HasLogo meldt of er een geüpload logo is.
29func (g Group) HasLogo() bool { return g.LogoMIME != "" }
30
25// Repo is een git-repository van een gebruiker of een groep.
31// Repo is een git-repository van een gebruiker of een groep.
26type Repo struct {
32type Repo struct {
27 ID int64
33 ID int64
@@ -32,18 +38,29 @@ type Repo struct {
32 Description string
38 Description string
33 DefaultBranch string
39 DefaultBranch string
34 Visibility string
40 Visibility string
41 LogoMIME string
35 CreatedAt time.Time
42 CreatedAt time.Time
36}
43}
37
44
45// HasLogo meldt of er een geüpload logo is.
46func (r Repo) HasLogo() bool { return r.LogoMIME != "" }
47
38// FullPath is owner/naam.
48// FullPath is owner/naam.
39func (r Repo) FullPath() string { return r.OwnerPath + "/" + r.Name }
49func (r Repo) FullPath() string { return r.OwnerPath + "/" + r.Name }
40
50
41// CreateGroup maakt een groep. De maker wordt beheerder.
51// CreateGroup maakt een groep. De maker wordt beheerder.
42func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, description string) (Group, error) {
52// defaultRole is de rol die leden krijgen op een repository die daarna ontstaat.
53func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, description string, defaultRole access.Role) (Group, error) {
43 name = strings.TrimSpace(name)
54 name = strings.TrimSpace(name)
44 path = strings.ToLower(strings.TrimSpace(path))
55 path = strings.ToLower(strings.TrimSpace(path))
45 if name == "" {
56 if name == "" {
46 return Group{}, fmt.Errorf("de groep heeft een naam nodig")
57 return Group{}, i18n.E("err.groupNeedsName")
58 }
59 if defaultRole == "" {
60 defaultRole = access.RoleDeveloper
61 }
62 if _, err := access.ParseRole(string(defaultRole)); err != nil {
63 return Group{}, err
47 }
64 }
48 if err := names.ValidGroupPath(path); err != nil {
65 if err := names.ValidGroupPath(path); err != nil {
49 return Group{}, err
66 return Group{}, err
@@ -51,8 +68,8 @@ func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, desc
51 if err := s.ensurePathFree(ctx, path); err != nil {
68 if err := s.ensurePathFree(ctx, path); err != nil {
52 return Group{}, err
69 return Group{}, err
53 }
70 }
54 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, created_by, created_at) VALUES (?, ?, ?, ?, ?)`,
71 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, visibility, default_role, created_by, created_at) VALUES (?, ?, ?, 'private', ?, ?, ?)`,
55 name, path, strings.TrimSpace(description), creator, now())
72 name, path, strings.TrimSpace(description), string(defaultRole), creator, now())
56 if err != nil {
73 if err != nil {
57 return Group{}, err
74 return Group{}, err
58 }
75 }
@@ -69,38 +86,41 @@ func (s *Store) ensurePathFree(ctx context.Context, path string) error {
69 return err
86 return err
70 }
87 }
71 if n > 0 {
88 if n > 0 {
72 return fmt.Errorf("pad %s is al een gebruiker", path)
89 return i18n.E("err.pathUser", path)
73 }
90 }
74 if err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM groups WHERE path = ?`, path).Scan(&n); err != nil {
91 if err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM groups WHERE path = ?`, path).Scan(&n); err != nil {
75 return err
92 return err
76 }
93 }
77 if n > 0 {
94 if n > 0 {
78 return fmt.Errorf("pad %s is al een groep", path)
95 return i18n.E("err.pathGroup", path)
79 }
96 }
80 return nil
97 return nil
81}
98}
82
99
83// GroupByPath leest een groep.
100// GroupByPath leest een groep.
84func (s *Store) GroupByPath(ctx context.Context, path string) (Group, error) {
101func (s *Store) GroupByPath(ctx context.Context, path string) (Group, error) {
85 row := s.db.QueryRowContext(ctx, `SELECT id, name, path, description, created_by, created_at FROM groups WHERE path = ?`, path)
102 row := s.db.QueryRowContext(ctx, `SELECT `+groupCols+` FROM groups WHERE path = ?`, path)
86 return scanGroup(row)
103 return scanGroup(row)
87}
104}
88
105
89// GroupByID leest een groep.
106// GroupByID leest een groep.
90func (s *Store) GroupByID(ctx context.Context, id int64) (Group, error) {
107func (s *Store) GroupByID(ctx context.Context, id int64) (Group, error) {
91 row := s.db.QueryRowContext(ctx, `SELECT id, name, path, description, created_by, created_at FROM groups WHERE id = ?`, id)
108 row := s.db.QueryRowContext(ctx, `SELECT `+groupCols+` FROM groups WHERE id = ?`, id)
92 return scanGroup(row)
109 return scanGroup(row)
93}
110}
94
111
112const groupCols = `id, name, path, description, created_by, created_at, visibility, default_role, logo_mime`
113
95func scanGroup(row *sql.Row) (Group, error) {
114func scanGroup(row *sql.Row) (Group, error) {
96 var g Group
115 var g Group
97 var created string
116 var created, role string
98 if err := row.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created); err != nil {
117 if err := row.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created, &g.Visibility, &role, &g.LogoMIME); err != nil {
99 if errors.Is(err, sql.ErrNoRows) {
118 if errors.Is(err, sql.ErrNoRows) {
100 return Group{}, errNotFound
119 return Group{}, errNotFound
101 }
120 }
102 return Group{}, err
121 return Group{}, err
103 }
122 }
123 g.DefaultRole = access.Role(role)
104 g.CreatedAt = parseTime(created)
124 g.CreatedAt = parseTime(created)
105 return g, nil
125 return g, nil
106}
126}
@@ -124,7 +144,7 @@ func (s *Store) GroupRole(ctx context.Context, groupID, userID int64) (access.Ro
124
144
125// ListGroups geeft de groepen waarvan deze gebruiker lid is.
145// ListGroups geeft de groepen waarvan deze gebruiker lid is.
126func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
146func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
127 q := `SELECT id, name, path, description, created_by, created_at FROM groups WHERE id IN (SELECT group_id FROM group_members WHERE user_id = ?) ORDER BY path`
147 q := `SELECT ` + groupCols + ` FROM groups WHERE id IN (SELECT group_id FROM group_members WHERE user_id = ?) ORDER BY path`
128 args := []any{userID}
148 args := []any{userID}
129 rows, err := s.db.QueryContext(ctx, q, args...)
149 rows, err := s.db.QueryContext(ctx, q, args...)
130 if err != nil {
150 if err != nil {
@@ -134,10 +154,11 @@ func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
134 var out []Group
154 var out []Group
135 for rows.Next() {
155 for rows.Next() {
136 var g Group
156 var g Group
137 var created string
157 var created, role string
138 if err := rows.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created); err != nil {
158 if err := rows.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created, &g.Visibility, &role, &g.LogoMIME); err != nil {
139 return nil, err
159 return nil, err
140 }
160 }
161 g.DefaultRole = access.Role(role)
141 g.CreatedAt = parseTime(created)
162 g.CreatedAt = parseTime(created)
142 out = append(out, g)
163 out = append(out, g)
143 }
164 }
@@ -147,13 +168,13 @@ func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
147// CreateRepo maakt de metadata. De schijfmap maakt de aanroeper.
168// CreateRepo maakt de metadata. De schijfmap maakt de aanroeper.
148func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64, name, description, defaultBranch, visibility string) (Repo, error) {
169func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64, name, description, defaultBranch, visibility string) (Repo, error) {
149 if ownerKind != "user" && ownerKind != "group" {
170 if ownerKind != "user" && ownerKind != "group" {
150 return Repo{}, fmt.Errorf("eigenaar moet user of group zijn")
171 return Repo{}, i18n.E("err.ownerKind")
151 }
172 }
152 if err := names.ValidRepoName(name); err != nil {
173 if err := names.ValidRepoName(name); err != nil {
153 return Repo{}, err
174 return Repo{}, err
154 }
175 }
155 if visibility != "public" && visibility != "private" {
176 if visibility != "public" && visibility != "private" {
156 return Repo{}, fmt.Errorf("zichtbaarheid moet public of private zijn")
177 return Repo{}, i18n.E("err.visibility")
157 }
178 }
158 if defaultBranch == "" {
179 if defaultBranch == "" {
159 defaultBranch = "master"
180 defaultBranch = "master"
@@ -168,14 +189,14 @@ func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64,
168 return Repo{}, err
189 return Repo{}, err
169 }
190 }
170 if n > 0 {
191 if n > 0 {
171 return Repo{}, fmt.Errorf("er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar", u.Username)
192 return Repo{}, i18n.E("err.userGroupClash", u.Username)
172 }
193 }
173 }
194 }
174 res, err := s.db.ExecContext(ctx, `INSERT INTO repos (owner_kind, owner_id, name, description, default_branch, visibility, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)`,
195 res, err := s.db.ExecContext(ctx, `INSERT INTO repos (owner_kind, owner_id, name, description, default_branch, visibility, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)`,
175 ownerKind, ownerID, name, strings.TrimSpace(description), defaultBranch, visibility, now())
196 ownerKind, ownerID, name, strings.TrimSpace(description), defaultBranch, visibility, now())
176 if err != nil {
197 if err != nil {
177 if strings.Contains(err.Error(), "UNIQUE") {
198 if strings.Contains(err.Error(), "UNIQUE") {
178 return Repo{}, fmt.Errorf("er is al een repository %s", name)
199 return Repo{}, i18n.E("err.repoExists", name)
179 }
200 }
180 return Repo{}, err
201 return Repo{}, err
181 }
202 }
@@ -183,6 +204,11 @@ func (s *Store) CreateRepo(ctx context.Context, ownerKind string, ownerID int64,
183 if err := s.AddProtected(ctx, id, defaultBranch); err != nil {
204 if err := s.AddProtected(ctx, id, defaultBranch); err != nil {
184 return Repo{}, err
205 return Repo{}, err
185 }
206 }
207 if ownerKind == "group" {
208 if err := s.GrantDefaultRoles(ctx, ownerID, id); err != nil {
209 return Repo{}, err
210 }
211 }
186 return s.RepoByID(ctx, id)
212 return s.RepoByID(ctx, id)
187}
213}
188
214
@@ -205,14 +231,14 @@ func (s *Store) RepoByPath(ctx context.Context, owner, name string) (Repo, error
205const repoSelect = `
231const repoSelect = `
206SELECT r.id, r.owner_kind, r.owner_id,
232SELECT r.id, r.owner_kind, r.owner_id,
207 CASE r.owner_kind WHEN 'user' THEN (SELECT username FROM users WHERE id = r.owner_id) ELSE (SELECT path FROM groups WHERE id = r.owner_id) END,
233 CASE r.owner_kind WHEN 'user' THEN (SELECT username FROM users WHERE id = r.owner_id) ELSE (SELECT path FROM groups WHERE id = r.owner_id) END,
208 r.name, r.description, r.default_branch, r.visibility, r.created_at
234 r.name, r.description, r.default_branch, r.visibility, r.created_at, r.logo_mime
209FROM repos r`
235FROM repos r`
210
236
211func scanRepo(row *sql.Row) (Repo, error) {
237func scanRepo(row *sql.Row) (Repo, error) {
212 var r Repo
238 var r Repo
213 var created string
239 var created string
214 var owner sql.NullString
240 var owner sql.NullString
215 if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created); err != nil {
241 if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {
216 if errors.Is(err, sql.ErrNoRows) {
242 if errors.Is(err, sql.ErrNoRows) {
217 return Repo{}, errNotFound
243 return Repo{}, errNotFound
218 }
244 }
@@ -226,7 +252,7 @@ func scanRepo(row *sql.Row) (Repo, error) {
226// UpdateRepo wijzigt beschrijving en zichtbaarheid.
252// UpdateRepo wijzigt beschrijving en zichtbaarheid.
227func (s *Store) UpdateRepo(ctx context.Context, id int64, description, visibility string) error {
253func (s *Store) UpdateRepo(ctx context.Context, id int64, description, visibility string) error {
228 if visibility != "public" && visibility != "private" {
254 if visibility != "public" && visibility != "private" {
229 return fmt.Errorf("zichtbaarheid moet public of private zijn")
255 return i18n.E("err.visibility")
230 }
256 }
231 _, err := s.db.ExecContext(ctx, `UPDATE repos SET description = ?, visibility = ? WHERE id = ?`, strings.TrimSpace(description), visibility, id)
257 _, err := s.db.ExecContext(ctx, `UPDATE repos SET description = ?, visibility = ? WHERE id = ?`, strings.TrimSpace(description), visibility, id)
232 return err
258 return err
@@ -298,7 +324,7 @@ func scanRepos(rows *sql.Rows) ([]Repo, error) {
298 var r Repo
324 var r Repo
299 var created string
325 var created string
300 var owner sql.NullString
326 var owner sql.NullString
301 if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created); err != nil {
327 if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {
302 return nil, err
328 return nil, err
303 }
329 }
304 r.OwnerPath = owner.String
330 r.OwnerPath = owner.String
@@ -366,7 +392,7 @@ type Member struct {
366// SetMember zet een lidmaatschap. Een onbekende naam blijft wachten tot de eerste login.
392// SetMember zet een lidmaatschap. Een onbekende naam blijft wachten tot de eerste login.
367func (s *Store) SetMember(ctx context.Context, scopeKind string, scopeID int64, username string, role access.Role) error {
393func (s *Store) SetMember(ctx context.Context, scopeKind string, scopeID int64, username string, role access.Role) error {
368 if scopeKind != "repo" && scopeKind != "group" {
394 if scopeKind != "repo" && scopeKind != "group" {
369 return fmt.Errorf("scope moet repo of group zijn")
395 return i18n.E("err.scope")
370 }
396 }
371 if _, err := access.ParseRole(string(role)); err != nil {
397 if _, err := access.ParseRole(string(role)); err != nil {
372 return err
398 return err
@@ -481,7 +507,7 @@ func (s *Store) ProtectedPatterns(ctx context.Context, repoID int64) ([]string,
481func (s *Store) AddProtected(ctx context.Context, repoID int64, pattern string) error {
507func (s *Store) AddProtected(ctx context.Context, repoID int64, pattern string) error {
482 pattern = strings.TrimSpace(pattern)
508 pattern = strings.TrimSpace(pattern)
483 if pattern == "" || strings.Contains(pattern, " ") || strings.Contains(pattern, "..") {
509 if pattern == "" || strings.Contains(pattern, " ") || strings.Contains(pattern, "..") {
484 return fmt.Errorf("patroon %q is niet bruikbaar", pattern)
510 return i18n.E("err.pattern", pattern)
485 }
511 }
486 _, err := s.db.ExecContext(ctx, `INSERT INTO protected_branches (repo_id, pattern) VALUES (?, ?)`, repoID, pattern)
512 _, err := s.db.ExecContext(ctx, `INSERT INTO protected_branches (repo_id, pattern) VALUES (?, ?)`, repoID, pattern)
487 if err != nil && strings.Contains(err.Error(), "UNIQUE") {
513 if err != nil && strings.Contains(err.Error(), "UNIQUE") {
@@ -506,13 +532,13 @@ type SecretMeta struct {
506// PutSecret bewaart een versleutelde waarde. De naam is een omgevingsvariabele.
532// PutSecret bewaart een versleutelde waarde. De naam is een omgevingsvariabele.
507func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {
533func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {
508 if scopeKind != "repo" && scopeKind != "group" {
534 if scopeKind != "repo" && scopeKind != "group" {
509 return fmt.Errorf("scope moet repo of group zijn")
535 return i18n.E("err.scope")
510 }
536 }
511 if err := access.ValidSecretName(name); err != nil {
537 if err := access.ValidSecretName(name); err != nil {
512 return err
538 return err
513 }
539 }
514 if strings.TrimSpace(value) == "" {
540 if strings.TrimSpace(value) == "" {
515 return fmt.Errorf("de waarde is leeg")
541 return i18n.E("err.emptyValue")
516 }
542 }
517 nonce, ct, err := s.encrypt(value)
543 nonce, ct, err := s.encrypt(value)
518 if err != nil {
544 if err != nil {
internal/store/role_test.go +3 −3
@@ -54,11 +54,11 @@ func TestRolesSecretsAndPending(t *testing.T) {
54 54 if role != access.RoleDeveloper {
55 55 t.Fatalf("bijgewerkt %s", role)
56 56 }
57 group, err := s.CreateGroup(ctx, tim.ID, "Werk", "werk", "")
57 group, err := s.CreateGroup(ctx, tim.ID, "Werk", "werk", "", access.RoleDeveloper)
58 58 if err != nil {
59 59 t.Fatal(err)
60 60 }
61 if _, err := s.CreateGroup(ctx, tim.ID, "Tim", "tim", ""); err == nil {
61 if _, err := s.CreateGroup(ctx, tim.ID, "Tim", "tim", "", access.RoleDeveloper); err == nil {
62 62 t.Fatal("groep mag niet botsen met een gebruiker")
63 63 }
64 64 grown, err := s.CreateRepo(ctx, "group", group.ID, "site", "", "main", "private")
@@ -125,7 +125,7 @@ func TestRolesSecretsAndPending(t *testing.T) {
125 125 t.Fatal("installatiebeheerder ziet een privérepository van een ander")
126 126 }
127 127 }
128 foreignGroup, err := s.CreateGroup(ctx, ada.ID, "Ada", "ada-werk", "")
128 foreignGroup, err := s.CreateGroup(ctx, ada.ID, "Ada", "ada-werk", "", access.RoleDeveloper)
129 129 if err != nil {
130 130 t.Fatal(err)
131 131 }
@@ -54,11 +54,11 @@ func TestRolesSecretsAndPending(t *testing.T) {
54 if role != access.RoleDeveloper {
54 if role != access.RoleDeveloper {
55 t.Fatalf("bijgewerkt %s", role)
55 t.Fatalf("bijgewerkt %s", role)
56 }
56 }
57 group, err := s.CreateGroup(ctx, tim.ID, "Werk", "werk", "")
57 group, err := s.CreateGroup(ctx, tim.ID, "Werk", "werk", "", access.RoleDeveloper)
58 if err != nil {
58 if err != nil {
59 t.Fatal(err)
59 t.Fatal(err)
60 }
60 }
61 if _, err := s.CreateGroup(ctx, tim.ID, "Tim", "tim", ""); err == nil {
61 if _, err := s.CreateGroup(ctx, tim.ID, "Tim", "tim", "", access.RoleDeveloper); err == nil {
62 t.Fatal("groep mag niet botsen met een gebruiker")
62 t.Fatal("groep mag niet botsen met een gebruiker")
63 }
63 }
64 grown, err := s.CreateRepo(ctx, "group", group.ID, "site", "", "main", "private")
64 grown, err := s.CreateRepo(ctx, "group", group.ID, "site", "", "main", "private")
@@ -125,7 +125,7 @@ func TestRolesSecretsAndPending(t *testing.T) {
125 t.Fatal("installatiebeheerder ziet een privérepository van een ander")
125 t.Fatal("installatiebeheerder ziet een privérepository van een ander")
126 }
126 }
127 }
127 }
128 foreignGroup, err := s.CreateGroup(ctx, ada.ID, "Ada", "ada-werk", "")
128 foreignGroup, err := s.CreateGroup(ctx, ada.ID, "Ada", "ada-werk", "", access.RoleDeveloper)
129 if err != nil {
129 if err != nil {
130 t.Fatal(err)
130 t.Fatal(err)
131 }
131 }
internal/store/social.go added +156 −0
@@ -0,0 +1,156 @@
1 package store
2
3 import (
4 "context"
5 "strings"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9 )
10
11 // SetLanguage bewaart de taalkeuze van een gebruiker.
12 func (s *Store) SetLanguage(ctx context.Context, userID int64, lang string) error {
13 _, err := s.db.ExecContext(ctx, `UPDATE users SET language = ? WHERE id = ?`, string(i18n.Parse(lang)), userID)
14 return err
15 }
16
17 // UpdateGroup wijzigt beschrijving, zichtbaarheid en de standaardrol.
18 func (s *Store) UpdateGroup(ctx context.Context, id int64, description, visibility string, defaultRole access.Role) error {
19 if visibility != "public" && visibility != "private" {
20 return i18n.E("err.visibility")
21 }
22 if _, err := access.ParseRole(string(defaultRole)); err != nil {
23 return err
24 }
25 _, err := s.db.ExecContext(ctx, `UPDATE groups SET description = ?, visibility = ?, default_role = ? WHERE id = ?`,
26 strings.TrimSpace(description), visibility, string(defaultRole), id)
27 return err
28 }
29
30 // SetLogoMIME onthoudt het type van een opgeslagen logo. Leeg wist het.
31 func (s *Store) SetLogoMIME(ctx context.Context, kind string, id int64, mime string) error {
32 switch kind {
33 case "group":
34 _, err := s.db.ExecContext(ctx, `UPDATE groups SET logo_mime = ? WHERE id = ?`, mime, id)
35 return err
36 case "repo":
37 _, err := s.db.ExecContext(ctx, `UPDATE repos SET logo_mime = ? WHERE id = ?`, mime, id)
38 return err
39 default:
40 return i18n.E("err.scope")
41 }
42 }
43
44 // GrantDefaultRoles zet op een nieuwe groepsrepository de standaardrol
45 // voor elk huidig lid. Beheerders van de groep blijven beheerder.
46 func (s *Store) GrantDefaultRoles(ctx context.Context, groupID, repoID int64) error {
47 g, err := s.GroupByID(ctx, groupID)
48 if err != nil {
49 return err
50 }
51 rows, err := s.db.QueryContext(ctx, `SELECT user_id, role FROM group_members WHERE group_id = ?`, groupID)
52 if err != nil {
53 return err
54 }
55 defer rows.Close()
56 for rows.Next() {
57 var uid int64
58 var role string
59 if err := rows.Scan(&uid, &role); err != nil {
60 return err
61 }
62 grant := g.DefaultRole
63 if access.Role(role) == access.RoleMaintainer {
64 grant = access.RoleMaintainer
65 }
66 if _, err := s.db.ExecContext(ctx, `INSERT INTO repo_members (repo_id, user_id, role) VALUES (?, ?, ?)
67 ON CONFLICT(repo_id, user_id) DO UPDATE SET role = excluded.role`, repoID, uid, string(grant)); err != nil {
68 return err
69 }
70 }
71 return rows.Err()
72 }
73
74 // SlugTaken meldt of een groeps- of repositorynaam al bezet is.
75 func (s *Store) SlugTaken(ctx context.Context, kind, slug, ownerKind string, ownerID int64) (bool, error) {
76 var n int
77 var err error
78 switch kind {
79 case "group":
80 err = s.db.QueryRowContext(ctx, `SELECT
81 (SELECT COUNT(*) FROM users WHERE username = ?) +
82 (SELECT COUNT(*) FROM groups WHERE path = ?)`, slug, slug).Scan(&n)
83 case "repo":
84 err = s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ? AND name = ?`, ownerKind, ownerID, slug).Scan(&n)
85 default:
86 return true, nil
87 }
88 if err != nil {
89 return false, err
90 }
91 return n > 0, nil
92 }
93
94 // SetStar zet of haalt een ster weg.
95 func (s *Store) SetStar(ctx context.Context, userID, repoID int64, on bool) error {
96 if !on {
97 _, err := s.db.ExecContext(ctx, `DELETE FROM stars WHERE user_id = ? AND repo_id = ?`, userID, repoID)
98 return err
99 }
100 _, err := s.db.ExecContext(ctx, `INSERT INTO stars (user_id, repo_id, created_at) VALUES (?, ?, ?)
101 ON CONFLICT(user_id, repo_id) DO NOTHING`, userID, repoID, now())
102 return err
103 }
104
105 // StarInfo telt sterren en meldt welke de gebruiker zelf zette.
106 func (s *Store) StarInfo(ctx context.Context, userID int64, ids []int64) (map[int64]int, map[int64]bool, error) {
107 counts := map[int64]int{}
108 mine := map[int64]bool{}
109 if len(ids) == 0 {
110 return counts, mine, nil
111 }
112 q, args := inClause(ids)
113 rows, err := s.db.QueryContext(ctx, `SELECT repo_id, COUNT(*) FROM stars WHERE repo_id IN (`+q+`) GROUP BY repo_id`, args...)
114 if err != nil {
115 return nil, nil, err
116 }
117 defer rows.Close()
118 for rows.Next() {
119 var id int64
120 var n int
121 if err := rows.Scan(&id, &n); err != nil {
122 return nil, nil, err
123 }
124 counts[id] = n
125 }
126 if err := rows.Err(); err != nil {
127 return nil, nil, err
128 }
129 if userID == 0 {
130 return counts, mine, nil
131 }
132 args = append([]any{userID}, args...)
133 mrows, err := s.db.QueryContext(ctx, `SELECT repo_id FROM stars WHERE user_id = ? AND repo_id IN (`+q+`)`, args...)
134 if err != nil {
135 return nil, nil, err
136 }
137 defer mrows.Close()
138 for mrows.Next() {
139 var id int64
140 if err := mrows.Scan(&id); err != nil {
141 return nil, nil, err
142 }
143 mine[id] = true
144 }
145 return counts, mine, mrows.Err()
146 }
147
148 func inClause(ids []int64) (string, []any) {
149 hold := make([]string, len(ids))
150 args := make([]any, len(ids))
151 for i, id := range ids {
152 hold[i] = "?"
153 args[i] = id
154 }
155 return strings.Join(hold, ","), args
156 }
@@ -0,0 +1,156 @@
1package store
2
3import (
4 "context"
5 "strings"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9)
10
11// SetLanguage bewaart de taalkeuze van een gebruiker.
12func (s *Store) SetLanguage(ctx context.Context, userID int64, lang string) error {
13 _, err := s.db.ExecContext(ctx, `UPDATE users SET language = ? WHERE id = ?`, string(i18n.Parse(lang)), userID)
14 return err
15}
16
17// UpdateGroup wijzigt beschrijving, zichtbaarheid en de standaardrol.
18func (s *Store) UpdateGroup(ctx context.Context, id int64, description, visibility string, defaultRole access.Role) error {
19 if visibility != "public" && visibility != "private" {
20 return i18n.E("err.visibility")
21 }
22 if _, err := access.ParseRole(string(defaultRole)); err != nil {
23 return err
24 }
25 _, err := s.db.ExecContext(ctx, `UPDATE groups SET description = ?, visibility = ?, default_role = ? WHERE id = ?`,
26 strings.TrimSpace(description), visibility, string(defaultRole), id)
27 return err
28}
29
30// SetLogoMIME onthoudt het type van een opgeslagen logo. Leeg wist het.
31func (s *Store) SetLogoMIME(ctx context.Context, kind string, id int64, mime string) error {
32 switch kind {
33 case "group":
34 _, err := s.db.ExecContext(ctx, `UPDATE groups SET logo_mime = ? WHERE id = ?`, mime, id)
35 return err
36 case "repo":
37 _, err := s.db.ExecContext(ctx, `UPDATE repos SET logo_mime = ? WHERE id = ?`, mime, id)
38 return err
39 default:
40 return i18n.E("err.scope")
41 }
42}
43
44// GrantDefaultRoles zet op een nieuwe groepsrepository de standaardrol
45// voor elk huidig lid. Beheerders van de groep blijven beheerder.
46func (s *Store) GrantDefaultRoles(ctx context.Context, groupID, repoID int64) error {
47 g, err := s.GroupByID(ctx, groupID)
48 if err != nil {
49 return err
50 }
51 rows, err := s.db.QueryContext(ctx, `SELECT user_id, role FROM group_members WHERE group_id = ?`, groupID)
52 if err != nil {
53 return err
54 }
55 defer rows.Close()
56 for rows.Next() {
57 var uid int64
58 var role string
59 if err := rows.Scan(&uid, &role); err != nil {
60 return err
61 }
62 grant := g.DefaultRole
63 if access.Role(role) == access.RoleMaintainer {
64 grant = access.RoleMaintainer
65 }
66 if _, err := s.db.ExecContext(ctx, `INSERT INTO repo_members (repo_id, user_id, role) VALUES (?, ?, ?)
67 ON CONFLICT(repo_id, user_id) DO UPDATE SET role = excluded.role`, repoID, uid, string(grant)); err != nil {
68 return err
69 }
70 }
71 return rows.Err()
72}
73
74// SlugTaken meldt of een groeps- of repositorynaam al bezet is.
75func (s *Store) SlugTaken(ctx context.Context, kind, slug, ownerKind string, ownerID int64) (bool, error) {
76 var n int
77 var err error
78 switch kind {
79 case "group":
80 err = s.db.QueryRowContext(ctx, `SELECT
81 (SELECT COUNT(*) FROM users WHERE username = ?) +
82 (SELECT COUNT(*) FROM groups WHERE path = ?)`, slug, slug).Scan(&n)
83 case "repo":
84 err = s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ? AND name = ?`, ownerKind, ownerID, slug).Scan(&n)
85 default:
86 return true, nil
87 }
88 if err != nil {
89 return false, err
90 }
91 return n > 0, nil
92}
93
94// SetStar zet of haalt een ster weg.
95func (s *Store) SetStar(ctx context.Context, userID, repoID int64, on bool) error {
96 if !on {
97 _, err := s.db.ExecContext(ctx, `DELETE FROM stars WHERE user_id = ? AND repo_id = ?`, userID, repoID)
98 return err
99 }
100 _, err := s.db.ExecContext(ctx, `INSERT INTO stars (user_id, repo_id, created_at) VALUES (?, ?, ?)
101 ON CONFLICT(user_id, repo_id) DO NOTHING`, userID, repoID, now())
102 return err
103}
104
105// StarInfo telt sterren en meldt welke de gebruiker zelf zette.
106func (s *Store) StarInfo(ctx context.Context, userID int64, ids []int64) (map[int64]int, map[int64]bool, error) {
107 counts := map[int64]int{}
108 mine := map[int64]bool{}
109 if len(ids) == 0 {
110 return counts, mine, nil
111 }
112 q, args := inClause(ids)
113 rows, err := s.db.QueryContext(ctx, `SELECT repo_id, COUNT(*) FROM stars WHERE repo_id IN (`+q+`) GROUP BY repo_id`, args...)
114 if err != nil {
115 return nil, nil, err
116 }
117 defer rows.Close()
118 for rows.Next() {
119 var id int64
120 var n int
121 if err := rows.Scan(&id, &n); err != nil {
122 return nil, nil, err
123 }
124 counts[id] = n
125 }
126 if err := rows.Err(); err != nil {
127 return nil, nil, err
128 }
129 if userID == 0 {
130 return counts, mine, nil
131 }
132 args = append([]any{userID}, args...)
133 mrows, err := s.db.QueryContext(ctx, `SELECT repo_id FROM stars WHERE user_id = ? AND repo_id IN (`+q+`)`, args...)
134 if err != nil {
135 return nil, nil, err
136 }
137 defer mrows.Close()
138 for mrows.Next() {
139 var id int64
140 if err := mrows.Scan(&id); err != nil {
141 return nil, nil, err
142 }
143 mine[id] = true
144 }
145 return counts, mine, mrows.Err()
146}
147
148func inClause(ids []int64) (string, []any) {
149 hold := make([]string, len(ids))
150 args := make([]any, len(ids))
151 for i, id := range ids {
152 hold[i] = "?"
153 args[i] = id
154 }
155 return strings.Join(hold, ","), args
156}
internal/store/store.go +38 −8
@@ -13,6 +13,7 @@ import (
13 13 "strings"
14 14 "time"
15 15
16 "gitlab.com/Timfa/bluegit/internal/i18n"
16 17 "gitlab.com/Timfa/bluegit/internal/names"
17 18 "gitlab.com/Timfa/bluegit/internal/secretbox"
18 19
@@ -52,8 +53,22 @@ func Open(path string, key []byte) (*Store, error) {
52 53 func (s *Store) Close() error { return s.db.Close() }
53 54
54 55 func (s *Store) migrate() error {
55 _, err := s.db.Exec(schema)
56 return err
56 if _, err := s.db.Exec(schema); err != nil {
57 return err
58 }
59 alters := []string{
60 `ALTER TABLE users ADD COLUMN language TEXT NOT NULL DEFAULT 'en'`,
61 `ALTER TABLE groups ADD COLUMN visibility TEXT NOT NULL DEFAULT 'private'`,
62 `ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,
63 `ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64 `ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65 }
66 for _, q := range alters {
67 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
68 return err
69 }
70 }
71 return nil
57 72 }
58 73
59 74 const schema = `
@@ -64,6 +79,7 @@ CREATE TABLE IF NOT EXISTS users (
64 79 avatar_url TEXT NOT NULL DEFAULT '',
65 80 auth_admin INTEGER NOT NULL DEFAULT 0,
66 81 instance_admin INTEGER NOT NULL DEFAULT 0,
82 language TEXT NOT NULL DEFAULT 'en',
67 83 created_at TEXT NOT NULL,
68 84 updated_at TEXT NOT NULL
69 85 );
@@ -98,6 +114,9 @@ CREATE TABLE IF NOT EXISTS groups (
98 114 name TEXT NOT NULL,
99 115 path TEXT NOT NULL UNIQUE,
100 116 description TEXT NOT NULL DEFAULT '',
117 visibility TEXT NOT NULL DEFAULT 'private',
118 default_role TEXT NOT NULL DEFAULT 'developer',
119 logo_mime TEXT NOT NULL DEFAULT '',
101 120 created_by INTEGER NOT NULL,
102 121 created_at TEXT NOT NULL
103 122 );
@@ -115,6 +134,7 @@ CREATE TABLE IF NOT EXISTS repos (
115 134 description TEXT NOT NULL DEFAULT '',
116 135 default_branch TEXT NOT NULL,
117 136 visibility TEXT NOT NULL DEFAULT 'private',
137 logo_mime TEXT NOT NULL DEFAULT '',
118 138 created_at TEXT NOT NULL,
119 139 UNIQUE(owner_kind, owner_id, name)
120 140 );
@@ -263,6 +283,12 @@ CREATE TABLE IF NOT EXISTS contribution_sync (
263 283 repo_id INTEGER PRIMARY KEY REFERENCES repos(id) ON DELETE CASCADE,
264 284 synced_at TEXT NOT NULL
265 285 );
286 CREATE TABLE IF NOT EXISTS stars (
287 user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
288 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
289 created_at TEXT NOT NULL,
290 PRIMARY KEY (user_id, repo_id)
291 );
266 292 CREATE TABLE IF NOT EXISTS notes (
267 293 id INTEGER PRIMARY KEY,
268 294 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
@@ -291,6 +317,7 @@ type User struct {
291 317 AvatarURL string
292 318 AuthAdmin bool
293 319 InstanceAdmin bool
320 Language string
294 321 CreatedAt time.Time
295 322 }
296 323
@@ -320,7 +347,7 @@ func (s *Store) UpsertUser(ctx context.Context, authID int64, username, avatar s
320 347 return User{}, err
321 348 }
322 349 if nameTaken > 0 {
323 return User{}, fmt.Errorf("gebruikersnaam %s is al in gebruik", username)
350 return User{}, i18n.E("err.userTaken", username)
324 351 }
325 352 admin := 0
326 353 if count == 0 {
@@ -414,13 +441,13 @@ func claimPending(ctx context.Context, tx *sql.Tx, userID int64, username string
414 441
415 442 // UserByID leest één account.
416 443 func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
417 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, created_at FROM users WHERE id = ?`, id)
444 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE id = ?`, id)
418 445 return scanUser(row)
419 446 }
420 447
421 448 // UserByUsername leest op naam.
422 449 func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
423 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, created_at FROM users WHERE username = ?`, strings.ToLower(username))
450 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE username = ?`, strings.ToLower(username))
424 451 return scanUser(row)
425 452 }
426 453
@@ -428,7 +455,7 @@ func scanUser(row *sql.Row) (User, error) {
428 455 var u User
429 456 var admin, inst int
430 457 var created string
431 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &created); err != nil {
458 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &created); err != nil {
432 459 if errors.Is(err, sql.ErrNoRows) {
433 460 return User{}, errNotFound
434 461 }
@@ -436,6 +463,9 @@ func scanUser(row *sql.Row) (User, error) {
436 463 }
437 464 u.AuthAdmin = admin == 1
438 465 u.InstanceAdmin = inst == 1
466 if u.Language == "" {
467 u.Language = "en"
468 }
439 469 u.CreatedAt = parseTime(created)
440 470 return u, nil
441 471 }
@@ -514,7 +544,7 @@ type TokenInfo struct {
514 544 func (s *Store) CreateToken(ctx context.Context, userID int64, name string) (string, error) {
515 545 name = strings.TrimSpace(name)
516 546 if name == "" || len(name) > 80 {
517 return "", fmt.Errorf("geef het token een naam")
547 return "", i18n.E("err.tokenNeedsName")
518 548 }
519 549 plain, err := newToken("bg_")
520 550 if err != nil {
@@ -598,7 +628,7 @@ func (s *Store) AddSSHKey(ctx context.Context, userID int64, name, line, fingerp
598 628 _, err := s.db.ExecContext(ctx, `INSERT INTO ssh_keys (user_id, name, public_key, fingerprint, created_at) VALUES (?, ?, ?, ?, ?)`,
599 629 userID, name, strings.TrimSpace(line), fingerprint, now())
600 630 if err != nil && strings.Contains(err.Error(), "UNIQUE") {
601 return fmt.Errorf("deze sleutel staat al geregistreerd")
631 return i18n.E("err.sshDup")
602 632 }
603 633 return err
604 634 }
@@ -13,6 +13,7 @@ import (
13 "strings"
13 "strings"
14 "time"
14 "time"
15
15
16 "gitlab.com/Timfa/bluegit/internal/i18n"
16 "gitlab.com/Timfa/bluegit/internal/names"
17 "gitlab.com/Timfa/bluegit/internal/names"
17 "gitlab.com/Timfa/bluegit/internal/secretbox"
18 "gitlab.com/Timfa/bluegit/internal/secretbox"
18
19
@@ -52,8 +53,22 @@ func Open(path string, key []byte) (*Store, error) {
52func (s *Store) Close() error { return s.db.Close() }
53func (s *Store) Close() error { return s.db.Close() }
53
54
54func (s *Store) migrate() error {
55func (s *Store) migrate() error {
55 _, err := s.db.Exec(schema)
56 if _, err := s.db.Exec(schema); err != nil {
56 return err
57 return err
58 }
59 alters := []string{
60 `ALTER TABLE users ADD COLUMN language TEXT NOT NULL DEFAULT 'en'`,
61 `ALTER TABLE groups ADD COLUMN visibility TEXT NOT NULL DEFAULT 'private'`,
62 `ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,
63 `ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64 `ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65 }
66 for _, q := range alters {
67 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
68 return err
69 }
70 }
71 return nil
57}
72}
58
73
59const schema = `
74const schema = `
@@ -64,6 +79,7 @@ CREATE TABLE IF NOT EXISTS users (
64 avatar_url TEXT NOT NULL DEFAULT '',
79 avatar_url TEXT NOT NULL DEFAULT '',
65 auth_admin INTEGER NOT NULL DEFAULT 0,
80 auth_admin INTEGER NOT NULL DEFAULT 0,
66 instance_admin INTEGER NOT NULL DEFAULT 0,
81 instance_admin INTEGER NOT NULL DEFAULT 0,
82 language TEXT NOT NULL DEFAULT 'en',
67 created_at TEXT NOT NULL,
83 created_at TEXT NOT NULL,
68 updated_at TEXT NOT NULL
84 updated_at TEXT NOT NULL
69);
85);
@@ -98,6 +114,9 @@ CREATE TABLE IF NOT EXISTS groups (
98 name TEXT NOT NULL,
114 name TEXT NOT NULL,
99 path TEXT NOT NULL UNIQUE,
115 path TEXT NOT NULL UNIQUE,
100 description TEXT NOT NULL DEFAULT '',
116 description TEXT NOT NULL DEFAULT '',
117 visibility TEXT NOT NULL DEFAULT 'private',
118 default_role TEXT NOT NULL DEFAULT 'developer',
119 logo_mime TEXT NOT NULL DEFAULT '',
101 created_by INTEGER NOT NULL,
120 created_by INTEGER NOT NULL,
102 created_at TEXT NOT NULL
121 created_at TEXT NOT NULL
103);
122);
@@ -115,6 +134,7 @@ CREATE TABLE IF NOT EXISTS repos (
115 description TEXT NOT NULL DEFAULT '',
134 description TEXT NOT NULL DEFAULT '',
116 default_branch TEXT NOT NULL,
135 default_branch TEXT NOT NULL,
117 visibility TEXT NOT NULL DEFAULT 'private',
136 visibility TEXT NOT NULL DEFAULT 'private',
137 logo_mime TEXT NOT NULL DEFAULT '',
118 created_at TEXT NOT NULL,
138 created_at TEXT NOT NULL,
119 UNIQUE(owner_kind, owner_id, name)
139 UNIQUE(owner_kind, owner_id, name)
120);
140);
@@ -263,6 +283,12 @@ CREATE TABLE IF NOT EXISTS contribution_sync (
263 repo_id INTEGER PRIMARY KEY REFERENCES repos(id) ON DELETE CASCADE,
283 repo_id INTEGER PRIMARY KEY REFERENCES repos(id) ON DELETE CASCADE,
264 synced_at TEXT NOT NULL
284 synced_at TEXT NOT NULL
265);
285);
286CREATE TABLE IF NOT EXISTS stars (
287 user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
288 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
289 created_at TEXT NOT NULL,
290 PRIMARY KEY (user_id, repo_id)
291);
266CREATE TABLE IF NOT EXISTS notes (
292CREATE TABLE IF NOT EXISTS notes (
267 id INTEGER PRIMARY KEY,
293 id INTEGER PRIMARY KEY,
268 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
294 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
@@ -291,6 +317,7 @@ type User struct {
291 AvatarURL string
317 AvatarURL string
292 AuthAdmin bool
318 AuthAdmin bool
293 InstanceAdmin bool
319 InstanceAdmin bool
320 Language string
294 CreatedAt time.Time
321 CreatedAt time.Time
295}
322}
296
323
@@ -320,7 +347,7 @@ func (s *Store) UpsertUser(ctx context.Context, authID int64, username, avatar s
320 return User{}, err
347 return User{}, err
321 }
348 }
322 if nameTaken > 0 {
349 if nameTaken > 0 {
323 return User{}, fmt.Errorf("gebruikersnaam %s is al in gebruik", username)
350 return User{}, i18n.E("err.userTaken", username)
324 }
351 }
325 admin := 0
352 admin := 0
326 if count == 0 {
353 if count == 0 {
@@ -414,13 +441,13 @@ func claimPending(ctx context.Context, tx *sql.Tx, userID int64, username string
414
441
415// UserByID leest één account.
442// UserByID leest één account.
416func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
443func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
417 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, created_at FROM users WHERE id = ?`, id)
444 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE id = ?`, id)
418 return scanUser(row)
445 return scanUser(row)
419}
446}
420
447
421// UserByUsername leest op naam.
448// UserByUsername leest op naam.
422func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
449func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
423 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, created_at FROM users WHERE username = ?`, strings.ToLower(username))
450 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE username = ?`, strings.ToLower(username))
424 return scanUser(row)
451 return scanUser(row)
425}
452}
426
453
@@ -428,7 +455,7 @@ func scanUser(row *sql.Row) (User, error) {
428 var u User
455 var u User
429 var admin, inst int
456 var admin, inst int
430 var created string
457 var created string
431 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &created); err != nil {
458 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &created); err != nil {
432 if errors.Is(err, sql.ErrNoRows) {
459 if errors.Is(err, sql.ErrNoRows) {
433 return User{}, errNotFound
460 return User{}, errNotFound
434 }
461 }
@@ -436,6 +463,9 @@ func scanUser(row *sql.Row) (User, error) {
436 }
463 }
437 u.AuthAdmin = admin == 1
464 u.AuthAdmin = admin == 1
438 u.InstanceAdmin = inst == 1
465 u.InstanceAdmin = inst == 1
466 if u.Language == "" {
467 u.Language = "en"
468 }
439 u.CreatedAt = parseTime(created)
469 u.CreatedAt = parseTime(created)
440 return u, nil
470 return u, nil
441}
471}
@@ -514,7 +544,7 @@ type TokenInfo struct {
514func (s *Store) CreateToken(ctx context.Context, userID int64, name string) (string, error) {
544func (s *Store) CreateToken(ctx context.Context, userID int64, name string) (string, error) {
515 name = strings.TrimSpace(name)
545 name = strings.TrimSpace(name)
516 if name == "" || len(name) > 80 {
546 if name == "" || len(name) > 80 {
517 return "", fmt.Errorf("geef het token een naam")
547 return "", i18n.E("err.tokenNeedsName")
518 }
548 }
519 plain, err := newToken("bg_")
549 plain, err := newToken("bg_")
520 if err != nil {
550 if err != nil {
@@ -598,7 +628,7 @@ func (s *Store) AddSSHKey(ctx context.Context, userID int64, name, line, fingerp
598 _, err := s.db.ExecContext(ctx, `INSERT INTO ssh_keys (user_id, name, public_key, fingerprint, created_at) VALUES (?, ?, ?, ?, ?)`,
628 _, err := s.db.ExecContext(ctx, `INSERT INTO ssh_keys (user_id, name, public_key, fingerprint, created_at) VALUES (?, ?, ?, ?, ?)`,
599 userID, name, strings.TrimSpace(line), fingerprint, now())
629 userID, name, strings.TrimSpace(line), fingerprint, now())
600 if err != nil && strings.Contains(err.Error(), "UNIQUE") {
630 if err != nil && strings.Contains(err.Error(), "UNIQUE") {
601 return fmt.Errorf("deze sleutel staat al geregistreerd")
631 return i18n.E("err.sshDup")
602 }
632 }
603 return err
633 return err
604}
634}
internal/webhook/webhook.go +8 −7
@@ -3,9 +3,10 @@ package webhook
3 3
4 4 import (
5 5 "encoding/json"
6 "fmt"
7 6 "regexp"
8 7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/i18n"
9 10 )
10 11
11 12 // Soorten gebeurtenissen.
@@ -65,7 +66,7 @@ type Hook struct {
65 66 // "re:" gevolgd door een reguliere expressie, anders een exacte branchnaam.
66 67 func Allows(h Hook, ev Event) (bool, error) {
67 68 if !KnownEvent(ev.Type) {
68 return false, fmt.Errorf("onbekende gebeurtenis %q", ev.Type)
69 return false, i18n.E("err.whEvent", ev.Type)
69 70 }
70 71 found := false
71 72 for _, e := range h.Events {
@@ -92,7 +93,7 @@ func MatchBranch(filter, branch string) (bool, error) {
92 93 if strings.HasPrefix(filter, "re:") {
93 94 re, err := regexp.Compile(strings.TrimPrefix(filter, "re:"))
94 95 if err != nil {
95 return false, fmt.Errorf("branchfilter: %w", err)
96 return false, i18n.E("err.whFilter", err.Error())
96 97 }
97 98 return re.MatchString(branch), nil
98 99 }
@@ -114,7 +115,7 @@ func Expand(s string, ev Event, secrets map[string]string) (string, error) {
114 115 rest := s[start+2:]
115 116 end := strings.Index(rest, "}}")
116 117 if end < 0 {
117 return "", fmt.Errorf("onafgesloten {{ in sjabloon")
118 return "", i18n.E("err.whTemplate")
118 119 }
119 120 key := strings.TrimSpace(rest[:end])
120 121 val, err := lookup(key, ev, secrets)
@@ -133,18 +134,18 @@ func lookup(key string, ev Event, secrets map[string]string) (string, error) {
133 134 name := strings.TrimPrefix(key, "secret.")
134 135 v, ok := secrets[name]
135 136 if !ok {
136 return "", fmt.Errorf("geheim %s bestaat niet", name)
137 return "", i18n.E("err.whSecret", name)
137 138 }
138 139 return v, nil
139 140 case strings.HasPrefix(key, "event."):
140 141 field := strings.TrimPrefix(key, "event.")
141 142 v, ok := eventField(ev, field)
142 143 if !ok {
143 return "", fmt.Errorf("onbekend veld event.%s", field)
144 return "", i18n.E("err.whField", field)
144 145 }
145 146 return v, nil
146 147 default:
147 return "", fmt.Errorf("onbekende plaatsaanduiding %q", key)
148 return "", i18n.E("err.whPlaceholder", key)
148 149 }
149 150 }
150 151
@@ -3,9 +3,10 @@ package webhook
3
3
4import (
4import (
5 "encoding/json"
5 "encoding/json"
6 "fmt"
7 "regexp"
6 "regexp"
8 "strings"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/i18n"
9)
10)
10
11
11// Soorten gebeurtenissen.
12// Soorten gebeurtenissen.
@@ -65,7 +66,7 @@ type Hook struct {
65// "re:" gevolgd door een reguliere expressie, anders een exacte branchnaam.
66// "re:" gevolgd door een reguliere expressie, anders een exacte branchnaam.
66func Allows(h Hook, ev Event) (bool, error) {
67func Allows(h Hook, ev Event) (bool, error) {
67 if !KnownEvent(ev.Type) {
68 if !KnownEvent(ev.Type) {
68 return false, fmt.Errorf("onbekende gebeurtenis %q", ev.Type)
69 return false, i18n.E("err.whEvent", ev.Type)
69 }
70 }
70 found := false
71 found := false
71 for _, e := range h.Events {
72 for _, e := range h.Events {
@@ -92,7 +93,7 @@ func MatchBranch(filter, branch string) (bool, error) {
92 if strings.HasPrefix(filter, "re:") {
93 if strings.HasPrefix(filter, "re:") {
93 re, err := regexp.Compile(strings.TrimPrefix(filter, "re:"))
94 re, err := regexp.Compile(strings.TrimPrefix(filter, "re:"))
94 if err != nil {
95 if err != nil {
95 return false, fmt.Errorf("branchfilter: %w", err)
96 return false, i18n.E("err.whFilter", err.Error())
96 }
97 }
97 return re.MatchString(branch), nil
98 return re.MatchString(branch), nil
98 }
99 }
@@ -114,7 +115,7 @@ func Expand(s string, ev Event, secrets map[string]string) (string, error) {
114 rest := s[start+2:]
115 rest := s[start+2:]
115 end := strings.Index(rest, "}}")
116 end := strings.Index(rest, "}}")
116 if end < 0 {
117 if end < 0 {
117 return "", fmt.Errorf("onafgesloten {{ in sjabloon")
118 return "", i18n.E("err.whTemplate")
118 }
119 }
119 key := strings.TrimSpace(rest[:end])
120 key := strings.TrimSpace(rest[:end])
120 val, err := lookup(key, ev, secrets)
121 val, err := lookup(key, ev, secrets)
@@ -133,18 +134,18 @@ func lookup(key string, ev Event, secrets map[string]string) (string, error) {
133 name := strings.TrimPrefix(key, "secret.")
134 name := strings.TrimPrefix(key, "secret.")
134 v, ok := secrets[name]
135 v, ok := secrets[name]
135 if !ok {
136 if !ok {
136 return "", fmt.Errorf("geheim %s bestaat niet", name)
137 return "", i18n.E("err.whSecret", name)
137 }
138 }
138 return v, nil
139 return v, nil
139 case strings.HasPrefix(key, "event."):
140 case strings.HasPrefix(key, "event."):
140 field := strings.TrimPrefix(key, "event.")
141 field := strings.TrimPrefix(key, "event.")
141 v, ok := eventField(ev, field)
142 v, ok := eventField(ev, field)
142 if !ok {
143 if !ok {
143 return "", fmt.Errorf("onbekend veld event.%s", field)
144 return "", i18n.E("err.whField", field)
144 }
145 }
145 return v, nil
146 return v, nil
146 default:
147 default:
147 return "", fmt.Errorf("onbekende plaatsaanduiding %q", key)
148 return "", i18n.E("err.whPlaceholder", key)
148 }
149 }
149}
150}
150
151