BlueGit

timfa bluegit

Merge branch 'cursor/groep-eigenaar-65da' into 'master'

Groepseigenaar en overdracht van eigenaarschap

See merge request Timfa/bluegit!14

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
e65fc3c65c4e830955b015eba9b971335b6ceed8
15 files changed +467 −22
internal/i18n/catalog.go +12 −0
@@ -100,6 +100,12 @@ var en = map[string]string{
100 100 "group.tab.repos": "Repositories",
101 101 "group.tab.members": "Members",
102 102 "group.tab.settings": "Settings",
103 "group.owner": "Owner",
104 "own.transfer": "Transfer ownership",
105 "own.pick": "New owner",
106 "own.type": "Username",
107 "own.needMember": "Add another member before transferring ownership.",
108 "own.confirm": "This cannot be undone. If you are sure, type the username '%s' again in the field below and click 'Transfer ownership'.",
103 109 "group.search": "Search",
104 110 "group.sort": "Name",
105 111 "group.direction": "Sort direction",
@@ -358,6 +364,11 @@ var en = map[string]string{
358 364 "err.pathUser": "path %s is already a user",
359 365 "err.pathGroup": "path %s is already a group",
360 366 "err.ownerKind": "owner must be user or group",
367 "err.ownerRole": "The owner stays a maintainer. Transfer ownership to change that.",
368 "err.ownerOnly": "Only the owner can transfer ownership.",
369 "err.ownerMember": "That user is not a member of this group.",
370 "err.ownerSame": "Choose another member.",
371 "err.ownerConfirm": "Type that username exactly.",
361 372 "err.visibility": "visibility must be public or private",
362 373 "err.userGroupClash": "a group named %s already exists; personal repositories would be unreachable",
363 374 "err.repoExists": "repository %s already exists",
@@ -416,6 +427,7 @@ var en = map[string]string{
416 427 "flash.merged": "Merged",
417 428 "flash.closed": "Closed",
418 429 "flash.reopened": "Merge request reopened.",
430 "flash.owner": "Ownership transferred.",
419 431 "hook.push": "%s pushed to %s in %s",
420 432 "hook.mr": "merge request !%s opened: %s",
421 433 "hook.release": "release %s of %s published",
@@ -100,6 +100,12 @@ var en = map[string]string{
100 "group.tab.repos": "Repositories",
100 "group.tab.repos": "Repositories",
101 "group.tab.members": "Members",
101 "group.tab.members": "Members",
102 "group.tab.settings": "Settings",
102 "group.tab.settings": "Settings",
103 "group.owner": "Owner",
104 "own.transfer": "Transfer ownership",
105 "own.pick": "New owner",
106 "own.type": "Username",
107 "own.needMember": "Add another member before transferring ownership.",
108 "own.confirm": "This cannot be undone. If you are sure, type the username '%s' again in the field below and click 'Transfer ownership'.",
103 "group.search": "Search",
109 "group.search": "Search",
104 "group.sort": "Name",
110 "group.sort": "Name",
105 "group.direction": "Sort direction",
111 "group.direction": "Sort direction",
@@ -358,6 +364,11 @@ var en = map[string]string{
358 "err.pathUser": "path %s is already a user",
364 "err.pathUser": "path %s is already a user",
359 "err.pathGroup": "path %s is already a group",
365 "err.pathGroup": "path %s is already a group",
360 "err.ownerKind": "owner must be user or group",
366 "err.ownerKind": "owner must be user or group",
367 "err.ownerRole": "The owner stays a maintainer. Transfer ownership to change that.",
368 "err.ownerOnly": "Only the owner can transfer ownership.",
369 "err.ownerMember": "That user is not a member of this group.",
370 "err.ownerSame": "Choose another member.",
371 "err.ownerConfirm": "Type that username exactly.",
361 "err.visibility": "visibility must be public or private",
372 "err.visibility": "visibility must be public or private",
362 "err.userGroupClash": "a group named %s already exists; personal repositories would be unreachable",
373 "err.userGroupClash": "a group named %s already exists; personal repositories would be unreachable",
363 "err.repoExists": "repository %s already exists",
374 "err.repoExists": "repository %s already exists",
@@ -416,6 +427,7 @@ var en = map[string]string{
416 "flash.merged": "Merged",
427 "flash.merged": "Merged",
417 "flash.closed": "Closed",
428 "flash.closed": "Closed",
418 "flash.reopened": "Merge request reopened.",
429 "flash.reopened": "Merge request reopened.",
430 "flash.owner": "Ownership transferred.",
419 "hook.push": "%s pushed to %s in %s",
431 "hook.push": "%s pushed to %s in %s",
420 "hook.mr": "merge request !%s opened: %s",
432 "hook.mr": "merge request !%s opened: %s",
421 "hook.release": "release %s of %s published",
433 "hook.release": "release %s of %s published",
internal/i18n/catalog_lang.go +36 −0
@@ -107,6 +107,12 @@ var nl = map[string]string{
107 107 "group.tab.repos": "Repositories",
108 108 "group.tab.members": "Leden",
109 109 "group.tab.settings": "Instellingen",
110 "group.owner": "Eigenaar",
111 "own.transfer": "Eigenaarsschap overdragen",
112 "own.pick": "Nieuwe eigenaar",
113 "own.type": "Gebruikersnaam",
114 "own.needMember": "Voeg eerst een ander lid toe.",
115 "own.confirm": "Dit kan niet ongedaan gemaakt worden. Weet je het zeker, typ dan nogmaals de gebruikersnaam '%s' in het tekstveld hieronder en klik op 'Eigenaarsschap overdragen'.",
110 116 "group.search": "Zoeken",
111 117 "group.sort": "Naam",
112 118 "group.direction": "Sorteerrichting",
@@ -357,6 +363,11 @@ var nl = map[string]string{
357 363 "err.pathUser": "pad %s is al een gebruiker",
358 364 "err.pathGroup": "pad %s is al een groep",
359 365 "err.ownerKind": "eigenaar moet user of group zijn",
366 "err.ownerRole": "De eigenaar blijft beheerder. Draag het eigenaarschap over om dat te veranderen.",
367 "err.ownerOnly": "Alleen de eigenaar kan het eigenaarschap overdragen.",
368 "err.ownerMember": "Die gebruiker is geen lid van deze groep.",
369 "err.ownerSame": "Kies een ander lid.",
370 "err.ownerConfirm": "Typ die gebruikersnaam precies zo.",
360 371 "err.visibility": "zichtbaarheid moet public of private zijn",
361 372 "err.userGroupClash": "er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar",
362 373 "err.repoExists": "er is al een repository %s",
@@ -412,6 +423,7 @@ var nl = map[string]string{
412 423 "flash.merged": "Samengevoegd",
413 424 "flash.closed": "Gesloten",
414 425 "flash.reopened": "Merge request heropend.",
426 "flash.owner": "Eigenaarschap overgedragen.",
415 427 "hook.push": "%s pushte naar %s in %s",
416 428 "hook.mr": "merge request !%s geopend: %s",
417 429 "hook.release": "release %s van %s gepubliceerd",
@@ -656,6 +668,12 @@ var de = map[string]string{
656 668 "group.tab.repos": "Repositories",
657 669 "group.tab.members": "Mitglieder",
658 670 "group.tab.settings": "Einstellungen",
671 "group.owner": "Eigentümer",
672 "own.transfer": "Eigentum übertragen",
673 "own.pick": "Neuer Eigentümer",
674 "own.type": "Benutzername",
675 "own.needMember": "Füge zuerst ein weiteres Mitglied hinzu.",
676 "own.confirm": "Das kann nicht rückgängig gemacht werden. Wenn du sicher bist, tippe den Benutzernamen '%s' unten noch einmal ein und klicke auf 'Eigentum übertragen'.",
659 677 "group.search": "Suchen",
660 678 "group.sort": "Name",
661 679 "group.direction": "Sortierrichtung",
@@ -906,6 +924,11 @@ var de = map[string]string{
906 924 "err.pathUser": "Pfad %s ist bereits ein Benutzer",
907 925 "err.pathGroup": "Pfad %s ist bereits eine Gruppe",
908 926 "err.ownerKind": "Eigentümer muss user oder group sein",
927 "err.ownerRole": "Der Eigentümer bleibt Maintainer. Übertrage das Eigentum, um das zu ändern.",
928 "err.ownerOnly": "Nur der Eigentümer kann das Eigentum übertragen.",
929 "err.ownerMember": "Dieser Benutzer ist kein Mitglied dieser Gruppe.",
930 "err.ownerSame": "Wähle ein anderes Mitglied.",
931 "err.ownerConfirm": "Tippe diesen Benutzernamen genau so.",
909 932 "err.visibility": "Sichtbarkeit muss public oder private sein",
910 933 "err.userGroupClash": "es gibt bereits eine Gruppe %s; persönliche Repositories wären dann nicht erreichbar",
911 934 "err.repoExists": "es gibt bereits ein Repository %s",
@@ -961,6 +984,7 @@ var de = map[string]string{
961 984 "flash.merged": "Zusammengeführt",
962 985 "flash.closed": "Geschlossen",
963 986 "flash.reopened": "Merge Request wieder geöffnet.",
987 "flash.owner": "Eigentum übertragen.",
964 988 "hook.push": "%s hat nach %s in %s gepusht",
965 989 "hook.mr": "Merge-Request !%s geöffnet: %s",
966 990 "hook.release": "Release %s von %s veröffentlicht",
@@ -1205,6 +1229,12 @@ var fr = map[string]string{
1205 1229 "group.tab.repos": "Dépôts",
1206 1230 "group.tab.members": "Membres",
1207 1231 "group.tab.settings": "Paramètres",
1232 "group.owner": "Propriétaire",
1233 "own.transfer": "Transférer la propriété",
1234 "own.pick": "Nouveau propriétaire",
1235 "own.type": "Nom d'utilisateur",
1236 "own.needMember": "Ajoute d'abord un autre membre.",
1237 "own.confirm": "Cela ne peut pas être annulé. Si tu es sûr, saisis à nouveau le nom d'utilisateur '%s' dans le champ ci-dessous et clique sur 'Transférer la propriété'.",
1208 1238 "group.search": "Rechercher",
1209 1239 "group.sort": "Nom",
1210 1240 "group.direction": "Sens du tri",
@@ -1455,6 +1485,11 @@ var fr = map[string]string{
1455 1485 "err.pathUser": "le chemin %s est déjà un utilisateur",
1456 1486 "err.pathGroup": "le chemin %s est déjà un groupe",
1457 1487 "err.ownerKind": "le propriétaire doit être user ou group",
1488 "err.ownerRole": "Le propriétaire reste maintainer. Transfère la propriété pour changer ça.",
1489 "err.ownerOnly": "Seul le propriétaire peut transférer la propriété.",
1490 "err.ownerMember": "Cet utilisateur n'est pas membre de ce groupe.",
1491 "err.ownerSame": "Choisis un autre membre.",
1492 "err.ownerConfirm": "Saisis ce nom d'utilisateur exactement.",
1458 1493 "err.visibility": "la visibilité doit être public ou private",
1459 1494 "err.userGroupClash": "un groupe %s existe déjà ; les dépôts personnels seraient alors inaccessibles",
1460 1495 "err.repoExists": "le dépôt %s existe déjà",
@@ -1510,6 +1545,7 @@ var fr = map[string]string{
1510 1545 "flash.merged": "Fusionné",
1511 1546 "flash.closed": "Fermé",
1512 1547 "flash.reopened": "Merge request rouverte.",
1548 "flash.owner": "Propriété transférée.",
1513 1549 "hook.push": "%s a poussé vers %s dans %s",
1514 1550 "hook.mr": "merge request !%s ouverte : %s",
1515 1551 "hook.release": "version %s de %s publiée",
@@ -107,6 +107,12 @@ var nl = map[string]string{
107 "group.tab.repos": "Repositories",
107 "group.tab.repos": "Repositories",
108 "group.tab.members": "Leden",
108 "group.tab.members": "Leden",
109 "group.tab.settings": "Instellingen",
109 "group.tab.settings": "Instellingen",
110 "group.owner": "Eigenaar",
111 "own.transfer": "Eigenaarsschap overdragen",
112 "own.pick": "Nieuwe eigenaar",
113 "own.type": "Gebruikersnaam",
114 "own.needMember": "Voeg eerst een ander lid toe.",
115 "own.confirm": "Dit kan niet ongedaan gemaakt worden. Weet je het zeker, typ dan nogmaals de gebruikersnaam '%s' in het tekstveld hieronder en klik op 'Eigenaarsschap overdragen'.",
110 "group.search": "Zoeken",
116 "group.search": "Zoeken",
111 "group.sort": "Naam",
117 "group.sort": "Naam",
112 "group.direction": "Sorteerrichting",
118 "group.direction": "Sorteerrichting",
@@ -357,6 +363,11 @@ var nl = map[string]string{
357 "err.pathUser": "pad %s is al een gebruiker",
363 "err.pathUser": "pad %s is al een gebruiker",
358 "err.pathGroup": "pad %s is al een groep",
364 "err.pathGroup": "pad %s is al een groep",
359 "err.ownerKind": "eigenaar moet user of group zijn",
365 "err.ownerKind": "eigenaar moet user of group zijn",
366 "err.ownerRole": "De eigenaar blijft beheerder. Draag het eigenaarschap over om dat te veranderen.",
367 "err.ownerOnly": "Alleen de eigenaar kan het eigenaarschap overdragen.",
368 "err.ownerMember": "Die gebruiker is geen lid van deze groep.",
369 "err.ownerSame": "Kies een ander lid.",
370 "err.ownerConfirm": "Typ die gebruikersnaam precies zo.",
360 "err.visibility": "zichtbaarheid moet public of private zijn",
371 "err.visibility": "zichtbaarheid moet public of private zijn",
361 "err.userGroupClash": "er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar",
372 "err.userGroupClash": "er bestaat al een groep %s; persoonlijke repositories zijn dan niet bereikbaar",
362 "err.repoExists": "er is al een repository %s",
373 "err.repoExists": "er is al een repository %s",
@@ -412,6 +423,7 @@ var nl = map[string]string{
412 "flash.merged": "Samengevoegd",
423 "flash.merged": "Samengevoegd",
413 "flash.closed": "Gesloten",
424 "flash.closed": "Gesloten",
414 "flash.reopened": "Merge request heropend.",
425 "flash.reopened": "Merge request heropend.",
426 "flash.owner": "Eigenaarschap overgedragen.",
415 "hook.push": "%s pushte naar %s in %s",
427 "hook.push": "%s pushte naar %s in %s",
416 "hook.mr": "merge request !%s geopend: %s",
428 "hook.mr": "merge request !%s geopend: %s",
417 "hook.release": "release %s van %s gepubliceerd",
429 "hook.release": "release %s van %s gepubliceerd",
@@ -656,6 +668,12 @@ var de = map[string]string{
656 "group.tab.repos": "Repositories",
668 "group.tab.repos": "Repositories",
657 "group.tab.members": "Mitglieder",
669 "group.tab.members": "Mitglieder",
658 "group.tab.settings": "Einstellungen",
670 "group.tab.settings": "Einstellungen",
671 "group.owner": "Eigentümer",
672 "own.transfer": "Eigentum übertragen",
673 "own.pick": "Neuer Eigentümer",
674 "own.type": "Benutzername",
675 "own.needMember": "Füge zuerst ein weiteres Mitglied hinzu.",
676 "own.confirm": "Das kann nicht rückgängig gemacht werden. Wenn du sicher bist, tippe den Benutzernamen '%s' unten noch einmal ein und klicke auf 'Eigentum übertragen'.",
659 "group.search": "Suchen",
677 "group.search": "Suchen",
660 "group.sort": "Name",
678 "group.sort": "Name",
661 "group.direction": "Sortierrichtung",
679 "group.direction": "Sortierrichtung",
@@ -906,6 +924,11 @@ var de = map[string]string{
906 "err.pathUser": "Pfad %s ist bereits ein Benutzer",
924 "err.pathUser": "Pfad %s ist bereits ein Benutzer",
907 "err.pathGroup": "Pfad %s ist bereits eine Gruppe",
925 "err.pathGroup": "Pfad %s ist bereits eine Gruppe",
908 "err.ownerKind": "Eigentümer muss user oder group sein",
926 "err.ownerKind": "Eigentümer muss user oder group sein",
927 "err.ownerRole": "Der Eigentümer bleibt Maintainer. Übertrage das Eigentum, um das zu ändern.",
928 "err.ownerOnly": "Nur der Eigentümer kann das Eigentum übertragen.",
929 "err.ownerMember": "Dieser Benutzer ist kein Mitglied dieser Gruppe.",
930 "err.ownerSame": "Wähle ein anderes Mitglied.",
931 "err.ownerConfirm": "Tippe diesen Benutzernamen genau so.",
909 "err.visibility": "Sichtbarkeit muss public oder private sein",
932 "err.visibility": "Sichtbarkeit muss public oder private sein",
910 "err.userGroupClash": "es gibt bereits eine Gruppe %s; persönliche Repositories wären dann nicht erreichbar",
933 "err.userGroupClash": "es gibt bereits eine Gruppe %s; persönliche Repositories wären dann nicht erreichbar",
911 "err.repoExists": "es gibt bereits ein Repository %s",
934 "err.repoExists": "es gibt bereits ein Repository %s",
@@ -961,6 +984,7 @@ var de = map[string]string{
961 "flash.merged": "Zusammengeführt",
984 "flash.merged": "Zusammengeführt",
962 "flash.closed": "Geschlossen",
985 "flash.closed": "Geschlossen",
963 "flash.reopened": "Merge Request wieder geöffnet.",
986 "flash.reopened": "Merge Request wieder geöffnet.",
987 "flash.owner": "Eigentum übertragen.",
964 "hook.push": "%s hat nach %s in %s gepusht",
988 "hook.push": "%s hat nach %s in %s gepusht",
965 "hook.mr": "Merge-Request !%s geöffnet: %s",
989 "hook.mr": "Merge-Request !%s geöffnet: %s",
966 "hook.release": "Release %s von %s veröffentlicht",
990 "hook.release": "Release %s von %s veröffentlicht",
@@ -1205,6 +1229,12 @@ var fr = map[string]string{
1205 "group.tab.repos": "Dépôts",
1229 "group.tab.repos": "Dépôts",
1206 "group.tab.members": "Membres",
1230 "group.tab.members": "Membres",
1207 "group.tab.settings": "Paramètres",
1231 "group.tab.settings": "Paramètres",
1232 "group.owner": "Propriétaire",
1233 "own.transfer": "Transférer la propriété",
1234 "own.pick": "Nouveau propriétaire",
1235 "own.type": "Nom d'utilisateur",
1236 "own.needMember": "Ajoute d'abord un autre membre.",
1237 "own.confirm": "Cela ne peut pas être annulé. Si tu es sûr, saisis à nouveau le nom d'utilisateur '%s' dans le champ ci-dessous et clique sur 'Transférer la propriété'.",
1208 "group.search": "Rechercher",
1238 "group.search": "Rechercher",
1209 "group.sort": "Nom",
1239 "group.sort": "Nom",
1210 "group.direction": "Sens du tri",
1240 "group.direction": "Sens du tri",
@@ -1455,6 +1485,11 @@ var fr = map[string]string{
1455 "err.pathUser": "le chemin %s est déjà un utilisateur",
1485 "err.pathUser": "le chemin %s est déjà un utilisateur",
1456 "err.pathGroup": "le chemin %s est déjà un groupe",
1486 "err.pathGroup": "le chemin %s est déjà un groupe",
1457 "err.ownerKind": "le propriétaire doit être user ou group",
1487 "err.ownerKind": "le propriétaire doit être user ou group",
1488 "err.ownerRole": "Le propriétaire reste maintainer. Transfère la propriété pour changer ça.",
1489 "err.ownerOnly": "Seul le propriétaire peut transférer la propriété.",
1490 "err.ownerMember": "Cet utilisateur n'est pas membre de ce groupe.",
1491 "err.ownerSame": "Choisis un autre membre.",
1492 "err.ownerConfirm": "Saisis ce nom d'utilisateur exactement.",
1458 "err.visibility": "la visibilité doit être public ou private",
1493 "err.visibility": "la visibilité doit être public ou private",
1459 "err.userGroupClash": "un groupe %s existe déjà ; les dépôts personnels seraient alors inaccessibles",
1494 "err.userGroupClash": "un groupe %s existe déjà ; les dépôts personnels seraient alors inaccessibles",
1460 "err.repoExists": "le dépôt %s existe déjà",
1495 "err.repoExists": "le dépôt %s existe déjà",
@@ -1510,6 +1545,7 @@ var fr = map[string]string{
1510 "flash.merged": "Fusionné",
1545 "flash.merged": "Fusionné",
1511 "flash.closed": "Fermé",
1546 "flash.closed": "Fermé",
1512 "flash.reopened": "Merge request rouverte.",
1547 "flash.reopened": "Merge request rouverte.",
1548 "flash.owner": "Propriété transférée.",
1513 "hook.push": "%s a poussé vers %s dans %s",
1549 "hook.push": "%s a poussé vers %s dans %s",
1514 "hook.mr": "merge request !%s ouverte : %s",
1550 "hook.mr": "merge request !%s ouverte : %s",
1515 "hook.release": "version %s de %s publiée",
1551 "hook.release": "version %s de %s publiée",
internal/server/owner.go added +48 −0
@@ -0,0 +1,48 @@
1 package server
2
3 import (
4 "net/http"
5 "strings"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8 "gitlab.com/Timfa/bluegit/internal/store"
9 )
10
11 func (s *Server) transferGroup(w http.ResponseWriter, r *http.Request) {
12 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
13 if !ok || !s.csrfOK(w, r) {
14 return
15 }
16 p := s.who(r)
17 back := "/groups/" + g.Path + "?tab=settings"
18 if !p.OK || p.User.ID != g.OwnerID {
19 http.Error(w, s.tr(r, "err.ownerOnly"), http.StatusForbidden)
20 return
21 }
22 username := strings.ToLower(strings.TrimSpace(r.FormValue("username")))
23 if username == "" || r.FormValue("confirm") != username {
24 s.redirect(w, r, back, "", s.tr(r, "err.ownerConfirm"))
25 return
26 }
27 to, err := s.Store.UserByUsername(r.Context(), username)
28 if err != nil {
29 s.redirect(w, r, back, "", s.tr(r, "err.ownerMember"))
30 return
31 }
32 if err := s.Store.TransferGroupOwner(r.Context(), g.ID, p.User.ID, to.ID); err != nil {
33 s.redirect(w, r, back, "", s.trErr(r, err))
34 return
35 }
36 s.redirect(w, r, back, s.tr(r, "flash.owner"), "")
37 }
38
39 func groupCandidates(members []store.Member, ownerID int64) []store.Member {
40 var out []store.Member
41 for _, m := range members {
42 if m.Pending || m.UserID == 0 || m.UserID == ownerID {
43 continue
44 }
45 out = append(out, m)
46 }
47 return out
48 }
@@ -0,0 +1,48 @@
1package server
2
3import (
4 "net/http"
5 "strings"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8 "gitlab.com/Timfa/bluegit/internal/store"
9)
10
11func (s *Server) transferGroup(w http.ResponseWriter, r *http.Request) {
12 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
13 if !ok || !s.csrfOK(w, r) {
14 return
15 }
16 p := s.who(r)
17 back := "/groups/" + g.Path + "?tab=settings"
18 if !p.OK || p.User.ID != g.OwnerID {
19 http.Error(w, s.tr(r, "err.ownerOnly"), http.StatusForbidden)
20 return
21 }
22 username := strings.ToLower(strings.TrimSpace(r.FormValue("username")))
23 if username == "" || r.FormValue("confirm") != username {
24 s.redirect(w, r, back, "", s.tr(r, "err.ownerConfirm"))
25 return
26 }
27 to, err := s.Store.UserByUsername(r.Context(), username)
28 if err != nil {
29 s.redirect(w, r, back, "", s.tr(r, "err.ownerMember"))
30 return
31 }
32 if err := s.Store.TransferGroupOwner(r.Context(), g.ID, p.User.ID, to.ID); err != nil {
33 s.redirect(w, r, back, "", s.trErr(r, err))
34 return
35 }
36 s.redirect(w, r, back, s.tr(r, "flash.owner"), "")
37}
38
39func groupCandidates(members []store.Member, ownerID int64) []store.Member {
40 var out []store.Member
41 for _, m := range members {
42 if m.Pending || m.UserID == 0 || m.UserID == ownerID {
43 continue
44 }
45 out = append(out, m)
46 }
47 return out
48}
internal/server/owner_test.go added +122 −0
@@ -0,0 +1,122 @@
1 package server
2
3 import (
4 "context"
5 "html"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 func TestTransferOwnershipModal(t *testing.T) {
19 storage := t.TempDir()
20 st, err := store.Open(t.TempDir()+"/bluegit.db", bytes32())
21 if err != nil {
22 t.Fatal(err)
23 }
24 t.Cleanup(func() { _ = st.Close() })
25 _ = storage
26 cfg := config.Config{
27 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: t.TempDir(),
28 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
29 Git: config.Git{Binary: "git", DefaultBranch: "master"},
30 }
31 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
32 ts := httptest.NewServer(srv.Handler())
33 t.Cleanup(ts.Close)
34 jar, _ := cookiejar.New(nil)
35 tim := &http.Client{Jar: jar}
36 res, err := tim.Get(ts.URL + "/login")
37 if err != nil {
38 t.Fatal(err)
39 }
40 page := read(t, res)
41 res, err = tim.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, page)}, "language": {"nl"}})
42 if err != nil {
43 t.Fatal(err)
44 }
45 page = read(t, res)
46 res, err = tim.PostForm(ts.URL+"/new/group", url.Values{
47 "csrf": {csrfOf(t, page)}, "name": {"crew"}, "default_role": {"developer"},
48 })
49 if err != nil {
50 t.Fatal(err)
51 }
52 page = read(t, res)
53 if !strings.Contains(page, "/groups/crew") && !strings.Contains(page, "crew") {
54 t.Fatalf("groep:\n%s", page)
55 }
56 ctx := context.Background()
57 if _, err := st.UpsertUser(ctx, 2, "ada", "", false); err != nil {
58 t.Fatal(err)
59 }
60 res, err = tim.Get(ts.URL + "/groups/crew?tab=settings")
61 if err != nil {
62 t.Fatal(err)
63 }
64 page = read(t, res)
65 res, err = tim.PostForm(ts.URL+"/groups/crew/members", url.Values{
66 "csrf": {csrfOf(t, page)}, "username": {"ada"}, "role": {"developer"},
67 })
68 if err != nil {
69 t.Fatal(err)
70 }
71 page = read(t, res)
72 res, err = tim.Get(ts.URL + "/groups/crew?tab=settings")
73 if err != nil {
74 t.Fatal(err)
75 }
76 page = read(t, res)
77 want := "Dit kan niet ongedaan gemaakt worden. Weet je het zeker, typ dan nogmaals de gebruikersnaam 'ada' in het tekstveld hieronder en klik op 'Eigenaarsschap overdragen'."
78 shown := html.UnescapeString(page)
79 if !strings.Contains(shown, want) || !strings.Contains(page, "danger-modal") || !strings.Contains(page, "disabled") {
80 t.Fatalf("modal:\n%s", page)
81 }
82 res, err = tim.PostForm(ts.URL+"/groups/crew/owner", url.Values{
83 "csrf": {csrfOf(t, page)}, "username": {"ada"}, "confirm": {"adaa"},
84 })
85 if err != nil {
86 t.Fatal(err)
87 }
88 page = read(t, res)
89 if !strings.Contains(page, "Typ die gebruikersnaam precies zo.") {
90 t.Fatalf("verkeerde naam:\n%s", page)
91 }
92 g, err := st.GroupByPath(ctx, "crew")
93 if err != nil {
94 t.Fatal(err)
95 }
96 timUser, err := st.UserByUsername(ctx, "tim")
97 if err != nil || g.OwnerID != timUser.ID {
98 t.Fatalf("eigenaar veranderde te vroeg: %d", g.OwnerID)
99 }
100 res, err = tim.PostForm(ts.URL+"/groups/crew/owner", url.Values{
101 "csrf": {csrfOf(t, page)}, "username": {"ada"}, "confirm": {"ada"},
102 })
103 if err != nil {
104 t.Fatal(err)
105 }
106 page = read(t, res)
107 if !strings.Contains(page, "Eigenaarschap overgedragen.") {
108 t.Fatalf("overdracht:\n%s", page)
109 }
110 g, err = st.GroupByPath(ctx, "crew")
111 if err != nil {
112 t.Fatal(err)
113 }
114 ada, err := st.UserByUsername(ctx, "ada")
115 if err != nil || g.OwnerID != ada.ID {
116 t.Fatalf("ada is eigenaar: %d %v", g.OwnerID, err)
117 }
118 role, err := st.GroupRole(ctx, g.ID, timUser.ID)
119 if err != nil || role != "maintainer" {
120 t.Fatalf("oude eigenaar: %s %v", role, err)
121 }
122 }
@@ -0,0 +1,122 @@
1package server
2
3import (
4 "context"
5 "html"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func TestTransferOwnershipModal(t *testing.T) {
19 storage := t.TempDir()
20 st, err := store.Open(t.TempDir()+"/bluegit.db", bytes32())
21 if err != nil {
22 t.Fatal(err)
23 }
24 t.Cleanup(func() { _ = st.Close() })
25 _ = storage
26 cfg := config.Config{
27 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: t.TempDir(),
28 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
29 Git: config.Git{Binary: "git", DefaultBranch: "master"},
30 }
31 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
32 ts := httptest.NewServer(srv.Handler())
33 t.Cleanup(ts.Close)
34 jar, _ := cookiejar.New(nil)
35 tim := &http.Client{Jar: jar}
36 res, err := tim.Get(ts.URL + "/login")
37 if err != nil {
38 t.Fatal(err)
39 }
40 page := read(t, res)
41 res, err = tim.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, page)}, "language": {"nl"}})
42 if err != nil {
43 t.Fatal(err)
44 }
45 page = read(t, res)
46 res, err = tim.PostForm(ts.URL+"/new/group", url.Values{
47 "csrf": {csrfOf(t, page)}, "name": {"crew"}, "default_role": {"developer"},
48 })
49 if err != nil {
50 t.Fatal(err)
51 }
52 page = read(t, res)
53 if !strings.Contains(page, "/groups/crew") && !strings.Contains(page, "crew") {
54 t.Fatalf("groep:\n%s", page)
55 }
56 ctx := context.Background()
57 if _, err := st.UpsertUser(ctx, 2, "ada", "", false); err != nil {
58 t.Fatal(err)
59 }
60 res, err = tim.Get(ts.URL + "/groups/crew?tab=settings")
61 if err != nil {
62 t.Fatal(err)
63 }
64 page = read(t, res)
65 res, err = tim.PostForm(ts.URL+"/groups/crew/members", url.Values{
66 "csrf": {csrfOf(t, page)}, "username": {"ada"}, "role": {"developer"},
67 })
68 if err != nil {
69 t.Fatal(err)
70 }
71 page = read(t, res)
72 res, err = tim.Get(ts.URL + "/groups/crew?tab=settings")
73 if err != nil {
74 t.Fatal(err)
75 }
76 page = read(t, res)
77 want := "Dit kan niet ongedaan gemaakt worden. Weet je het zeker, typ dan nogmaals de gebruikersnaam 'ada' in het tekstveld hieronder en klik op 'Eigenaarsschap overdragen'."
78 shown := html.UnescapeString(page)
79 if !strings.Contains(shown, want) || !strings.Contains(page, "danger-modal") || !strings.Contains(page, "disabled") {
80 t.Fatalf("modal:\n%s", page)
81 }
82 res, err = tim.PostForm(ts.URL+"/groups/crew/owner", url.Values{
83 "csrf": {csrfOf(t, page)}, "username": {"ada"}, "confirm": {"adaa"},
84 })
85 if err != nil {
86 t.Fatal(err)
87 }
88 page = read(t, res)
89 if !strings.Contains(page, "Typ die gebruikersnaam precies zo.") {
90 t.Fatalf("verkeerde naam:\n%s", page)
91 }
92 g, err := st.GroupByPath(ctx, "crew")
93 if err != nil {
94 t.Fatal(err)
95 }
96 timUser, err := st.UserByUsername(ctx, "tim")
97 if err != nil || g.OwnerID != timUser.ID {
98 t.Fatalf("eigenaar veranderde te vroeg: %d", g.OwnerID)
99 }
100 res, err = tim.PostForm(ts.URL+"/groups/crew/owner", url.Values{
101 "csrf": {csrfOf(t, page)}, "username": {"ada"}, "confirm": {"ada"},
102 })
103 if err != nil {
104 t.Fatal(err)
105 }
106 page = read(t, res)
107 if !strings.Contains(page, "Eigenaarschap overgedragen.") {
108 t.Fatalf("overdracht:\n%s", page)
109 }
110 g, err = st.GroupByPath(ctx, "crew")
111 if err != nil {
112 t.Fatal(err)
113 }
114 ada, err := st.UserByUsername(ctx, "ada")
115 if err != nil || g.OwnerID != ada.ID {
116 t.Fatalf("ada is eigenaar: %d %v", g.OwnerID, err)
117 }
118 role, err := st.GroupRole(ctx, g.ID, timUser.ID)
119 if err != nil || role != "maintainer" {
120 t.Fatalf("oude eigenaar: %s %v", role, err)
121 }
122}
internal/server/server.go +3 −0
@@ -91,6 +91,7 @@ func (s *Server) Handler() http.Handler {
91 91 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
92 92 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
93 93 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
94 mux.HandleFunc("POST /groups/{path}/owner", s.transferGroup)
94 95 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
95 96 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
96 97 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
@@ -452,6 +453,8 @@ type View struct {
452 453 CanDismiss bool
453 454 CanClose bool
454 455 CanReopen bool
456 IsOwner bool
457 Candidates []store.Member
455 458 Diff string
456 459 DiffFiles []DiffFileView
457 460 Pipes []store.Pipeline
@@ -91,6 +91,7 @@ func (s *Server) Handler() http.Handler {
91 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
91 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
92 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
92 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
93 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
93 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
94 mux.HandleFunc("POST /groups/{path}/owner", s.transferGroup)
94 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
95 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
95 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
96 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
96 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
97 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
@@ -452,6 +453,8 @@ type View struct {
452 CanDismiss bool
453 CanDismiss bool
453 CanClose bool
454 CanClose bool
454 CanReopen bool
455 CanReopen bool
456 IsOwner bool
457 Candidates []store.Member
455 Diff string
458 Diff string
456 DiffFiles []DiffFileView
459 DiffFiles []DiffFileView
457 Pipes []store.Pipeline
460 Pipes []store.Pipeline
internal/server/settings_handlers.go +4 −0
@@ -405,6 +405,10 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
405 405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
406 406 v.Hooks = s.hookViews(r, "group", g.ID)
407 407 s.fillGroupApproval(r, &v, g)
408 if v.User != nil && v.User.ID == g.OwnerID {
409 v.IsOwner = true
410 v.Candidates = groupCandidates(v.Members, g.OwnerID)
411 }
408 412 }
409 413 s.render(w, "group", v)
410 414 }
@@ -405,6 +405,10 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
406 v.Hooks = s.hookViews(r, "group", g.ID)
406 v.Hooks = s.hookViews(r, "group", g.ID)
407 s.fillGroupApproval(r, &v, g)
407 s.fillGroupApproval(r, &v, g)
408 if v.User != nil && v.User.ID == g.OwnerID {
409 v.IsOwner = true
410 v.Candidates = groupCandidates(v.Members, g.OwnerID)
411 }
408 }
412 }
409 s.render(w, "group", v)
413 s.render(w, "group", v)
410}
414}
internal/server/static/style.css +12 −0
@@ -375,6 +375,18 @@ svg.ico { width: 14px; height: 14px; flex: none; }
375 375 }
376 376 .stages { display: flex; align-items: center; }
377 377 .mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }
378 .danger-modal {
379 border: 6px solid #a31212;
380 background: #fde8e8;
381 color: #6d1212;
382 width: min(92vw, 52rem);
383 padding: 2.2rem 2rem;
384 border-radius: 16px;
385 }
386 .danger-modal::backdrop { background: rgba(80, 8, 8, 0.55); }
387 .danger-modal p { font-size: 1.7rem; line-height: 1.45; margin: 0 0 1.2rem; }
388 .danger-modal [data-transfer-submit] { background: #a31212; color: #fff; }
389 .danger-modal [data-transfer-submit]:disabled { opacity: 0.45; }
378 390 .stage { position: relative; display: flex; align-items: center; }
379 391 .stage + .stage::before { content: ""; width: 14px; height: 2px; background: #c5d0dc; margin: 0 2px; }
380 392 button.stage-dot {
@@ -375,6 +375,18 @@ svg.ico { width: 14px; height: 14px; flex: none; }
375}
375}
376.stages { display: flex; align-items: center; }
376.stages { display: flex; align-items: center; }
377.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }
377.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }
378.danger-modal {
379 border: 6px solid #a31212;
380 background: #fde8e8;
381 color: #6d1212;
382 width: min(92vw, 52rem);
383 padding: 2.2rem 2rem;
384 border-radius: 16px;
385}
386.danger-modal::backdrop { background: rgba(80, 8, 8, 0.55); }
387.danger-modal p { font-size: 1.7rem; line-height: 1.45; margin: 0 0 1.2rem; }
388.danger-modal [data-transfer-submit] { background: #a31212; color: #fff; }
389.danger-modal [data-transfer-submit]:disabled { opacity: 0.45; }
378.stage { position: relative; display: flex; align-items: center; }
390.stage { position: relative; display: flex; align-items: center; }
379.stage + .stage::before { content: ""; width: 14px; height: 2px; background: #c5d0dc; margin: 0 2px; }
391.stage + .stage::before { content: ""; width: 14px; height: 2px; background: #c5d0dc; margin: 0 2px; }
380button.stage-dot {
392button.stage-dot {
internal/server/static/transfer.js added +43 −0
@@ -0,0 +1,43 @@
1 (function () {
2 var open = document.querySelector("[data-transfer-open]");
3 var dialog = document.querySelector("[data-transfer-dialog]");
4 if (!open || !dialog) {
5 return;
6 }
7 var copy = dialog.querySelector("[data-transfer-copy]");
8 var user = dialog.querySelector("[data-transfer-user]");
9 var input = dialog.querySelector("[data-transfer-confirm]");
10 var button = dialog.querySelector("[data-transfer-submit]");
11 var cancel = dialog.querySelector("[data-transfer-cancel]");
12 var pattern = copy ? copy.getAttribute("data-pattern") : "";
13
14 function sync() {
15 var name = user ? user.value : "";
16 if (copy) {
17 copy.textContent = pattern.replace("%s", name);
18 }
19 if (button) {
20 button.disabled = !input || input.value !== name;
21 }
22 }
23
24 open.addEventListener("click", function () {
25 if (input) {
26 input.value = "";
27 }
28 sync();
29 dialog.showModal();
30 });
31 if (user) {
32 user.addEventListener("change", sync);
33 }
34 if (input) {
35 input.addEventListener("input", sync);
36 }
37 if (cancel) {
38 cancel.addEventListener("click", function () {
39 dialog.close();
40 });
41 }
42 sync();
43 })();
@@ -0,0 +1,43 @@
1(function () {
2 var open = document.querySelector("[data-transfer-open]");
3 var dialog = document.querySelector("[data-transfer-dialog]");
4 if (!open || !dialog) {
5 return;
6 }
7 var copy = dialog.querySelector("[data-transfer-copy]");
8 var user = dialog.querySelector("[data-transfer-user]");
9 var input = dialog.querySelector("[data-transfer-confirm]");
10 var button = dialog.querySelector("[data-transfer-submit]");
11 var cancel = dialog.querySelector("[data-transfer-cancel]");
12 var pattern = copy ? copy.getAttribute("data-pattern") : "";
13
14 function sync() {
15 var name = user ? user.value : "";
16 if (copy) {
17 copy.textContent = pattern.replace("%s", name);
18 }
19 if (button) {
20 button.disabled = !input || input.value !== name;
21 }
22 }
23
24 open.addEventListener("click", function () {
25 if (input) {
26 input.value = "";
27 }
28 sync();
29 dialog.showModal();
30 });
31 if (user) {
32 user.addEventListener("change", sync);
33 }
34 if (input) {
35 input.addEventListener("input", sync);
36 }
37 if (cancel) {
38 cancel.addEventListener("click", function () {
39 dialog.close();
40 });
41 }
42 sync();
43})();
internal/server/templates/collab.html +25 −2
@@ -575,8 +575,8 @@
575 575 </div>
576 576 </form>
577 577 {{end}}
578 <ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
579 {{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}}
578 <ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
579 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<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}}
580 580 </li>{{end}}</ul>
581 581 {{else if eq .Tab "settings"}}
582 582 <form class="panel" method="post" action="/groups/{{.Group.Path}}/settings">
@@ -618,6 +618,29 @@
618 618 <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>
619 619 </li>{{end}}</ul>
620 620 <p class="muted">{{t "set.valuesHidden"}}</p>
621 {{if .IsOwner}}
622 <h2>{{t "own.transfer"}}</h2>
623 {{if .Candidates}}
624 <button type="button" data-transfer-open>{{t "own.transfer"}}</button>
625 <dialog class="danger-modal" data-transfer-dialog>
626 <form method="post" action="/groups/{{.Group.Path}}/owner">
627 <input type="hidden" name="csrf" value="{{.CSRF}}">
628 <p data-transfer-copy data-pattern="{{t "own.confirm" "%s"}}">{{t "own.confirm" (index .Candidates 0).Username}}</p>
629 <label>{{t "own.pick"}}
630 <select name="username" data-transfer-user>
631 {{range .Candidates}}<option value="{{.Username}}">{{.Username}}</option>{{end}}
632 </select>
633 </label>
634 <label>{{t "own.type"}} <input name="confirm" data-transfer-confirm autocomplete="off"></label>
635 <div class="row">
636 <button type="submit" data-transfer-submit disabled>{{t "own.transfer"}}</button>
637 <button type="button" class="ghost" data-transfer-cancel>{{t "action.cancel"}}</button>
638 </div>
639 </form>
640 </dialog>
641 <script src="/assets/transfer.js"></script>
642 {{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
643 {{end}}
621 644 <h2>{{t "set.webhooks"}}</h2>
622 645 <p class="muted">{{t "group.secretsNote"}}</p>
623 646 {{template "webhookform" .}}
@@ -575,8 +575,8 @@
575 </div>
575 </div>
576</form>
576</form>
577{{end}}
577{{end}}
578<ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
578<ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
579 {{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}}
579 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<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}}
580</li>{{end}}</ul>
580</li>{{end}}</ul>
581{{else if eq .Tab "settings"}}
581{{else if eq .Tab "settings"}}
582<form class="panel" method="post" action="/groups/{{.Group.Path}}/settings">
582<form class="panel" method="post" action="/groups/{{.Group.Path}}/settings">
@@ -618,6 +618,29 @@
618 <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>
618 <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>
619</li>{{end}}</ul>
619</li>{{end}}</ul>
620<p class="muted">{{t "set.valuesHidden"}}</p>
620<p class="muted">{{t "set.valuesHidden"}}</p>
621{{if .IsOwner}}
622<h2>{{t "own.transfer"}}</h2>
623{{if .Candidates}}
624<button type="button" data-transfer-open>{{t "own.transfer"}}</button>
625<dialog class="danger-modal" data-transfer-dialog>
626 <form method="post" action="/groups/{{.Group.Path}}/owner">
627 <input type="hidden" name="csrf" value="{{.CSRF}}">
628 <p data-transfer-copy data-pattern="{{t "own.confirm" "%s"}}">{{t "own.confirm" (index .Candidates 0).Username}}</p>
629 <label>{{t "own.pick"}}
630 <select name="username" data-transfer-user>
631 {{range .Candidates}}<option value="{{.Username}}">{{.Username}}</option>{{end}}
632 </select>
633 </label>
634 <label>{{t "own.type"}} <input name="confirm" data-transfer-confirm autocomplete="off"></label>
635 <div class="row">
636 <button type="submit" data-transfer-submit disabled>{{t "own.transfer"}}</button>
637 <button type="button" class="ghost" data-transfer-cancel>{{t "action.cancel"}}</button>
638 </div>
639 </form>
640</dialog>
641<script src="/assets/transfer.js"></script>
642{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
643{{end}}
621<h2>{{t "set.webhooks"}}</h2>
644<h2>{{t "set.webhooks"}}</h2>
622<p class="muted">{{t "group.secretsNote"}}</p>
645<p class="muted">{{t "group.secretsNote"}}</p>
623{{template "webhookform" .}}
646{{template "webhookform" .}}
internal/store/owner.go added +49 −0
@@ -0,0 +1,49 @@
1 package store
2
3 import (
4 "context"
5 "database/sql"
6 "errors"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/i18n"
10 )
11
12 // TransferGroupOwner maakt toID de eigenaar. De vorige eigenaar blijft beheerder.
13 // toID moet al lid zijn.
14 func (s *Store) TransferGroupOwner(ctx context.Context, groupID, fromID, toID int64) error {
15 if fromID == 0 || toID == 0 || fromID == toID {
16 return i18n.E("err.ownerSame")
17 }
18 g, err := s.GroupByID(ctx, groupID)
19 if err != nil {
20 return err
21 }
22 if g.OwnerID != fromID {
23 return i18n.E("err.ownerOnly")
24 }
25 var role string
26 err = s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, groupID, toID).Scan(&role)
27 if errors.Is(err, sql.ErrNoRows) {
28 return i18n.E("err.ownerMember")
29 }
30 if err != nil {
31 return err
32 }
33 tx, err := s.db.BeginTx(ctx, nil)
34 if err != nil {
35 return err
36 }
37 defer func() { _ = tx.Rollback() }()
38 if _, err := tx.ExecContext(ctx, `UPDATE groups SET owner_id = ? WHERE id = ?`, toID, groupID); err != nil {
39 return err
40 }
41 if _, err := tx.ExecContext(ctx, `INSERT INTO group_members (group_id, user_id, role) VALUES (?, ?, ?)
42 ON CONFLICT(group_id, user_id) DO UPDATE SET role = ?`, groupID, fromID, string(access.RoleMaintainer), string(access.RoleMaintainer)); err != nil {
43 return err
44 }
45 if _, err := tx.ExecContext(ctx, `UPDATE group_members SET role = ? WHERE group_id = ? AND user_id = ?`, string(access.RoleMaintainer), groupID, toID); err != nil {
46 return err
47 }
48 return tx.Commit()
49 }
@@ -0,0 +1,49 @@
1package store
2
3import (
4 "context"
5 "database/sql"
6 "errors"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/i18n"
10)
11
12// TransferGroupOwner maakt toID de eigenaar. De vorige eigenaar blijft beheerder.
13// toID moet al lid zijn.
14func (s *Store) TransferGroupOwner(ctx context.Context, groupID, fromID, toID int64) error {
15 if fromID == 0 || toID == 0 || fromID == toID {
16 return i18n.E("err.ownerSame")
17 }
18 g, err := s.GroupByID(ctx, groupID)
19 if err != nil {
20 return err
21 }
22 if g.OwnerID != fromID {
23 return i18n.E("err.ownerOnly")
24 }
25 var role string
26 err = s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, groupID, toID).Scan(&role)
27 if errors.Is(err, sql.ErrNoRows) {
28 return i18n.E("err.ownerMember")
29 }
30 if err != nil {
31 return err
32 }
33 tx, err := s.db.BeginTx(ctx, nil)
34 if err != nil {
35 return err
36 }
37 defer func() { _ = tx.Rollback() }()
38 if _, err := tx.ExecContext(ctx, `UPDATE groups SET owner_id = ? WHERE id = ?`, toID, groupID); err != nil {
39 return err
40 }
41 if _, err := tx.ExecContext(ctx, `INSERT INTO group_members (group_id, user_id, role) VALUES (?, ?, ?)
42 ON CONFLICT(group_id, user_id) DO UPDATE SET role = ?`, groupID, fromID, string(access.RoleMaintainer), string(access.RoleMaintainer)); err != nil {
43 return err
44 }
45 if _, err := tx.ExecContext(ctx, `UPDATE group_members SET role = ? WHERE group_id = ? AND user_id = ?`, string(access.RoleMaintainer), groupID, toID); err != nil {
46 return err
47 }
48 return tx.Commit()
49}
internal/store/owner_test.go added +67 −0
@@ -0,0 +1,67 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8 )
9
10 func TestOwnerStaysMaintainerAndCanTransfer(t *testing.T) {
11 s := openStore(t)
12 ctx := context.Background()
13 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
14 if err != nil {
15 t.Fatal(err)
16 }
17 ada, err := s.UpsertUser(ctx, 2, "ada", "", false)
18 if err != nil {
19 t.Fatal(err)
20 }
21 g, err := s.CreateGroup(ctx, tim.ID, "Crew", "crew", "", access.RoleDeveloper)
22 if err != nil {
23 t.Fatal(err)
24 }
25 repo, err := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
26 if err != nil {
27 t.Fatal(err)
28 }
29 if err := s.SetMember(ctx, "group", g.ID, "ada", access.RoleDeveloper); err != nil {
30 t.Fatal(err)
31 }
32 if err := s.SetMember(ctx, "group", g.ID, "tim", access.RoleDeveloper); err == nil {
33 t.Fatal("eigenaar laten zakken hoort te falen")
34 }
35 if err := s.RemoveMember(ctx, "group", g.ID, "tim"); err == nil {
36 t.Fatal("eigenaar verwijderen hoort te falen")
37 }
38 if _, err := s.db.ExecContext(ctx, `UPDATE group_members SET role = 'developer' WHERE group_id = ? AND user_id = ?`, g.ID, tim.ID); err != nil {
39 t.Fatal(err)
40 }
41 role, err := s.GroupRole(ctx, g.ID, tim.ID)
42 if err != nil || role != access.RoleMaintainer {
43 t.Fatalf("eigenaar blijft beheerder: %s %v", role, err)
44 }
45 got, err := s.EffectiveRole(ctx, tim.ID, repo.ID)
46 if err != nil || got != access.RoleMaintainer {
47 t.Fatalf("projectrol: %s %v", got, err)
48 }
49 if err := s.TransferGroupOwner(ctx, g.ID, tim.ID, ada.ID); err != nil {
50 t.Fatal(err)
51 }
52 g, err = s.GroupByID(ctx, g.ID)
53 if err != nil || g.OwnerID != ada.ID {
54 t.Fatalf("nieuwe eigenaar: %+v %v", g, err)
55 }
56 role, err = s.GroupRole(ctx, g.ID, tim.ID)
57 if err != nil || role != access.RoleMaintainer {
58 t.Fatalf("oude eigenaar is beheerder: %s %v", role, err)
59 }
60 if _, err := s.db.ExecContext(ctx, `UPDATE group_members SET role = 'readonly' WHERE group_id = ? AND user_id = ?`, g.ID, ada.ID); err != nil {
61 t.Fatal(err)
62 }
63 role, err = s.GroupRole(ctx, g.ID, ada.ID)
64 if err != nil || role != access.RoleMaintainer {
65 t.Fatalf("nieuwe eigenaar blijft beheerder: %s %v", role, err)
66 }
67 }
@@ -0,0 +1,67 @@
1package store
2
3import (
4 "context"
5 "testing"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8)
9
10func TestOwnerStaysMaintainerAndCanTransfer(t *testing.T) {
11 s := openStore(t)
12 ctx := context.Background()
13 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
14 if err != nil {
15 t.Fatal(err)
16 }
17 ada, err := s.UpsertUser(ctx, 2, "ada", "", false)
18 if err != nil {
19 t.Fatal(err)
20 }
21 g, err := s.CreateGroup(ctx, tim.ID, "Crew", "crew", "", access.RoleDeveloper)
22 if err != nil {
23 t.Fatal(err)
24 }
25 repo, err := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
26 if err != nil {
27 t.Fatal(err)
28 }
29 if err := s.SetMember(ctx, "group", g.ID, "ada", access.RoleDeveloper); err != nil {
30 t.Fatal(err)
31 }
32 if err := s.SetMember(ctx, "group", g.ID, "tim", access.RoleDeveloper); err == nil {
33 t.Fatal("eigenaar laten zakken hoort te falen")
34 }
35 if err := s.RemoveMember(ctx, "group", g.ID, "tim"); err == nil {
36 t.Fatal("eigenaar verwijderen hoort te falen")
37 }
38 if _, err := s.db.ExecContext(ctx, `UPDATE group_members SET role = 'developer' WHERE group_id = ? AND user_id = ?`, g.ID, tim.ID); err != nil {
39 t.Fatal(err)
40 }
41 role, err := s.GroupRole(ctx, g.ID, tim.ID)
42 if err != nil || role != access.RoleMaintainer {
43 t.Fatalf("eigenaar blijft beheerder: %s %v", role, err)
44 }
45 got, err := s.EffectiveRole(ctx, tim.ID, repo.ID)
46 if err != nil || got != access.RoleMaintainer {
47 t.Fatalf("projectrol: %s %v", got, err)
48 }
49 if err := s.TransferGroupOwner(ctx, g.ID, tim.ID, ada.ID); err != nil {
50 t.Fatal(err)
51 }
52 g, err = s.GroupByID(ctx, g.ID)
53 if err != nil || g.OwnerID != ada.ID {
54 t.Fatalf("nieuwe eigenaar: %+v %v", g, err)
55 }
56 role, err = s.GroupRole(ctx, g.ID, tim.ID)
57 if err != nil || role != access.RoleMaintainer {
58 t.Fatalf("oude eigenaar is beheerder: %s %v", role, err)
59 }
60 if _, err := s.db.ExecContext(ctx, `UPDATE group_members SET role = 'readonly' WHERE group_id = ? AND user_id = ?`, g.ID, ada.ID); err != nil {
61 t.Fatal(err)
62 }
63 role, err = s.GroupRole(ctx, g.ID, ada.ID)
64 if err != nil || role != access.RoleMaintainer {
65 t.Fatalf("nieuwe eigenaar blijft beheerder: %s %v", role, err)
66 }
67}
internal/store/repos.go +39 −17
@@ -22,6 +22,7 @@ type Group struct {
22 22 DefaultRole access.Role
23 23 LogoMIME string
24 24 CreatedBy int64
25 OwnerID int64
25 26 CreatedAt time.Time
26 27 }
27 28
@@ -68,8 +69,8 @@ func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, desc
68 69 if err := s.ensurePathFree(ctx, path); err != nil {
69 70 return Group{}, err
70 71 }
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())
72 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, visibility, default_role, created_by, owner_id, created_at) VALUES (?, ?, ?, 'private', ?, ?, ?, ?)`,
73 name, path, strings.TrimSpace(description), string(defaultRole), creator, creator, now())
73 74 if err != nil {
74 75 return Group{}, err
75 76 }
@@ -109,12 +110,12 @@ func (s *Store) GroupByID(ctx context.Context, id int64) (Group, error) {
109 110 return scanGroup(row)
110 111 }
111 112
112 const groupCols = `id, name, path, description, created_by, created_at, visibility, default_role, logo_mime`
113 const groupCols = `id, name, path, description, created_by, created_at, visibility, default_role, logo_mime, owner_id`
113 114
114 func scanGroup(row *sql.Row) (Group, error) {
115 func scanGroup(row scanner) (Group, error) {
115 116 var g Group
116 117 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 {
118 if err := row.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created, &g.Visibility, &role, &g.LogoMIME, &g.OwnerID); err != nil {
118 119 if errors.Is(err, sql.ErrNoRows) {
119 120 return Group{}, errNotFound
120 121 }
@@ -122,6 +123,9 @@ func scanGroup(row *sql.Row) (Group, error) {
122 123 }
123 124 g.DefaultRole = access.Role(role)
124 125 g.CreatedAt = parseTime(created)
126 if g.OwnerID == 0 {
127 g.OwnerID = g.CreatedBy
128 }
125 129 return g, nil
126 130 }
127 131
@@ -131,8 +135,15 @@ func (s *Store) GroupRole(ctx context.Context, groupID, userID int64) (access.Ro
131 135 if userID == 0 {
132 136 return access.RoleNone, nil
133 137 }
138 g, err := s.GroupByID(ctx, groupID)
139 if err != nil {
140 return access.RoleNone, err
141 }
142 if userID == g.OwnerID {
143 return access.RoleMaintainer, nil
144 }
134 145 var role string
135 err := s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, groupID, userID).Scan(&role)
146 err = s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, groupID, userID).Scan(&role)
136 147 if errors.Is(err, sql.ErrNoRows) {
137 148 return access.RoleNone, nil
138 149 }
@@ -153,13 +164,10 @@ func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
153 164 defer rows.Close()
154 165 var out []Group
155 166 for rows.Next() {
156 var g Group
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 {
167 g, err := scanGroup(rows)
168 if err != nil {
159 169 return nil, err
160 170 }
161 g.DefaultRole = access.Role(role)
162 g.CreatedAt = parseTime(created)
163 171 out = append(out, g)
164 172 }
165 173 return out, rows.Err()
@@ -361,14 +369,11 @@ func (s *Store) EffectiveRole(ctx context.Context, userID, repoID int64) (access
361 369 in.UserOwner = true
362 370 }
363 371 if repo.OwnerKind == "group" {
364 var role string
365 err := s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, repo.OwnerID, userID).Scan(&role)
366 if err != nil && !errors.Is(err, sql.ErrNoRows) {
372 role, err := s.GroupRole(ctx, repo.OwnerID, userID)
373 if err != nil {
367 374 return access.RoleNone, err
368 375 }
369 if err == nil {
370 in.GroupRole = access.Role(role)
371 }
376 in.GroupRole = role
372 377 }
373 378 var role string
374 379 err = s.db.QueryRowContext(ctx, `SELECT role FROM repo_members WHERE repo_id = ? AND user_id = ?`, repoID, userID).Scan(&role)
@@ -401,6 +406,16 @@ func (s *Store) SetMember(ctx context.Context, scopeKind string, scopeID int64,
401 406 if err := names.ValidUsername(username); err != nil {
402 407 return err
403 408 }
409 if scopeKind == "group" && role != access.RoleMaintainer {
410 g, err := s.GroupByID(ctx, scopeID)
411 if err != nil {
412 return err
413 }
414 owner, err := s.UserByID(ctx, g.OwnerID)
415 if err == nil && owner.Username == username {
416 return i18n.E("err.ownerRole")
417 }
418 }
404 419 u, err := s.UserByUsername(ctx, username)
405 420 if IsNotFound(err) {
406 421 _, err = s.db.ExecContext(ctx, `INSERT INTO pending_members (scope_kind, scope_id, username, role) VALUES (?, ?, ?, ?)
@@ -434,6 +449,13 @@ func (s *Store) RemoveMember(ctx context.Context, scopeKind string, scopeID int6
434 449 return err
435 450 }
436 451 if scopeKind == "group" {
452 g, err := s.GroupByID(ctx, scopeID)
453 if err != nil {
454 return err
455 }
456 if u.ID == g.OwnerID {
457 return i18n.E("err.ownerRole")
458 }
437 459 _, err = s.db.ExecContext(ctx, `DELETE FROM group_members WHERE group_id = ? AND user_id = ?`, scopeID, u.ID)
438 460 return err
439 461 }
@@ -22,6 +22,7 @@ type Group struct {
22 DefaultRole access.Role
22 DefaultRole access.Role
23 LogoMIME string
23 LogoMIME string
24 CreatedBy int64
24 CreatedBy int64
25 OwnerID int64
25 CreatedAt time.Time
26 CreatedAt time.Time
26}
27}
27
28
@@ -68,8 +69,8 @@ func (s *Store) CreateGroup(ctx context.Context, creator int64, name, path, desc
68 if err := s.ensurePathFree(ctx, path); err != nil {
69 if err := s.ensurePathFree(ctx, path); err != nil {
69 return Group{}, err
70 return Group{}, err
70 }
71 }
71 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, visibility, default_role, created_by, created_at) VALUES (?, ?, ?, 'private', ?, ?, ?)`,
72 res, err := s.db.ExecContext(ctx, `INSERT INTO groups (name, path, description, visibility, default_role, created_by, owner_id, created_at) VALUES (?, ?, ?, 'private', ?, ?, ?, ?)`,
72 name, path, strings.TrimSpace(description), string(defaultRole), creator, now())
73 name, path, strings.TrimSpace(description), string(defaultRole), creator, creator, now())
73 if err != nil {
74 if err != nil {
74 return Group{}, err
75 return Group{}, err
75 }
76 }
@@ -109,12 +110,12 @@ func (s *Store) GroupByID(ctx context.Context, id int64) (Group, error) {
109 return scanGroup(row)
110 return scanGroup(row)
110}
111}
111
112
112const groupCols = `id, name, path, description, created_by, created_at, visibility, default_role, logo_mime`
113const groupCols = `id, name, path, description, created_by, created_at, visibility, default_role, logo_mime, owner_id`
113
114
114func scanGroup(row *sql.Row) (Group, error) {
115func scanGroup(row scanner) (Group, error) {
115 var g Group
116 var g Group
116 var created, role string
117 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 {
118 if err := row.Scan(&g.ID, &g.Name, &g.Path, &g.Description, &g.CreatedBy, &created, &g.Visibility, &role, &g.LogoMIME, &g.OwnerID); err != nil {
118 if errors.Is(err, sql.ErrNoRows) {
119 if errors.Is(err, sql.ErrNoRows) {
119 return Group{}, errNotFound
120 return Group{}, errNotFound
120 }
121 }
@@ -122,6 +123,9 @@ func scanGroup(row *sql.Row) (Group, error) {
122 }
123 }
123 g.DefaultRole = access.Role(role)
124 g.DefaultRole = access.Role(role)
124 g.CreatedAt = parseTime(created)
125 g.CreatedAt = parseTime(created)
126 if g.OwnerID == 0 {
127 g.OwnerID = g.CreatedBy
128 }
125 return g, nil
129 return g, nil
126}
130}
127
131
@@ -131,8 +135,15 @@ func (s *Store) GroupRole(ctx context.Context, groupID, userID int64) (access.Ro
131 if userID == 0 {
135 if userID == 0 {
132 return access.RoleNone, nil
136 return access.RoleNone, nil
133 }
137 }
138 g, err := s.GroupByID(ctx, groupID)
139 if err != nil {
140 return access.RoleNone, err
141 }
142 if userID == g.OwnerID {
143 return access.RoleMaintainer, nil
144 }
134 var role string
145 var role string
135 err := s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, groupID, userID).Scan(&role)
146 err = s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, groupID, userID).Scan(&role)
136 if errors.Is(err, sql.ErrNoRows) {
147 if errors.Is(err, sql.ErrNoRows) {
137 return access.RoleNone, nil
148 return access.RoleNone, nil
138 }
149 }
@@ -153,13 +164,10 @@ func (s *Store) ListGroups(ctx context.Context, userID int64) ([]Group, error) {
153 defer rows.Close()
164 defer rows.Close()
154 var out []Group
165 var out []Group
155 for rows.Next() {
166 for rows.Next() {
156 var g Group
167 g, err := scanGroup(rows)
157 var created, role string
168 if 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 {
159 return nil, err
169 return nil, err
160 }
170 }
161 g.DefaultRole = access.Role(role)
162 g.CreatedAt = parseTime(created)
163 out = append(out, g)
171 out = append(out, g)
164 }
172 }
165 return out, rows.Err()
173 return out, rows.Err()
@@ -361,14 +369,11 @@ func (s *Store) EffectiveRole(ctx context.Context, userID, repoID int64) (access
361 in.UserOwner = true
369 in.UserOwner = true
362 }
370 }
363 if repo.OwnerKind == "group" {
371 if repo.OwnerKind == "group" {
364 var role string
372 role, err := s.GroupRole(ctx, repo.OwnerID, userID)
365 err := s.db.QueryRowContext(ctx, `SELECT role FROM group_members WHERE group_id = ? AND user_id = ?`, repo.OwnerID, userID).Scan(&role)
373 if err != nil {
366 if err != nil && !errors.Is(err, sql.ErrNoRows) {
367 return access.RoleNone, err
374 return access.RoleNone, err
368 }
375 }
369 if err == nil {
376 in.GroupRole = role
370 in.GroupRole = access.Role(role)
371 }
372 }
377 }
373 var role string
378 var role string
374 err = s.db.QueryRowContext(ctx, `SELECT role FROM repo_members WHERE repo_id = ? AND user_id = ?`, repoID, userID).Scan(&role)
379 err = s.db.QueryRowContext(ctx, `SELECT role FROM repo_members WHERE repo_id = ? AND user_id = ?`, repoID, userID).Scan(&role)
@@ -401,6 +406,16 @@ func (s *Store) SetMember(ctx context.Context, scopeKind string, scopeID int64,
401 if err := names.ValidUsername(username); err != nil {
406 if err := names.ValidUsername(username); err != nil {
402 return err
407 return err
403 }
408 }
409 if scopeKind == "group" && role != access.RoleMaintainer {
410 g, err := s.GroupByID(ctx, scopeID)
411 if err != nil {
412 return err
413 }
414 owner, err := s.UserByID(ctx, g.OwnerID)
415 if err == nil && owner.Username == username {
416 return i18n.E("err.ownerRole")
417 }
418 }
404 u, err := s.UserByUsername(ctx, username)
419 u, err := s.UserByUsername(ctx, username)
405 if IsNotFound(err) {
420 if IsNotFound(err) {
406 _, err = s.db.ExecContext(ctx, `INSERT INTO pending_members (scope_kind, scope_id, username, role) VALUES (?, ?, ?, ?)
421 _, err = s.db.ExecContext(ctx, `INSERT INTO pending_members (scope_kind, scope_id, username, role) VALUES (?, ?, ?, ?)
@@ -434,6 +449,13 @@ func (s *Store) RemoveMember(ctx context.Context, scopeKind string, scopeID int6
434 return err
449 return err
435 }
450 }
436 if scopeKind == "group" {
451 if scopeKind == "group" {
452 g, err := s.GroupByID(ctx, scopeID)
453 if err != nil {
454 return err
455 }
456 if u.ID == g.OwnerID {
457 return i18n.E("err.ownerRole")
458 }
437 _, err = s.db.ExecContext(ctx, `DELETE FROM group_members WHERE group_id = ? AND user_id = ?`, scopeID, u.ID)
459 _, err = s.db.ExecContext(ctx, `DELETE FROM group_members WHERE group_id = ? AND user_id = ?`, scopeID, u.ID)
438 return err
460 return err
439 }
461 }
internal/store/reviews.go +2 −2
@@ -81,7 +81,7 @@ func (s *Store) GroupMaintainerCount(ctx context.Context, groupID int64) (int, e
81 81 if err != nil {
82 82 return 0, err
83 83 }
84 ids := map[int64]bool{g.CreatedBy: true}
84 ids := map[int64]bool{g.OwnerID: true}
85 85 members, err := s.ListMembers(ctx, "group", groupID)
86 86 if err != nil {
87 87 return 0, err
@@ -106,7 +106,7 @@ func (s *Store) ProjectMaintainerCount(ctx context.Context, repo Repo) (int, err
106 106 if err != nil {
107 107 return 0, err
108 108 }
109 ids[g.CreatedBy] = true
109 ids[g.OwnerID] = true
110 110 members, err := s.ListMembers(ctx, "group", g.ID)
111 111 if err != nil {
112 112 return 0, err
@@ -81,7 +81,7 @@ func (s *Store) GroupMaintainerCount(ctx context.Context, groupID int64) (int, e
81 if err != nil {
81 if err != nil {
82 return 0, err
82 return 0, err
83 }
83 }
84 ids := map[int64]bool{g.CreatedBy: true}
84 ids := map[int64]bool{g.OwnerID: true}
85 members, err := s.ListMembers(ctx, "group", groupID)
85 members, err := s.ListMembers(ctx, "group", groupID)
86 if err != nil {
86 if err != nil {
87 return 0, err
87 return 0, err
@@ -106,7 +106,7 @@ func (s *Store) ProjectMaintainerCount(ctx context.Context, repo Repo) (int, err
106 if err != nil {
106 if err != nil {
107 return 0, err
107 return 0, err
108 }
108 }
109 ids[g.CreatedBy] = true
109 ids[g.OwnerID] = true
110 members, err := s.ListMembers(ctx, "group", g.ID)
110 members, err := s.ListMembers(ctx, "group", g.ID)
111 if err != nil {
111 if err != nil {
112 return 0, err
112 return 0, err
internal/store/reviews_test.go +1 −1
@@ -37,7 +37,7 @@ func TestGroupApprovalOverridesProject(t *testing.T) {
37 37 if err != nil || path != "team" || pol.RequiredCount != 2 || pol.DevelopersApprove {
38 38 t.Fatalf("groepsregel wint: %+v %s %v", pol, path, err)
39 39 }
40 if err := s.SetMember(ctx, "group", g.ID, "tim", access.RoleDeveloper); err != nil {
40 if _, err := s.db.ExecContext(ctx, `UPDATE group_members SET role = 'developer' WHERE group_id = ? AND user_id = ?`, g.ID, tim.ID); err != nil {
41 41 t.Fatal(err)
42 42 }
43 43 n, err := s.GroupMaintainerCount(ctx, g.ID)
@@ -37,7 +37,7 @@ func TestGroupApprovalOverridesProject(t *testing.T) {
37 if err != nil || path != "team" || pol.RequiredCount != 2 || pol.DevelopersApprove {
37 if err != nil || path != "team" || pol.RequiredCount != 2 || pol.DevelopersApprove {
38 t.Fatalf("groepsregel wint: %+v %s %v", pol, path, err)
38 t.Fatalf("groepsregel wint: %+v %s %v", pol, path, err)
39 }
39 }
40 if err := s.SetMember(ctx, "group", g.ID, "tim", access.RoleDeveloper); err != nil {
40 if _, err := s.db.ExecContext(ctx, `UPDATE group_members SET role = 'developer' WHERE group_id = ? AND user_id = ?`, g.ID, tim.ID); err != nil {
41 t.Fatal(err)
41 t.Fatal(err)
42 }
42 }
43 n, err := s.GroupMaintainerCount(ctx, g.ID)
43 n, err := s.GroupMaintainerCount(ctx, g.ID)
internal/store/store.go +4 −0
@@ -82,12 +82,16 @@ func (s *Store) migrate() error {
82 82 `ALTER TABLE jobs ADD COLUMN resource_group TEXT NOT NULL DEFAULT ''`,
83 83 `ALTER TABLE jobs ADD COLUMN optional_json TEXT NOT NULL DEFAULT '[]'`,
84 84 `ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
85 `ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
85 86 }
86 87 for _, q := range alters {
87 88 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
88 89 return err
89 90 }
90 91 }
92 if _, err := s.db.Exec(`UPDATE groups SET owner_id = created_by WHERE owner_id = 0 AND created_by != 0`); err != nil {
93 return err
94 }
91 95 return nil
92 96 }
93 97
@@ -82,12 +82,16 @@ func (s *Store) migrate() error {
82 `ALTER TABLE jobs ADD COLUMN resource_group TEXT NOT NULL DEFAULT ''`,
82 `ALTER TABLE jobs ADD COLUMN resource_group TEXT NOT NULL DEFAULT ''`,
83 `ALTER TABLE jobs ADD COLUMN optional_json TEXT NOT NULL DEFAULT '[]'`,
83 `ALTER TABLE jobs ADD COLUMN optional_json TEXT NOT NULL DEFAULT '[]'`,
84 `ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
84 `ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
85 `ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
85 }
86 }
86 for _, q := range alters {
87 for _, q := range alters {
87 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
88 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
88 return err
89 return err
89 }
90 }
90 }
91 }
92 if _, err := s.db.Exec(`UPDATE groups SET owner_id = created_by WHERE owner_id = 0 AND created_by != 0`); err != nil {
93 return err
94 }
91 return nil
95 return nil
92}
96}
93
97