BlueGit

timfa bluegit

Merged

Release: stage naar master

!110 · merged 3 weeks ago

timfa wants to merge 2 commits from stage into master

Pipeline

#472 Passed
Stage: build

Reviews

  • No reviews yet.

Merged by timfa on 27 October 2026 cabf3fdc

Overview Commits 2 Pipelines 1 Changes 15

Changes

15 files changed +530 −112
internal/ci/forkref.go added +9 −0
@@ -0,0 +1,9 @@
1 package ci
2
3 import "strings"
4
5 // ForkBranchPrefix: branches in upstream die een fork-MR spiegelen.
6 const ForkBranchPrefix = "forks/"
7
8 // IsForkBranch: pipelines op deze branch krijgen geen geheimen.
9 func IsForkBranch(branch string) bool { return strings.HasPrefix(branch, ForkBranchPrefix) }
@@ -0,0 +1,9 @@
1package ci
2
3import "strings"
4
5// ForkBranchPrefix: branches in upstream die een fork-MR spiegelen.
6const ForkBranchPrefix = "forks/"
7
8// IsForkBranch: pipelines op deze branch krijgen geen geheimen.
9func IsForkBranch(branch string) bool { return strings.HasPrefix(branch, ForkBranchPrefix) }
internal/gitrepo/repo.go +7 −0
@@ -868,3 +868,10 @@ func PushBranch(ctx context.Context, gitBin, src, dst, branch string, env []stri
868 868 }
869 869 return nil
870 870 }
871
872 // FetchBranch haalt branch uit src op in dst als refs/heads/as (geforceerd:
873 // de spiegel volgt de bron). Een fetch draait geen hooks in dst.
874 func FetchBranch(ctx context.Context, gitBin, src, dst, branch, as string) error {
875 _, err := run(ctx, gitBin, nil, "-C", dst, "fetch", "--quiet", "--no-tags", src, "+refs/heads/"+branch+":refs/heads/"+as)
876 return err
877 }
@@ -868,3 +868,10 @@ func PushBranch(ctx context.Context, gitBin, src, dst, branch string, env []stri
868 }
868 }
869 return nil
869 return nil
870}
870}
871
872// FetchBranch haalt branch uit src op in dst als refs/heads/as (geforceerd:
873// de spiegel volgt de bron). Een fetch draait geen hooks in dst.
874func FetchBranch(ctx context.Context, gitBin, src, dst, branch, as string) error {
875 _, err := run(ctx, gitBin, nil, "-C", dst, "fetch", "--quiet", "--no-tags", src, "+refs/heads/"+branch+":refs/heads/"+as)
876 return err
877}
internal/i18n/catalog_fork.go +20 −0
@@ -2,6 +2,11 @@ package i18n
2 2
3 3 func init() {
4 4 addCatalog(en, map[string]string{
5 "err.upstreamMRRole": "you need the role that may open merge requests in the upstream repository",
6 "fork.mrTitle": "Merge request to upstream %s",
7 "fork.mrTip": "The merge request opens in upstream; its maintainers review and merge it. Pipelines run there without upstream secrets.",
8 "fork.mrSource": "Branch in this fork",
9 "fork.mrTarget": "Branch in upstream",
5 10 "fork.sync": "Sync %s with upstream",
6 11 "fork.syncTip": "Fast-forwards this branch to the same branch in upstream. If this fork has its own commits on it, sync stops with a message; nothing is overwritten.",
7 12 "flash.synced": "%s synced with upstream",
@@ -30,6 +35,11 @@ func init() {
30 35 "err.forkPrivate": "a fork of a private repository cannot be made public",
31 36 })
32 37 addCatalog(nl, map[string]string{
38 "err.upstreamMRRole": "je hebt de rol nodig die in de upstream-repository merge requests mag maken",
39 "fork.mrTitle": "Merge request naar upstream %s",
40 "fork.mrTip": "De merge request komt in upstream; de beheerders daar beoordelen en mergen hem. Pipelines draaien daar zonder geheimen van upstream.",
41 "fork.mrSource": "Branch in deze fork",
42 "fork.mrTarget": "Branch in upstream",
33 43 "fork.sync": "%s synchroniseren met upstream",
34 44 "fork.syncTip": "Zet deze branch fast-forward door naar dezelfde branch in upstream. Heeft deze fork eigen commits op die branch, dan stopt de sync met een melding; er wordt niets overschreven.",
35 45 "flash.synced": "%s gesynchroniseerd met upstream",
@@ -58,6 +68,11 @@ func init() {
58 68 "err.forkPrivate": "een fork van een privé repository kan niet openbaar worden",
59 69 })
60 70 addCatalog(de, map[string]string{
71 "err.upstreamMRRole": "du brauchst die Rolle, die im Upstream-Repository Merge Requests öffnen darf",
72 "fork.mrTitle": "Merge Request an Upstream %s",
73 "fork.mrTip": "Der Merge Request entsteht im Upstream; dessen Maintainer prüfen und mergen ihn. Pipelines laufen dort ohne Upstream-Geheimnisse.",
74 "fork.mrSource": "Branch in diesem Fork",
75 "fork.mrTarget": "Branch im Upstream",
61 76 "fork.sync": "%s mit Upstream synchronisieren",
62 77 "fork.syncTip": "Spult diesen Branch auf denselben Branch im Upstream vor (Fast-Forward). Hat dieser Fork eigene Commits darauf, bricht die Synchronisation mit einer Meldung ab; nichts wird überschrieben.",
63 78 "flash.synced": "%s mit Upstream synchronisiert",
@@ -86,6 +101,11 @@ func init() {
86 101 "err.forkPrivate": "ein Fork eines privaten Repositorys kann nicht öffentlich werden",
87 102 })
88 103 addCatalog(fr, map[string]string{
104 "err.upstreamMRRole": "il te faut le rôle qui peut ouvrir des merge requests dans le dépôt upstream",
105 "fork.mrTitle": "Merge request vers l'upstream %s",
106 "fork.mrTip": "La merge request s'ouvre dans l'upstream ; ses mainteneurs la relisent et la fusionnent. Les pipelines y tournent sans les secrets de l'upstream.",
107 "fork.mrSource": "Branche de ce fork",
108 "fork.mrTarget": "Branche de l'upstream",
89 109 "fork.sync": "Synchroniser %s avec l'upstream",
90 110 "fork.syncTip": "Avance cette branche en fast-forward jusqu'à la même branche de l'upstream. Si ce fork a ses propres commits dessus, la synchronisation s'arrête avec un message ; rien n'est écrasé.",
91 111 "flash.synced": "%s synchronisé avec l'upstream",
@@ -2,6 +2,11 @@ package i18n
2
2
3func init() {
3func init() {
4 addCatalog(en, map[string]string{
4 addCatalog(en, map[string]string{
5 "err.upstreamMRRole": "you need the role that may open merge requests in the upstream repository",
6 "fork.mrTitle": "Merge request to upstream %s",
7 "fork.mrTip": "The merge request opens in upstream; its maintainers review and merge it. Pipelines run there without upstream secrets.",
8 "fork.mrSource": "Branch in this fork",
9 "fork.mrTarget": "Branch in upstream",
5 "fork.sync": "Sync %s with upstream",
10 "fork.sync": "Sync %s with upstream",
6 "fork.syncTip": "Fast-forwards this branch to the same branch in upstream. If this fork has its own commits on it, sync stops with a message; nothing is overwritten.",
11 "fork.syncTip": "Fast-forwards this branch to the same branch in upstream. If this fork has its own commits on it, sync stops with a message; nothing is overwritten.",
7 "flash.synced": "%s synced with upstream",
12 "flash.synced": "%s synced with upstream",
@@ -30,6 +35,11 @@ func init() {
30 "err.forkPrivate": "a fork of a private repository cannot be made public",
35 "err.forkPrivate": "a fork of a private repository cannot be made public",
31 })
36 })
32 addCatalog(nl, map[string]string{
37 addCatalog(nl, map[string]string{
38 "err.upstreamMRRole": "je hebt de rol nodig die in de upstream-repository merge requests mag maken",
39 "fork.mrTitle": "Merge request naar upstream %s",
40 "fork.mrTip": "De merge request komt in upstream; de beheerders daar beoordelen en mergen hem. Pipelines draaien daar zonder geheimen van upstream.",
41 "fork.mrSource": "Branch in deze fork",
42 "fork.mrTarget": "Branch in upstream",
33 "fork.sync": "%s synchroniseren met upstream",
43 "fork.sync": "%s synchroniseren met upstream",
34 "fork.syncTip": "Zet deze branch fast-forward door naar dezelfde branch in upstream. Heeft deze fork eigen commits op die branch, dan stopt de sync met een melding; er wordt niets overschreven.",
44 "fork.syncTip": "Zet deze branch fast-forward door naar dezelfde branch in upstream. Heeft deze fork eigen commits op die branch, dan stopt de sync met een melding; er wordt niets overschreven.",
35 "flash.synced": "%s gesynchroniseerd met upstream",
45 "flash.synced": "%s gesynchroniseerd met upstream",
@@ -58,6 +68,11 @@ func init() {
58 "err.forkPrivate": "een fork van een privé repository kan niet openbaar worden",
68 "err.forkPrivate": "een fork van een privé repository kan niet openbaar worden",
59 })
69 })
60 addCatalog(de, map[string]string{
70 addCatalog(de, map[string]string{
71 "err.upstreamMRRole": "du brauchst die Rolle, die im Upstream-Repository Merge Requests öffnen darf",
72 "fork.mrTitle": "Merge Request an Upstream %s",
73 "fork.mrTip": "Der Merge Request entsteht im Upstream; dessen Maintainer prüfen und mergen ihn. Pipelines laufen dort ohne Upstream-Geheimnisse.",
74 "fork.mrSource": "Branch in diesem Fork",
75 "fork.mrTarget": "Branch im Upstream",
61 "fork.sync": "%s mit Upstream synchronisieren",
76 "fork.sync": "%s mit Upstream synchronisieren",
62 "fork.syncTip": "Spult diesen Branch auf denselben Branch im Upstream vor (Fast-Forward). Hat dieser Fork eigene Commits darauf, bricht die Synchronisation mit einer Meldung ab; nichts wird überschrieben.",
77 "fork.syncTip": "Spult diesen Branch auf denselben Branch im Upstream vor (Fast-Forward). Hat dieser Fork eigene Commits darauf, bricht die Synchronisation mit einer Meldung ab; nichts wird überschrieben.",
63 "flash.synced": "%s mit Upstream synchronisiert",
78 "flash.synced": "%s mit Upstream synchronisiert",
@@ -86,6 +101,11 @@ func init() {
86 "err.forkPrivate": "ein Fork eines privaten Repositorys kann nicht öffentlich werden",
101 "err.forkPrivate": "ein Fork eines privaten Repositorys kann nicht öffentlich werden",
87 })
102 })
88 addCatalog(fr, map[string]string{
103 addCatalog(fr, map[string]string{
104 "err.upstreamMRRole": "il te faut le rôle qui peut ouvrir des merge requests dans le dépôt upstream",
105 "fork.mrTitle": "Merge request vers l'upstream %s",
106 "fork.mrTip": "La merge request s'ouvre dans l'upstream ; ses mainteneurs la relisent et la fusionnent. Les pipelines y tournent sans les secrets de l'upstream.",
107 "fork.mrSource": "Branche de ce fork",
108 "fork.mrTarget": "Branche de l'upstream",
89 "fork.sync": "Synchroniser %s avec l'upstream",
109 "fork.sync": "Synchroniser %s avec l'upstream",
90 "fork.syncTip": "Avance cette branche en fast-forward jusqu'à la même branche de l'upstream. Si ce fork a ses propres commits dessus, la synchronisation s'arrête avec un message ; rien n'est écrasé.",
110 "fork.syncTip": "Avance cette branche en fast-forward jusqu'à la même branche de l'upstream. Si ce fork a ses propres commits dessus, la synchronisation s'arrête avec un message ; rien n'est écrasé.",
91 "flash.synced": "%s synchronisé avec l'upstream",
111 "flash.synced": "%s synchronisé avec l'upstream",
internal/runner/fork_secrets_test.go added +45 −0
@@ -0,0 +1,45 @@
1 package runner
2
3 import (
4 "context"
5 "path/filepath"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/store"
10 )
11
12 // Pipelines van fork-MR's (refs/heads/forks/...) krijgen geen geheimen.
13 func TestForkRefGetsNoSecrets(t *testing.T) {
14 s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))
15 if err != nil {
16 t.Fatal(err)
17 }
18 defer s.Close()
19 ctx := context.Background()
20 tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
21 g, _ := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleReadonly)
22 repo, _ := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
23 _ = s.PutSecret(ctx, "group", g.ID, "GROUP_TOKEN", "groepsgeheim-123", false)
24 _ = s.PutSecret(ctx, "repo", repo.ID, "REPO_TOKEN", "repogeheim-456", false)
25 r := &Runner{Store: s}
26 env, mask, err := r.environment(ctx, repo, store.Pipeline{Ref: "refs/heads/forks/7/feat"}, store.Job{Name: "t"}, "")
27 if err != nil {
28 t.Fatal(err)
29 }
30 if _, ok := env["GROUP_TOKEN"]; ok {
31 t.Fatal("groepsgeheim lekt naar fork-MR")
32 }
33 if _, ok := env["REPO_TOKEN"]; ok {
34 t.Fatal("projectgeheim lekt naar fork-MR")
35 }
36 for _, m := range mask {
37 if m == "groepsgeheim-123" || m == "repogeheim-456" {
38 t.Fatal("geheim in mask")
39 }
40 }
41 env, _, _ = r.environment(ctx, repo, store.Pipeline{Ref: "refs/heads/feat"}, store.Job{Name: "t"}, "")
42 if env["REPO_TOKEN"] == "" || env["GROUP_TOKEN"] == "" {
43 t.Fatal("gewone branch moet geheimen houden")
44 }
45 }
@@ -0,0 +1,45 @@
1package runner
2
3import (
4 "context"
5 "path/filepath"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/store"
10)
11
12// Pipelines van fork-MR's (refs/heads/forks/...) krijgen geen geheimen.
13func TestForkRefGetsNoSecrets(t *testing.T) {
14 s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))
15 if err != nil {
16 t.Fatal(err)
17 }
18 defer s.Close()
19 ctx := context.Background()
20 tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
21 g, _ := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleReadonly)
22 repo, _ := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
23 _ = s.PutSecret(ctx, "group", g.ID, "GROUP_TOKEN", "groepsgeheim-123", false)
24 _ = s.PutSecret(ctx, "repo", repo.ID, "REPO_TOKEN", "repogeheim-456", false)
25 r := &Runner{Store: s}
26 env, mask, err := r.environment(ctx, repo, store.Pipeline{Ref: "refs/heads/forks/7/feat"}, store.Job{Name: "t"}, "")
27 if err != nil {
28 t.Fatal(err)
29 }
30 if _, ok := env["GROUP_TOKEN"]; ok {
31 t.Fatal("groepsgeheim lekt naar fork-MR")
32 }
33 if _, ok := env["REPO_TOKEN"]; ok {
34 t.Fatal("projectgeheim lekt naar fork-MR")
35 }
36 for _, m := range mask {
37 if m == "groepsgeheim-123" || m == "repogeheim-456" {
38 t.Fatal("geheim in mask")
39 }
40 }
41 env, _, _ = r.environment(ctx, repo, store.Pipeline{Ref: "refs/heads/feat"}, store.Job{Name: "t"}, "")
42 if env["REPO_TOKEN"] == "" || env["GROUP_TOKEN"] == "" {
43 t.Fatal("gewone branch moet geheimen houden")
44 }
45}
internal/runner/runner.go +10 −1
@@ -943,10 +943,16 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
943 943 return nil, nil, err
944 944 }
945 945 refProtected := access.BranchProtected(patterns, name)
946 // Fork-MR's draaien op refs/heads/forks/...: code van buiten, dus
947 // nooit groeps- of projectgeheimen en nooit als beschermde ref.
948 forkRef := ci.IsForkBranch(name)
949 if forkRef {
950 refProtected = false
951 }
946 952 env := map[string]string{}
947 953 var mask []string
948 954 expand := map[string]bool{}
949 if repo.OwnerKind == "group" {
955 if repo.OwnerKind == "group" && !forkRef {
950 956 if flags, err := r.Store.SecretExpandFlags(ctx, "group", repo.OwnerID); err == nil {
951 957 for k, on := range flags {
952 958 expand[k] = on
@@ -965,6 +971,9 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
965 971 if err != nil {
966 972 return nil, nil, err
967 973 }
974 if forkRef {
975 repoSecrets = nil
976 }
968 977 repoFlags, _ := r.Store.SecretExpandFlags(ctx, "repo", repo.ID)
969 978 for k, v := range repoSecrets {
970 979 env[k] = v
@@ -943,10 +943,16 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
943 return nil, nil, err
943 return nil, nil, err
944 }
944 }
945 refProtected := access.BranchProtected(patterns, name)
945 refProtected := access.BranchProtected(patterns, name)
946 // Fork-MR's draaien op refs/heads/forks/...: code van buiten, dus
947 // nooit groeps- of projectgeheimen en nooit als beschermde ref.
948 forkRef := ci.IsForkBranch(name)
949 if forkRef {
950 refProtected = false
951 }
946 env := map[string]string{}
952 env := map[string]string{}
947 var mask []string
953 var mask []string
948 expand := map[string]bool{}
954 expand := map[string]bool{}
949 if repo.OwnerKind == "group" {
955 if repo.OwnerKind == "group" && !forkRef {
950 if flags, err := r.Store.SecretExpandFlags(ctx, "group", repo.OwnerID); err == nil {
956 if flags, err := r.Store.SecretExpandFlags(ctx, "group", repo.OwnerID); err == nil {
951 for k, on := range flags {
957 for k, on := range flags {
952 expand[k] = on
958 expand[k] = on
@@ -965,6 +971,9 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
965 if err != nil {
971 if err != nil {
966 return nil, nil, err
972 return nil, nil, err
967 }
973 }
974 if forkRef {
975 repoSecrets = nil
976 }
968 repoFlags, _ := r.Store.SecretExpandFlags(ctx, "repo", repo.ID)
977 repoFlags, _ := r.Store.SecretExpandFlags(ctx, "repo", repo.ID)
969 for k, v := range repoSecrets {
978 for k, v := range repoSecrets {
970 env[k] = v
979 env[k] = v
internal/server/api_openapi.go +8 −0
@@ -138,6 +138,7 @@ func apiBinds() []apiBind {
138 138 {path: "/groups/{path}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},
139 139 {path: "/projects/{owner}/{repo}/fork", method: "POST", code: "201", body: "ForkCreate", resp: "ForkedProject"},
140 140 {path: "/projects/{owner}/{repo}/sync-upstream", method: "POST", code: "200", body: "SyncUpstream", resp: "SyncResult"},
141 {path: "/projects/{owner}/{repo}/upstream-merge-requests", method: "POST", code: "201", body: "ForkMergeRequest", resp: "ForkedProject"},
141 142 {path: "/projects/{owner}/{repo}/forks", method: "GET", code: "200", resp: "ForkedProject", array: true},
142 143 {path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},
143 144 {path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
@@ -412,6 +413,13 @@ func apiSchemas() map[string]any {
412 413 "visibility": str("public or private."),
413 414 "forked_from": str("Upstream owner/name (only in the fork response)."),
414 415 }),
416 "ForkMergeRequest": obj("Merge request from a fork branch into upstream. The merge request lives in upstream and is merged there by its maintainers. Pipelines for it run in upstream on forks/<fork id>/<branch> without any group or project secrets.", map[string]any{
417 "source_branch": str("Branch in the fork."),
418 "target_branch": str("Branch in upstream. Default: upstream default branch."),
419 "title": str("Title."),
420 "description": str("Description."),
421 "draft": boolean("Open as draft."),
422 }),
415 423 "SyncUpstream": obj("Fast-forward a fork branch to the same branch in upstream. Never forces; a diverged branch gives 409.", map[string]any{
416 424 "branch": str("Branch to sync. Default: the fork's default branch."),
417 425 }),
@@ -138,6 +138,7 @@ func apiBinds() []apiBind {
138 {path: "/groups/{path}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},
138 {path: "/groups/{path}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},
139 {path: "/projects/{owner}/{repo}/fork", method: "POST", code: "201", body: "ForkCreate", resp: "ForkedProject"},
139 {path: "/projects/{owner}/{repo}/fork", method: "POST", code: "201", body: "ForkCreate", resp: "ForkedProject"},
140 {path: "/projects/{owner}/{repo}/sync-upstream", method: "POST", code: "200", body: "SyncUpstream", resp: "SyncResult"},
140 {path: "/projects/{owner}/{repo}/sync-upstream", method: "POST", code: "200", body: "SyncUpstream", resp: "SyncResult"},
141 {path: "/projects/{owner}/{repo}/upstream-merge-requests", method: "POST", code: "201", body: "ForkMergeRequest", resp: "ForkedProject"},
141 {path: "/projects/{owner}/{repo}/forks", method: "GET", code: "200", resp: "ForkedProject", array: true},
142 {path: "/projects/{owner}/{repo}/forks", method: "GET", code: "200", resp: "ForkedProject", array: true},
142 {path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},
143 {path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},
143 {path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
144 {path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
@@ -412,6 +413,13 @@ func apiSchemas() map[string]any {
412 "visibility": str("public or private."),
413 "visibility": str("public or private."),
413 "forked_from": str("Upstream owner/name (only in the fork response)."),
414 "forked_from": str("Upstream owner/name (only in the fork response)."),
414 }),
415 }),
416 "ForkMergeRequest": obj("Merge request from a fork branch into upstream. The merge request lives in upstream and is merged there by its maintainers. Pipelines for it run in upstream on forks/<fork id>/<branch> without any group or project secrets.", map[string]any{
417 "source_branch": str("Branch in the fork."),
418 "target_branch": str("Branch in upstream. Default: upstream default branch."),
419 "title": str("Title."),
420 "description": str("Description."),
421 "draft": boolean("Open as draft."),
422 }),
415 "SyncUpstream": obj("Fast-forward a fork branch to the same branch in upstream. Never forces; a diverged branch gives 409.", map[string]any{
423 "SyncUpstream": obj("Fast-forward a fork branch to the same branch in upstream. Never forces; a diverged branch gives 409.", map[string]any{
416 "branch": str("Branch to sync. Default: the fork's default branch."),
424 "branch": str("Branch to sync. Default: the fork's default branch."),
417 }),
425 }),
internal/server/api_routes.go +1 −0
@@ -89,6 +89,7 @@ var apiCatalog = []apiRoute{
89 89 {http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
90 90 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/fork", access.ScopeWrite, authUser, "Fork a project with all branches and tags. Body {namespace: group path or empty for your account, name: optional}. 409 if the name is taken. A fork of a private project is private.", (*Server).apiForkProject},
91 91 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/sync-upstream", access.ScopeWrite, authUser, "Fast-forward a branch of this fork to upstream. Body {branch: optional, default branch}. 409 when the fork has diverged (no force). Needs developer on the fork and read access to upstream.", (*Server).apiSyncUpstream},
92 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/upstream-merge-requests", access.ScopeWrite, authUser, "Open a merge request in the upstream of this fork. Body {source_branch (fork), target_branch (upstream, default its default branch), title, description, draft}. The source is mirrored to forks/<fork id>/<branch> in upstream; pipelines there never get upstream secrets. Needs read access to upstream and the role that may open merge requests there.", (*Server).apiForkMR},
92 93 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/forks", access.ScopeRead, authUser, "List forks of a project you can see.", (*Server).apiListForks},
93 94 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiDeleteProject},
94 95 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
@@ -89,6 +89,7 @@ var apiCatalog = []apiRoute{
89 {http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
89 {http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
90 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/fork", access.ScopeWrite, authUser, "Fork a project with all branches and tags. Body {namespace: group path or empty for your account, name: optional}. 409 if the name is taken. A fork of a private project is private.", (*Server).apiForkProject},
90 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/fork", access.ScopeWrite, authUser, "Fork a project with all branches and tags. Body {namespace: group path or empty for your account, name: optional}. 409 if the name is taken. A fork of a private project is private.", (*Server).apiForkProject},
91 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/sync-upstream", access.ScopeWrite, authUser, "Fast-forward a branch of this fork to upstream. Body {branch: optional, default branch}. 409 when the fork has diverged (no force). Needs developer on the fork and read access to upstream.", (*Server).apiSyncUpstream},
91 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/sync-upstream", access.ScopeWrite, authUser, "Fast-forward a branch of this fork to upstream. Body {branch: optional, default branch}. 409 when the fork has diverged (no force). Needs developer on the fork and read access to upstream.", (*Server).apiSyncUpstream},
92 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/upstream-merge-requests", access.ScopeWrite, authUser, "Open a merge request in the upstream of this fork. Body {source_branch (fork), target_branch (upstream, default its default branch), title, description, draft}. The source is mirrored to forks/<fork id>/<branch> in upstream; pipelines there never get upstream secrets. Needs read access to upstream and the role that may open merge requests there.", (*Server).apiForkMR},
92 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/forks", access.ScopeRead, authUser, "List forks of a project you can see.", (*Server).apiListForks},
93 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/forks", access.ScopeRead, authUser, "List forks of a project you can see.", (*Server).apiListForks},
93 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiDeleteProject},
94 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiDeleteProject},
94 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
95 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
internal/server/events.go +5 −0
@@ -45,6 +45,11 @@ func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.Us
45 45 // git http, SSH en postReceive zijn de enige aanroepers.
46 46 func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {
47 47 s.refsChanged(repo)
48 for ref, sha := range after {
49 if b, ok := strings.CutPrefix(ref, "refs/heads/"); ok && before[ref] != sha && !isZero(sha) && s.Store != nil {
50 s.refreshForkMRs(repo, user, b)
51 }
52 }
48 53 if s.Store != nil && refsMoved(before, after) {
49 54 _ = s.Store.TouchPushed(context.Background(), repo.ID, time.Now())
50 55 }
@@ -45,6 +45,11 @@ func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.Us
45// git http, SSH en postReceive zijn de enige aanroepers.
45// git http, SSH en postReceive zijn de enige aanroepers.
46func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {
46func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {
47 s.refsChanged(repo)
47 s.refsChanged(repo)
48 for ref, sha := range after {
49 if b, ok := strings.CutPrefix(ref, "refs/heads/"); ok && before[ref] != sha && !isZero(sha) && s.Store != nil {
50 s.refreshForkMRs(repo, user, b)
51 }
52 }
48 if s.Store != nil && refsMoved(before, after) {
53 if s.Store != nil && refsMoved(before, after) {
49 _ = s.Store.TouchPushed(context.Background(), repo.ID, time.Now())
54 _ = s.Store.TouchPushed(context.Background(), repo.ID, time.Now())
50 }
55 }
internal/server/fork_mr_test.go added +136 −0
@@ -0,0 +1,136 @@
1 package server
2
3 import (
4 "context"
5 "gitlab.com/Timfa/bluegit/internal/gitrepo"
6 "net/http"
7 "net/http/httptest"
8 "os/exec"
9 "path/filepath"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 )
18
19 func TestForkMergeRequest(t *testing.T) {
20 if _, err := exec.LookPath("git"); err != nil {
21 t.Skip("git ontbreekt")
22 }
23 storage := t.TempDir()
24 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
25 if err != nil {
26 t.Fatal(err)
27 }
28 t.Cleanup(func() { _ = st.Close() })
29 ctx := context.Background()
30 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
31 if err != nil {
32 t.Fatal(err)
33 }
34 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
35 if err != nil {
36 t.Fatal(err)
37 }
38 issue := func(u store.User) string {
39 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
40 if err != nil {
41 t.Fatal(err)
42 }
43 return plain
44 }
45 adaTok, devTok := issue(ada), issue(dev)
46 cfg := config.Config{
47 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
48 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
49 Git: config.Git{Binary: "git", DefaultBranch: "master"},
50 }
51 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
52 ts := httptest.NewServer(srv.Handler())
53 t.Cleanup(ts.Close)
54
55 call := func(method, path, token, body string) (int, string) {
56 t.Helper()
57 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
58 if body != "" {
59 req.Header.Set("Content-Type", "application/json")
60 }
61 req.Header.Set("Authorization", "Bearer "+token)
62 res, err := http.DefaultClient.Do(req)
63 if err != nil {
64 t.Fatal(err)
65 }
66 return res.StatusCode, read(t, res)
67 }
68 if code, body := call(http.MethodPost, "/api/v1/projects", adaTok, `{"name":"App","visibility":"public","initialize_with_readme":true}`); code != 201 {
69 t.Fatalf("project %d %s", code, body)
70 }
71 app, _ := st.RepoByPath(ctx, "ada", "app")
72 if code, body := call(http.MethodPost, "/api/v1/projects/ada/app/fork", devTok, `{}`); code != 201 {
73 t.Fatalf("fork %d %s", code, body)
74 }
75 updir := gitrepo.Dir(storage, "ada", "app")
76 fdir := gitrepo.Dir(storage, "dev", "app")
77 commit := func(dir, msg string) string {
78 t.Helper()
79 tree, _ := exec.Command("git", "-C", dir, "rev-parse", "master^{tree}").Output()
80 cmd := exec.Command("git", "-C", dir, "commit-tree", strings.TrimSpace(string(tree)), "-p", "master", "-m", msg)
81 cmd.Env = append(cmd.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@x", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@x")
82 out, err := cmd.Output()
83 if err != nil {
84 t.Fatal(err)
85 }
86 sha := strings.TrimSpace(string(out))
87 if out, err := exec.Command("git", "-C", dir, "update-ref", "refs/heads/master", sha).CombinedOutput(); err != nil {
88 t.Fatalf("%s", out)
89 }
90 return sha
91 }
92 _ = st.SetMember(ctx, "repo", app.ID, "dev", "developer")
93 fork, _ := st.RepoByPath(ctx, "dev", "app")
94 if out, err := exec.Command("git", "-C", fdir, "branch", "feat", "master").CombinedOutput(); err != nil {
95 t.Fatalf("%s", out)
96 }
97 _ = commit
98 code, body := call(http.MethodPost, "/api/v1/projects/dev/app/upstream-merge-requests", devTok, `{"source_branch":"feat","title":"Van fork"}`)
99 if code != 201 || !strings.Contains(body, "forks/") {
100 t.Fatalf("fork-MR: %d %s", code, body)
101 }
102 mirror := forkMirror(fork.ID, "feat")
103 want, _ := exec.Command("git", "-C", fdir, "rev-parse", "feat").Output()
104 got, _ := exec.Command("git", "-C", updir, "rev-parse", "refs/heads/"+mirror).Output()
105 if strings.TrimSpace(string(got)) != strings.TrimSpace(string(want)) {
106 t.Fatalf("spiegel %q != %q", got, want)
107 }
108 mrs, _ := st.OpenForkMRs(ctx, fork.ID, "feat")
109 if len(mrs) != 1 || mrs[0].UpstreamID != app.ID || mrs[0].Mirror != mirror {
110 t.Fatalf("%+v", mrs)
111 }
112 // nieuwe commit in de fork volgt in upstream
113 tree, _ := exec.Command("git", "-C", fdir, "rev-parse", "feat^{tree}").Output()
114 cmd := exec.Command("git", "-C", fdir, "commit-tree", strings.TrimSpace(string(tree)), "-p", "feat", "-m", "meer")
115 cmd.Env = append(cmd.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@x", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@x")
116 out, _ := cmd.Output()
117 sha := strings.TrimSpace(string(out))
118 _ = exec.Command("git", "-C", fdir, "update-ref", "refs/heads/feat", sha).Run()
119 srv.refreshForkMRs(fork, dev, "feat")
120 got, _ = exec.Command("git", "-C", updir, "rev-parse", "refs/heads/"+mirror).Output()
121 if strings.TrimSpace(string(got)) != sha {
122 t.Fatal("spiegel niet bijgewerkt")
123 }
124 // zonder ontwikkelrol in upstream: geweigerd
125 _ = st.SetMember(ctx, "repo", app.ID, "dev", "readonly")
126 if code, _ := call(http.MethodPost, "/api/v1/projects/dev/app/upstream-merge-requests", devTok, `{"source_branch":"feat","title":"x"}`); code != 403 {
127 t.Fatalf("readonly: %d", code)
128 }
129 // upstream privé zonder toegang: fout zonder naam
130 _ = st.RemoveMember(ctx, "repo", app.ID, "dev")
131 _ = st.UpdateRepo(ctx, app.ID, "", "private")
132 code, body = call(http.MethodPost, "/api/v1/projects/dev/app/upstream-merge-requests", devTok, `{"source_branch":"feat","title":"x"}`)
133 if code != 403 || strings.Contains(body, "ada/app") {
134 t.Fatalf("privé: %d %s", code, body)
135 }
136 }
@@ -0,0 +1,136 @@
1package server
2
3import (
4 "context"
5 "gitlab.com/Timfa/bluegit/internal/gitrepo"
6 "net/http"
7 "net/http/httptest"
8 "os/exec"
9 "path/filepath"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17)
18
19func TestForkMergeRequest(t *testing.T) {
20 if _, err := exec.LookPath("git"); err != nil {
21 t.Skip("git ontbreekt")
22 }
23 storage := t.TempDir()
24 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
25 if err != nil {
26 t.Fatal(err)
27 }
28 t.Cleanup(func() { _ = st.Close() })
29 ctx := context.Background()
30 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
31 if err != nil {
32 t.Fatal(err)
33 }
34 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
35 if err != nil {
36 t.Fatal(err)
37 }
38 issue := func(u store.User) string {
39 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
40 if err != nil {
41 t.Fatal(err)
42 }
43 return plain
44 }
45 adaTok, devTok := issue(ada), issue(dev)
46 cfg := config.Config{
47 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
48 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
49 Git: config.Git{Binary: "git", DefaultBranch: "master"},
50 }
51 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
52 ts := httptest.NewServer(srv.Handler())
53 t.Cleanup(ts.Close)
54
55 call := func(method, path, token, body string) (int, string) {
56 t.Helper()
57 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
58 if body != "" {
59 req.Header.Set("Content-Type", "application/json")
60 }
61 req.Header.Set("Authorization", "Bearer "+token)
62 res, err := http.DefaultClient.Do(req)
63 if err != nil {
64 t.Fatal(err)
65 }
66 return res.StatusCode, read(t, res)
67 }
68 if code, body := call(http.MethodPost, "/api/v1/projects", adaTok, `{"name":"App","visibility":"public","initialize_with_readme":true}`); code != 201 {
69 t.Fatalf("project %d %s", code, body)
70 }
71 app, _ := st.RepoByPath(ctx, "ada", "app")
72 if code, body := call(http.MethodPost, "/api/v1/projects/ada/app/fork", devTok, `{}`); code != 201 {
73 t.Fatalf("fork %d %s", code, body)
74 }
75 updir := gitrepo.Dir(storage, "ada", "app")
76 fdir := gitrepo.Dir(storage, "dev", "app")
77 commit := func(dir, msg string) string {
78 t.Helper()
79 tree, _ := exec.Command("git", "-C", dir, "rev-parse", "master^{tree}").Output()
80 cmd := exec.Command("git", "-C", dir, "commit-tree", strings.TrimSpace(string(tree)), "-p", "master", "-m", msg)
81 cmd.Env = append(cmd.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@x", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@x")
82 out, err := cmd.Output()
83 if err != nil {
84 t.Fatal(err)
85 }
86 sha := strings.TrimSpace(string(out))
87 if out, err := exec.Command("git", "-C", dir, "update-ref", "refs/heads/master", sha).CombinedOutput(); err != nil {
88 t.Fatalf("%s", out)
89 }
90 return sha
91 }
92 _ = st.SetMember(ctx, "repo", app.ID, "dev", "developer")
93 fork, _ := st.RepoByPath(ctx, "dev", "app")
94 if out, err := exec.Command("git", "-C", fdir, "branch", "feat", "master").CombinedOutput(); err != nil {
95 t.Fatalf("%s", out)
96 }
97 _ = commit
98 code, body := call(http.MethodPost, "/api/v1/projects/dev/app/upstream-merge-requests", devTok, `{"source_branch":"feat","title":"Van fork"}`)
99 if code != 201 || !strings.Contains(body, "forks/") {
100 t.Fatalf("fork-MR: %d %s", code, body)
101 }
102 mirror := forkMirror(fork.ID, "feat")
103 want, _ := exec.Command("git", "-C", fdir, "rev-parse", "feat").Output()
104 got, _ := exec.Command("git", "-C", updir, "rev-parse", "refs/heads/"+mirror).Output()
105 if strings.TrimSpace(string(got)) != strings.TrimSpace(string(want)) {
106 t.Fatalf("spiegel %q != %q", got, want)
107 }
108 mrs, _ := st.OpenForkMRs(ctx, fork.ID, "feat")
109 if len(mrs) != 1 || mrs[0].UpstreamID != app.ID || mrs[0].Mirror != mirror {
110 t.Fatalf("%+v", mrs)
111 }
112 // nieuwe commit in de fork volgt in upstream
113 tree, _ := exec.Command("git", "-C", fdir, "rev-parse", "feat^{tree}").Output()
114 cmd := exec.Command("git", "-C", fdir, "commit-tree", strings.TrimSpace(string(tree)), "-p", "feat", "-m", "meer")
115 cmd.Env = append(cmd.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@x", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@x")
116 out, _ := cmd.Output()
117 sha := strings.TrimSpace(string(out))
118 _ = exec.Command("git", "-C", fdir, "update-ref", "refs/heads/feat", sha).Run()
119 srv.refreshForkMRs(fork, dev, "feat")
120 got, _ = exec.Command("git", "-C", updir, "rev-parse", "refs/heads/"+mirror).Output()
121 if strings.TrimSpace(string(got)) != sha {
122 t.Fatal("spiegel niet bijgewerkt")
123 }
124 // zonder ontwikkelrol in upstream: geweigerd
125 _ = st.SetMember(ctx, "repo", app.ID, "dev", "readonly")
126 if code, _ := call(http.MethodPost, "/api/v1/projects/dev/app/upstream-merge-requests", devTok, `{"source_branch":"feat","title":"x"}`); code != 403 {
127 t.Fatalf("readonly: %d", code)
128 }
129 // upstream privé zonder toegang: fout zonder naam
130 _ = st.RemoveMember(ctx, "repo", app.ID, "dev")
131 _ = st.UpdateRepo(ctx, app.ID, "", "private")
132 code, body = call(http.MethodPost, "/api/v1/projects/dev/app/upstream-merge-requests", devTok, `{"source_branch":"feat","title":"x"}`)
133 if code != 403 || strings.Contains(body, "ada/app") {
134 t.Fatalf("privé: %d %s", code, body)
135 }
136}
internal/server/forks.go +116 −0
@@ -5,10 +5,12 @@ import (
5 5 "errors"
6 6 "net/http"
7 7 "os"
8 "strconv"
8 9 "strings"
9 10 "syscall"
10 11
11 12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/ci"
12 14 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 15 "gitlab.com/Timfa/bluegit/internal/i18n"
14 16 "gitlab.com/Timfa/bluegit/internal/state"
@@ -303,3 +305,117 @@ func (s *Server) apiSyncUpstream(w http.ResponseWriter, r *http.Request) {
303 305 }
304 306 writeJSON(w, http.StatusOK, res)
305 307 }
308
309 // forkMirror is de branch in upstream die een fork-branch spiegelt.
310 // Pipelines op forks/... krijgen nooit geheimen (zie runner).
311 func forkMirror(forkID int64, branch string) string {
312 return ci.ForkBranchPrefix + strconv.FormatInt(forkID, 10) + "/" + branch
313 }
314
315 // opCreateForkMR maakt in upstream een MR met als bron een branch uit de
316 // fork. De bron wordt gespiegeld naar forks/<forkid>/<branch> in upstream
317 // (geen push-hook, dus geen push-pipeline). Vereist leesrechten op de fork
318 // en de rol die in upstream MR's mag maken.
319 func (s *Server) opCreateForkMR(ctx context.Context, user store.User, fork store.Repo, source, target, title, description string, draft bool) (store.Repo, store.MergeRequest, error) {
320 if !s.canReadRepo(ctx, user.ID, fork) {
321 return store.Repo{}, store.MergeRequest{}, fail(404, i18n.E("err.notFound"))
322 }
323 upID, _ := s.Store.ForkOf(ctx, fork.ID)
324 if upID == 0 {
325 return store.Repo{}, store.MergeRequest{}, fail(400, i18n.E("err.notFork"))
326 }
327 up, err := s.Store.RepoByID(ctx, upID)
328 if err != nil || !s.canReadRepo(ctx, user.ID, up) {
329 return store.Repo{}, store.MergeRequest{}, fail(403, i18n.E("err.upstreamNoAccess"))
330 }
331 role, err := s.Store.EffectiveRole(ctx, user.ID, up.ID)
332 if err != nil || !role.CanWriteCode() {
333 return store.Repo{}, store.MergeRequest{}, fail(403, i18n.E("err.upstreamMRRole"))
334 }
335 source = strings.TrimSpace(source)
336 target = strings.TrimSpace(target)
337 if target == "" {
338 target = up.DefaultBranch
339 }
340 if !safeBranchName(source) || !safeBranchName(target) {
341 return store.Repo{}, store.MergeRequest{}, fail(400, i18n.E("err.branches"))
342 }
343 dir := gitrepo.Dir(s.StoragePath(), fork.OwnerPath, fork.Name)
344 updir := gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name)
345 if !shaLike(gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+source)) {
346 return store.Repo{}, store.MergeRequest{}, fail(404, i18n.E("err.upstreamBranch", source))
347 }
348 if !shaLike(gitOne(ctx, s.Git, updir, "rev-parse", "--verify", "--quiet", "refs/heads/"+target)) {
349 return store.Repo{}, store.MergeRequest{}, fail(404, i18n.E("err.upstreamBranch", target))
350 }
351 mirror := forkMirror(fork.ID, source)
352 if err := gitrepo.FetchBranch(ctx, s.Git, dir, updir, source, mirror); err != nil {
353 return store.Repo{}, store.MergeRequest{}, fail(500, err)
354 }
355 s.refsChanged(up)
356 mr, err := s.opCreateMR(ctx, user, up, title, description, mirror, target, draft)
357 if err != nil {
358 return store.Repo{}, store.MergeRequest{}, err
359 }
360 _ = s.Store.SetMRForkSource(ctx, mr.ID, fork.ID, source)
361 return up, mr, nil
362 }
363
364 // refreshForkMRs: na een push in een fork de gespiegelde branches in
365 // upstream bijwerken; AfterPush van upstream start de MR-pipelines.
366 func (s *Server) refreshForkMRs(fork store.Repo, user store.User, branch string) {
367 ctx := context.Background()
368 list, err := s.Store.OpenForkMRs(ctx, fork.ID, branch)
369 if err != nil || len(list) == 0 {
370 return
371 }
372 dir := gitrepo.Dir(s.StoragePath(), fork.OwnerPath, fork.Name)
373 for _, m := range list {
374 up, err := s.Store.RepoByID(ctx, m.UpstreamID)
375 if err != nil || !s.canReadRepo(ctx, user.ID, up) {
376 continue
377 }
378 updir := gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name)
379 _ = s.postReceive(ctx, up, user, updir, func() error {
380 return gitrepo.FetchBranch(ctx, s.Git, dir, updir, branch, m.Mirror)
381 })
382 }
383 }
384
385 func (s *Server) forkMRPost(w http.ResponseWriter, r *http.Request) {
386 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
387 if !ok || !s.csrfOK(w, r) {
388 return
389 }
390 up, mr, err := s.opCreateForkMR(r.Context(), u, repo, r.FormValue("source"), r.FormValue("target"), r.FormValue("title"), r.FormValue("description"), r.FormValue("draft") == "1")
391 if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests/new", err) {
392 return
393 }
394 s.redirect(w, r, repoURL(up)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.mrOpened"), "")
395 }
396
397 func (s *Server) apiForkMR(w http.ResponseWriter, r *http.Request) {
398 repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)
399 if !ok {
400 return
401 }
402 var body struct {
403 Source string `json:"source_branch"`
404 Target string `json:"target_branch"`
405 Title string `json:"title"`
406 Description string `json:"description"`
407 Draft bool `json:"draft"`
408 }
409 if err := readJSON(r, &body); err != nil {
410 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
411 return
412 }
413 up, mr, err := s.opCreateForkMR(r.Context(), apiUser(r), repo, body.Source, body.Target, body.Title, body.Description, body.Draft)
414 if !s.apiOK(w, r, err) {
415 return
416 }
417 out := s.mrJSON(up, mr)
418 out["source_project"] = repo.FullPath()
419 out["source_project_branch"] = body.Source
420 writeJSON(w, http.StatusCreated, out)
421 }
@@ -5,10 +5,12 @@ import (
5 "errors"
5 "errors"
6 "net/http"
6 "net/http"
7 "os"
7 "os"
8 "strconv"
8 "strings"
9 "strings"
9 "syscall"
10 "syscall"
10
11
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/ci"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
14 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
15 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/state"
16 "gitlab.com/Timfa/bluegit/internal/state"
@@ -303,3 +305,117 @@ func (s *Server) apiSyncUpstream(w http.ResponseWriter, r *http.Request) {
303 }
305 }
304 writeJSON(w, http.StatusOK, res)
306 writeJSON(w, http.StatusOK, res)
305}
307}
308
309// forkMirror is de branch in upstream die een fork-branch spiegelt.
310// Pipelines op forks/... krijgen nooit geheimen (zie runner).
311func forkMirror(forkID int64, branch string) string {
312 return ci.ForkBranchPrefix + strconv.FormatInt(forkID, 10) + "/" + branch
313}
314
315// opCreateForkMR maakt in upstream een MR met als bron een branch uit de
316// fork. De bron wordt gespiegeld naar forks/<forkid>/<branch> in upstream
317// (geen push-hook, dus geen push-pipeline). Vereist leesrechten op de fork
318// en de rol die in upstream MR's mag maken.
319func (s *Server) opCreateForkMR(ctx context.Context, user store.User, fork store.Repo, source, target, title, description string, draft bool) (store.Repo, store.MergeRequest, error) {
320 if !s.canReadRepo(ctx, user.ID, fork) {
321 return store.Repo{}, store.MergeRequest{}, fail(404, i18n.E("err.notFound"))
322 }
323 upID, _ := s.Store.ForkOf(ctx, fork.ID)
324 if upID == 0 {
325 return store.Repo{}, store.MergeRequest{}, fail(400, i18n.E("err.notFork"))
326 }
327 up, err := s.Store.RepoByID(ctx, upID)
328 if err != nil || !s.canReadRepo(ctx, user.ID, up) {
329 return store.Repo{}, store.MergeRequest{}, fail(403, i18n.E("err.upstreamNoAccess"))
330 }
331 role, err := s.Store.EffectiveRole(ctx, user.ID, up.ID)
332 if err != nil || !role.CanWriteCode() {
333 return store.Repo{}, store.MergeRequest{}, fail(403, i18n.E("err.upstreamMRRole"))
334 }
335 source = strings.TrimSpace(source)
336 target = strings.TrimSpace(target)
337 if target == "" {
338 target = up.DefaultBranch
339 }
340 if !safeBranchName(source) || !safeBranchName(target) {
341 return store.Repo{}, store.MergeRequest{}, fail(400, i18n.E("err.branches"))
342 }
343 dir := gitrepo.Dir(s.StoragePath(), fork.OwnerPath, fork.Name)
344 updir := gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name)
345 if !shaLike(gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+source)) {
346 return store.Repo{}, store.MergeRequest{}, fail(404, i18n.E("err.upstreamBranch", source))
347 }
348 if !shaLike(gitOne(ctx, s.Git, updir, "rev-parse", "--verify", "--quiet", "refs/heads/"+target)) {
349 return store.Repo{}, store.MergeRequest{}, fail(404, i18n.E("err.upstreamBranch", target))
350 }
351 mirror := forkMirror(fork.ID, source)
352 if err := gitrepo.FetchBranch(ctx, s.Git, dir, updir, source, mirror); err != nil {
353 return store.Repo{}, store.MergeRequest{}, fail(500, err)
354 }
355 s.refsChanged(up)
356 mr, err := s.opCreateMR(ctx, user, up, title, description, mirror, target, draft)
357 if err != nil {
358 return store.Repo{}, store.MergeRequest{}, err
359 }
360 _ = s.Store.SetMRForkSource(ctx, mr.ID, fork.ID, source)
361 return up, mr, nil
362}
363
364// refreshForkMRs: na een push in een fork de gespiegelde branches in
365// upstream bijwerken; AfterPush van upstream start de MR-pipelines.
366func (s *Server) refreshForkMRs(fork store.Repo, user store.User, branch string) {
367 ctx := context.Background()
368 list, err := s.Store.OpenForkMRs(ctx, fork.ID, branch)
369 if err != nil || len(list) == 0 {
370 return
371 }
372 dir := gitrepo.Dir(s.StoragePath(), fork.OwnerPath, fork.Name)
373 for _, m := range list {
374 up, err := s.Store.RepoByID(ctx, m.UpstreamID)
375 if err != nil || !s.canReadRepo(ctx, user.ID, up) {
376 continue
377 }
378 updir := gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name)
379 _ = s.postReceive(ctx, up, user, updir, func() error {
380 return gitrepo.FetchBranch(ctx, s.Git, dir, updir, branch, m.Mirror)
381 })
382 }
383}
384
385func (s *Server) forkMRPost(w http.ResponseWriter, r *http.Request) {
386 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
387 if !ok || !s.csrfOK(w, r) {
388 return
389 }
390 up, mr, err := s.opCreateForkMR(r.Context(), u, repo, r.FormValue("source"), r.FormValue("target"), r.FormValue("title"), r.FormValue("description"), r.FormValue("draft") == "1")
391 if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests/new", err) {
392 return
393 }
394 s.redirect(w, r, repoURL(up)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.mrOpened"), "")
395}
396
397func (s *Server) apiForkMR(w http.ResponseWriter, r *http.Request) {
398 repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)
399 if !ok {
400 return
401 }
402 var body struct {
403 Source string `json:"source_branch"`
404 Target string `json:"target_branch"`
405 Title string `json:"title"`
406 Description string `json:"description"`
407 Draft bool `json:"draft"`
408 }
409 if err := readJSON(r, &body); err != nil {
410 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
411 return
412 }
413 up, mr, err := s.opCreateForkMR(r.Context(), apiUser(r), repo, body.Source, body.Target, body.Title, body.Description, body.Draft)
414 if !s.apiOK(w, r, err) {
415 return
416 }
417 out := s.mrJSON(up, mr)
418 out["source_project"] = repo.FullPath()
419 out["source_project_branch"] = body.Source
420 writeJSON(w, http.StatusCreated, out)
421}
internal/server/mr_page.go +7 −0
@@ -60,6 +60,13 @@ func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
60 60 v.CompareFrom = source
61 61 v.CompareTo = target
62 62 s.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls)
63 if v.User != nil {
64 v.Fork = s.forkInfo(r.Context(), v.User.ID, repo)
65 if v.Fork.Upstream != nil {
66 up := v.Fork.Upstream
67 v.UpstreamBranches, _ = gitrepo.Branches(r.Context(), s.Git, gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name))
68 }
69 }
63 70 s.render(w, "newmr", v)
64 71 }
65 72
@@ -60,6 +60,13 @@ func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
60 v.CompareFrom = source
60 v.CompareFrom = source
61 v.CompareTo = target
61 v.CompareTo = target
62 s.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls)
62 s.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls)
63 if v.User != nil {
64 v.Fork = s.forkInfo(r.Context(), v.User.ID, repo)
65 if v.Fork.Upstream != nil {
66 up := v.Fork.Upstream
67 v.UpstreamBranches, _ = gitrepo.Branches(r.Context(), s.Git, gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name))
68 }
69 }
63 s.render(w, "newmr", v)
70 s.render(w, "newmr", v)
64}
71}
65
72
internal/server/server.go +113 −111
@@ -240,6 +240,7 @@ func (s *Server) Handler() http.Handler {
240 240 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
241 241 mux.HandleFunc("POST /{owner}/{repo}/-/fork", s.forkPost)
242 242 mux.HandleFunc("POST /{owner}/{repo}/-/sync-upstream", s.syncUpstreamPost)
243 mux.HandleFunc("POST /{owner}/{repo}/-/upstream-merge-requests", s.forkMRPost)
243 244 mux.HandleFunc("GET /{owner}/{repo}/-/forks", s.forksPage)
244 245 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
245 246 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
@@ -651,117 +652,118 @@ type View struct {
651 652 // PipeWait: waarom deze pipeline wacht (doNotInterrupt in een oudere pipeline).
652 653 PipeWait string
653 654 // PipeCancel: annuleerknop met bevestiging, nil als annuleren niet kan.
654 PipeCancel *CancelView
655 Live bool
656 LiveURL string
657 Jobs []store.Job
658 JobPage *JobPage
659 Editor *CIEditor
660 Releases []store.Release
661 Members []store.Member
662 Secrets []store.SecretMeta
663 Inherited []InheritedSecret
664 HookSecrets []SecretChoice
665 Hooks []HookView
666 HookTargets []HookTarget
667 HookEdit HookDraft
668 Patterns []string
669 TagPatterns []string
670 Tags []TagRow
671 Tokens []store.TokenInfo
672 ShowExpiry bool
673 Keys []store.SSHKey
674 CloneHTTP string
675 CloneSSH string
676 Group *store.Group
677 Tab string
678 Rev string
679 NewToken string
680 StorageUnset bool
681 StoragePath string
682 StorageFree string
683 StorageUsed string
684 StorageTotal string
685 StoragePercent int
686 StorageBlueGit string
687 StoragePartial bool
688 Cache map[string]any
689 StorageReserved string
690 HasReserved bool
691 MinFree string
692 Wide bool
693 Info bool
694 Help bool
695 HelpDocs []HelpDoc
696 HelpDoc *HelpDoc
697 RunnerUI template.HTML
698 AdminUsers []AdminUserRow
699 ReleaseOnly bool
700 ShowReleases bool
701 ReleaseRepos []store.Repo
702 LangPick template.HTML
703 ShowUpdate bool
704 Update *UpdateView
705 HookDoc string
706 Spec cispec.Doc
707 SpecJSON template.JS
708 APIJSON template.JS
709 Page string
710 Lang string
711 HTMLLang string
712 Cunei bool
713 Langs []LangChoice
714 Query string
715 SortDir string
716 SortBy string
717 MoreRepos int
718 MoreGroups int
719 DashTab string
720 DashPage int
721 DashPages int
722 DashPrev int
723 DashNext int
724 DashRepoN int
725 DashGroupN int
726 Fork ForkInfo
727 ForkTargets []ForkTarget
728 ForkList []store.Repo
729 FlipDir string
730 Cards []RepoCard
731 Head *CommitRow
732 Files []FileRow
733 Tree []FileRow
734 Readme template.HTML
735 ReadmeName string
736 LicensePath string
737 NCommits int
738 NBranches int
739 NTags int
740 NReleases int
741 Created string
742 Lines []CodeLine
743 BlobSize string
744 IsSVG bool
745 IsImage bool // rasterafbeelding met kloppende magic bytes
746 FileName string
747 RevProtected bool
748 Heat *activity.Calendar
749 Notes []NoteRow
750 Profile *store.User
751 Card *ProfileCard
752 DescHTML template.HTML
753 Timeline []TimelineItem
754 CompareFrom string
755 CompareTo string
756 FormTitle string
757 Labels []string
758 CanEditMR bool
759 Issues *IssueBoard
760 IssueDoc string
761 DescTpls []string
762 TplPick string
763 FormBody string
764 Social *card.Meta
655 PipeCancel *CancelView
656 Live bool
657 LiveURL string
658 Jobs []store.Job
659 JobPage *JobPage
660 Editor *CIEditor
661 Releases []store.Release
662 Members []store.Member
663 Secrets []store.SecretMeta
664 Inherited []InheritedSecret
665 HookSecrets []SecretChoice
666 Hooks []HookView
667 HookTargets []HookTarget
668 HookEdit HookDraft
669 Patterns []string
670 TagPatterns []string
671 Tags []TagRow
672 Tokens []store.TokenInfo
673 ShowExpiry bool
674 Keys []store.SSHKey
675 CloneHTTP string
676 CloneSSH string
677 Group *store.Group
678 Tab string
679 Rev string
680 NewToken string
681 StorageUnset bool
682 StoragePath string
683 StorageFree string
684 StorageUsed string
685 StorageTotal string
686 StoragePercent int
687 StorageBlueGit string
688 StoragePartial bool
689 Cache map[string]any
690 StorageReserved string
691 HasReserved bool
692 MinFree string
693 Wide bool
694 Info bool
695 Help bool
696 HelpDocs []HelpDoc
697 HelpDoc *HelpDoc
698 RunnerUI template.HTML
699 AdminUsers []AdminUserRow
700 ReleaseOnly bool
701 ShowReleases bool
702 ReleaseRepos []store.Repo
703 LangPick template.HTML
704 ShowUpdate bool
705 Update *UpdateView
706 HookDoc string
707 Spec cispec.Doc
708 SpecJSON template.JS
709 APIJSON template.JS
710 Page string
711 Lang string
712 HTMLLang string
713 Cunei bool
714 Langs []LangChoice
715 Query string
716 SortDir string
717 SortBy string
718 MoreRepos int
719 MoreGroups int
720 DashTab string
721 DashPage int
722 DashPages int
723 DashPrev int
724 DashNext int
725 DashRepoN int
726 DashGroupN int
727 Fork ForkInfo
728 ForkTargets []ForkTarget
729 ForkList []store.Repo
730 UpstreamBranches []string
731 FlipDir string
732 Cards []RepoCard
733 Head *CommitRow
734 Files []FileRow
735 Tree []FileRow
736 Readme template.HTML
737 ReadmeName string
738 LicensePath string
739 NCommits int
740 NBranches int
741 NTags int
742 NReleases int
743 Created string
744 Lines []CodeLine
745 BlobSize string
746 IsSVG bool
747 IsImage bool // rasterafbeelding met kloppende magic bytes
748 FileName string
749 RevProtected bool
750 Heat *activity.Calendar
751 Notes []NoteRow
752 Profile *store.User
753 Card *ProfileCard
754 DescHTML template.HTML
755 Timeline []TimelineItem
756 CompareFrom string
757 CompareTo string
758 FormTitle string
759 Labels []string
760 CanEditMR bool
761 Issues *IssueBoard
762 IssueDoc string
763 DescTpls []string
764 TplPick string
765 FormBody string
766 Social *card.Meta
765 767 }
766 768
767 769 // LangChoice is één taal in de instellingen.
@@ -240,6 +240,7 @@ func (s *Server) Handler() http.Handler {
240 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
240 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
241 mux.HandleFunc("POST /{owner}/{repo}/-/fork", s.forkPost)
241 mux.HandleFunc("POST /{owner}/{repo}/-/fork", s.forkPost)
242 mux.HandleFunc("POST /{owner}/{repo}/-/sync-upstream", s.syncUpstreamPost)
242 mux.HandleFunc("POST /{owner}/{repo}/-/sync-upstream", s.syncUpstreamPost)
243 mux.HandleFunc("POST /{owner}/{repo}/-/upstream-merge-requests", s.forkMRPost)
243 mux.HandleFunc("GET /{owner}/{repo}/-/forks", s.forksPage)
244 mux.HandleFunc("GET /{owner}/{repo}/-/forks", s.forksPage)
244 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
245 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
245 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
246 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
@@ -651,117 +652,118 @@ type View struct {
651 // PipeWait: waarom deze pipeline wacht (doNotInterrupt in een oudere pipeline).
652 // PipeWait: waarom deze pipeline wacht (doNotInterrupt in een oudere pipeline).
652 PipeWait string
653 PipeWait string
653 // PipeCancel: annuleerknop met bevestiging, nil als annuleren niet kan.
654 // PipeCancel: annuleerknop met bevestiging, nil als annuleren niet kan.
654 PipeCancel *CancelView
655 PipeCancel *CancelView
655 Live bool
656 Live bool
656 LiveURL string
657 LiveURL string
657 Jobs []store.Job
658 Jobs []store.Job
658 JobPage *JobPage
659 JobPage *JobPage
659 Editor *CIEditor
660 Editor *CIEditor
660 Releases []store.Release
661 Releases []store.Release
661 Members []store.Member
662 Members []store.Member
662 Secrets []store.SecretMeta
663 Secrets []store.SecretMeta
663 Inherited []InheritedSecret
664 Inherited []InheritedSecret
664 HookSecrets []SecretChoice
665 HookSecrets []SecretChoice
665 Hooks []HookView
666 Hooks []HookView
666 HookTargets []HookTarget
667 HookTargets []HookTarget
667 HookEdit HookDraft
668 HookEdit HookDraft
668 Patterns []string
669 Patterns []string
669 TagPatterns []string
670 TagPatterns []string
670 Tags []TagRow
671 Tags []TagRow
671 Tokens []store.TokenInfo
672 Tokens []store.TokenInfo
672 ShowExpiry bool
673 ShowExpiry bool
673 Keys []store.SSHKey
674 Keys []store.SSHKey
674 CloneHTTP string
675 CloneHTTP string
675 CloneSSH string
676 CloneSSH string
676 Group *store.Group
677 Group *store.Group
677 Tab string
678 Tab string
678 Rev string
679 Rev string
679 NewToken string
680 NewToken string
680 StorageUnset bool
681 StorageUnset bool
681 StoragePath string
682 StoragePath string
682 StorageFree string
683 StorageFree string
683 StorageUsed string
684 StorageUsed string
684 StorageTotal string
685 StorageTotal string
685 StoragePercent int
686 StoragePercent int
686 StorageBlueGit string
687 StorageBlueGit string
687 StoragePartial bool
688 StoragePartial bool
688 Cache map[string]any
689 Cache map[string]any
689 StorageReserved string
690 StorageReserved string
690 HasReserved bool
691 HasReserved bool
691 MinFree string
692 MinFree string
692 Wide bool
693 Wide bool
693 Info bool
694 Info bool
694 Help bool
695 Help bool
695 HelpDocs []HelpDoc
696 HelpDocs []HelpDoc
696 HelpDoc *HelpDoc
697 HelpDoc *HelpDoc
697 RunnerUI template.HTML
698 RunnerUI template.HTML
698 AdminUsers []AdminUserRow
699 AdminUsers []AdminUserRow
699 ReleaseOnly bool
700 ReleaseOnly bool
700 ShowReleases bool
701 ShowReleases bool
701 ReleaseRepos []store.Repo
702 ReleaseRepos []store.Repo
702 LangPick template.HTML
703 LangPick template.HTML
703 ShowUpdate bool
704 ShowUpdate bool
704 Update *UpdateView
705 Update *UpdateView
705 HookDoc string
706 HookDoc string
706 Spec cispec.Doc
707 Spec cispec.Doc
707 SpecJSON template.JS
708 SpecJSON template.JS
708 APIJSON template.JS
709 APIJSON template.JS
709 Page string
710 Page string
710 Lang string
711 Lang string
711 HTMLLang string
712 HTMLLang string
712 Cunei bool
713 Cunei bool
713 Langs []LangChoice
714 Langs []LangChoice
714 Query string
715 Query string
715 SortDir string
716 SortDir string
716 SortBy string
717 SortBy string
717 MoreRepos int
718 MoreRepos int
718 MoreGroups int
719 MoreGroups int
719 DashTab string
720 DashTab string
720 DashPage int
721 DashPage int
721 DashPages int
722 DashPages int
722 DashPrev int
723 DashPrev int
723 DashNext int
724 DashNext int
724 DashRepoN int
725 DashRepoN int
725 DashGroupN int
726 DashGroupN int
726 Fork ForkInfo
727 Fork ForkInfo
727 ForkTargets []ForkTarget
728 ForkTargets []ForkTarget
728 ForkList []store.Repo
729 ForkList []store.Repo
729 FlipDir string
730 UpstreamBranches []string
730 Cards []RepoCard
731 FlipDir string
731 Head *CommitRow
732 Cards []RepoCard
732 Files []FileRow
733 Head *CommitRow
733 Tree []FileRow
734 Files []FileRow
734 Readme template.HTML
735 Tree []FileRow
735 ReadmeName string
736 Readme template.HTML
736 LicensePath string
737 ReadmeName string
737 NCommits int
738 LicensePath string
738 NBranches int
739 NCommits int
739 NTags int
740 NBranches int
740 NReleases int
741 NTags int
741 Created string
742 NReleases int
742 Lines []CodeLine
743 Created string
743 BlobSize string
744 Lines []CodeLine
744 IsSVG bool
745 BlobSize string
745 IsImage bool // rasterafbeelding met kloppende magic bytes
746 IsSVG bool
746 FileName string
747 IsImage bool // rasterafbeelding met kloppende magic bytes
747 RevProtected bool
748 FileName string
748 Heat *activity.Calendar
749 RevProtected bool
749 Notes []NoteRow
750 Heat *activity.Calendar
750 Profile *store.User
751 Notes []NoteRow
751 Card *ProfileCard
752 Profile *store.User
752 DescHTML template.HTML
753 Card *ProfileCard
753 Timeline []TimelineItem
754 DescHTML template.HTML
754 CompareFrom string
755 Timeline []TimelineItem
755 CompareTo string
756 CompareFrom string
756 FormTitle string
757 CompareTo string
757 Labels []string
758 FormTitle string
758 CanEditMR bool
759 Labels []string
759 Issues *IssueBoard
760 CanEditMR bool
760 IssueDoc string
761 Issues *IssueBoard
761 DescTpls []string
762 IssueDoc string
762 TplPick string
763 DescTpls []string
763 FormBody string
764 TplPick string
764 Social *card.Meta
765 FormBody string
766 Social *card.Meta
765}
767}
766
768
767// LangChoice is één taal in de instellingen.
769// LangChoice is één taal in de instellingen.
internal/server/templates/newmr.html +12 −0
@@ -75,5 +75,17 @@
75 75 </form>
76 76 <script src="/assets/mr.js"></script>
77 77 {{end}}
78 {{if .Fork.Upstream}}
79 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/upstream-merge-requests">
80 <h2 class="tiphost">{{t "fork.mrTitle" .Fork.Upstream.FullPath}} {{tip "fork.mrTip"}}</h2>
81 <input type="hidden" name="csrf" value="{{.CSRF}}">
82 <label>{{t "fork.mrSource"}} <select name="source">{{range .Branches}}<option{{if eq .Name $.CompareFrom}} selected{{end}}>{{.Name}}</option>{{end}}</select></label>
83 <label>{{t "fork.mrTarget"}} <select name="target">{{range .UpstreamBranches}}<option{{if eq . $.Fork.Upstream.DefaultBranch}} selected{{end}}>{{.}}</option>{{end}}</select></label>
84 <label>{{t "mr.titleField"}} <input name="title" required></label>
85 <label>{{t "mr.description"}} <textarea name="description"></textarea></label>
86 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
87 <button type="submit">{{t "mr.create"}}</button>
88 </form>
89 {{end}}
78 90 {{template "layout-end" .}}
79 91 {{end}}
@@ -75,5 +75,17 @@
75</form>
75</form>
76<script src="/assets/mr.js"></script>
76<script src="/assets/mr.js"></script>
77{{end}}
77{{end}}
78{{if .Fork.Upstream}}
79<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/upstream-merge-requests">
80 <h2 class="tiphost">{{t "fork.mrTitle" .Fork.Upstream.FullPath}} {{tip "fork.mrTip"}}</h2>
81 <input type="hidden" name="csrf" value="{{.CSRF}}">
82 <label>{{t "fork.mrSource"}} <select name="source">{{range .Branches}}<option{{if eq .Name $.CompareFrom}} selected{{end}}>{{.Name}}</option>{{end}}</select></label>
83 <label>{{t "fork.mrTarget"}} <select name="target">{{range .UpstreamBranches}}<option{{if eq . $.Fork.Upstream.DefaultBranch}} selected{{end}}>{{.}}</option>{{end}}</select></label>
84 <label>{{t "mr.titleField"}} <input name="title" required></label>
85 <label>{{t "mr.description"}} <textarea name="description"></textarea></label>
86 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
87 <button type="submit">{{t "mr.create"}}</button>
88</form>
89{{end}}
78{{template "layout-end" .}}
90{{template "layout-end" .}}
79{{end}}
91{{end}}
internal/store/forks.go +39 −0
@@ -32,3 +32,42 @@ func (s *Store) ForkIDs(ctx context.Context, upstreamID int64) ([]int64, error)
32 32 }
33 33 return out, rows.Err()
34 34 }
35
36 // SetMRForkSource: deze MR komt uit branch van fork repoID.
37 func (s *Store) SetMRForkSource(ctx context.Context, mrID, repoID int64, branch string) error {
38 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET source_repo_id = ?, source_repo_branch = ? WHERE id = ?`, repoID, branch, mrID)
39 return err
40 }
41
42 // MRForkSource geeft de fork en branch van een MR (0 = zelfde repo).
43 func (s *Store) MRForkSource(ctx context.Context, mrID int64) (int64, string, error) {
44 var id int64
45 var b string
46 err := s.db.QueryRowContext(ctx, `SELECT source_repo_id, source_repo_branch FROM merge_requests WHERE id = ?`, mrID).Scan(&id, &b)
47 return id, b, err
48 }
49
50 // ForkMR is een open MR in upstream met een branch uit een fork als bron.
51 type ForkMR struct {
52 MRID, UpstreamID int64
53 Number int64
54 Mirror string // branch in upstream (forks/...)
55 }
56
57 // OpenForkMRs: open MR's die forkBranch van fork als bron hebben.
58 func (s *Store) OpenForkMRs(ctx context.Context, forkID int64, forkBranch string) ([]ForkMR, error) {
59 rows, err := s.db.QueryContext(ctx, `SELECT id, repo_id, number, source_branch FROM merge_requests WHERE source_repo_id = ? AND source_repo_branch = ? AND status = 'open'`, forkID, forkBranch)
60 if err != nil {
61 return nil, err
62 }
63 defer rows.Close()
64 var out []ForkMR
65 for rows.Next() {
66 var m ForkMR
67 if err := rows.Scan(&m.MRID, &m.UpstreamID, &m.Number, &m.Mirror); err != nil {
68 return nil, err
69 }
70 out = append(out, m)
71 }
72 return out, rows.Err()
73 }
@@ -32,3 +32,42 @@ func (s *Store) ForkIDs(ctx context.Context, upstreamID int64) ([]int64, error)
32 }
32 }
33 return out, rows.Err()
33 return out, rows.Err()
34}
34}
35
36// SetMRForkSource: deze MR komt uit branch van fork repoID.
37func (s *Store) SetMRForkSource(ctx context.Context, mrID, repoID int64, branch string) error {
38 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET source_repo_id = ?, source_repo_branch = ? WHERE id = ?`, repoID, branch, mrID)
39 return err
40}
41
42// MRForkSource geeft de fork en branch van een MR (0 = zelfde repo).
43func (s *Store) MRForkSource(ctx context.Context, mrID int64) (int64, string, error) {
44 var id int64
45 var b string
46 err := s.db.QueryRowContext(ctx, `SELECT source_repo_id, source_repo_branch FROM merge_requests WHERE id = ?`, mrID).Scan(&id, &b)
47 return id, b, err
48}
49
50// ForkMR is een open MR in upstream met een branch uit een fork als bron.
51type ForkMR struct {
52 MRID, UpstreamID int64
53 Number int64
54 Mirror string // branch in upstream (forks/...)
55}
56
57// OpenForkMRs: open MR's die forkBranch van fork als bron hebben.
58func (s *Store) OpenForkMRs(ctx context.Context, forkID int64, forkBranch string) ([]ForkMR, error) {
59 rows, err := s.db.QueryContext(ctx, `SELECT id, repo_id, number, source_branch FROM merge_requests WHERE source_repo_id = ? AND source_repo_branch = ? AND status = 'open'`, forkID, forkBranch)
60 if err != nil {
61 return nil, err
62 }
63 defer rows.Close()
64 var out []ForkMR
65 for rows.Next() {
66 var m ForkMR
67 if err := rows.Scan(&m.MRID, &m.UpstreamID, &m.Number, &m.Mirror); err != nil {
68 return nil, err
69 }
70 out = append(out, m)
71 }
72 return out, rows.Err()
73}
internal/store/store.go +2 −0
@@ -66,6 +66,8 @@ func (s *Store) migrate() error {
66 66 `ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
67 67 `ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
68 68 `ALTER TABLE repos ADD COLUMN fork_of INTEGER NOT NULL DEFAULT 0`,
69 `ALTER TABLE merge_requests ADD COLUMN source_repo_id INTEGER NOT NULL DEFAULT 0`,
70 `ALTER TABLE merge_requests ADD COLUMN source_repo_branch TEXT NOT NULL DEFAULT ''`,
69 71 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
70 72 `ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
71 73 `ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,
@@ -66,6 +66,8 @@ func (s *Store) migrate() error {
66 `ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
66 `ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
67 `ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
67 `ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
68 `ALTER TABLE repos ADD COLUMN fork_of INTEGER NOT NULL DEFAULT 0`,
68 `ALTER TABLE repos ADD COLUMN fork_of INTEGER NOT NULL DEFAULT 0`,
69 `ALTER TABLE merge_requests ADD COLUMN source_repo_id INTEGER NOT NULL DEFAULT 0`,
70 `ALTER TABLE merge_requests ADD COLUMN source_repo_branch TEXT NOT NULL DEFAULT ''`,
69 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
71 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
70 `ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
72 `ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
71 `ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,
73 `ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,