BlueGit

timfa bluegit

Merge branch 'cursor/api-agents' into 'stage'

timfa

Authored 2026-10-24 · 3 weeks ago

Hash
455f85abe4632aacd9c6f60a864a6ef01ab4d6cc
Pipeline
Passed
9 files changed +383 −28
internal/i18n/catalog_hookev.go +8 −0
@@ -8,6 +8,8 @@ func init() {
8 8 }
9 9
10 10 var hookEvEN = map[string]string{
11 "err.badSHA": "Give sha as 7 to 40 hex characters.",
12 "err.pipeFilter": "Use either ref or mr, not both.",
11 13 "set.ev.issue_opened": "issue opened",
12 14 "set.ev.issue_closed": "issue closed",
13 15 "set.ev.issue_reopened": "issue reopened",
@@ -17,6 +19,8 @@ var hookEvEN = map[string]string{
17 19 }
18 20
19 21 var hookEvNL = map[string]string{
22 "err.badSHA": "Geef sha als 7 tot 40 hextekens.",
23 "err.pipeFilter": "Gebruik ref of mr, niet allebei.",
20 24 "set.ev.issue_opened": "issue geopend",
21 25 "set.ev.issue_closed": "issue gesloten",
22 26 "set.ev.issue_reopened": "issue heropend",
@@ -26,6 +30,8 @@ var hookEvNL = map[string]string{
26 30 }
27 31
28 32 var hookEvDE = map[string]string{
33 "err.badSHA": "Gib sha als 7 bis 40 Hexzeichen an.",
34 "err.pipeFilter": "Nutze ref oder mr, nicht beides.",
29 35 "set.ev.issue_opened": "Issue eröffnet",
30 36 "set.ev.issue_closed": "Issue geschlossen",
31 37 "set.ev.issue_reopened": "Issue wieder geöffnet",
@@ -35,6 +41,8 @@ var hookEvDE = map[string]string{
35 41 }
36 42
37 43 var hookEvFR = map[string]string{
44 "err.badSHA": "Donnez sha en 7 à 40 caractères hexadécimaux.",
45 "err.pipeFilter": "Utilisez ref ou mr, pas les deux.",
38 46 "set.ev.issue_opened": "ticket ouvert",
39 47 "set.ev.issue_closed": "ticket fermé",
40 48 "set.ev.issue_reopened": "ticket rouvert",
@@ -8,6 +8,8 @@ func init() {
8}
8}
9
9
10var hookEvEN = map[string]string{
10var hookEvEN = map[string]string{
11 "err.badSHA": "Give sha as 7 to 40 hex characters.",
12 "err.pipeFilter": "Use either ref or mr, not both.",
11 "set.ev.issue_opened": "issue opened",
13 "set.ev.issue_opened": "issue opened",
12 "set.ev.issue_closed": "issue closed",
14 "set.ev.issue_closed": "issue closed",
13 "set.ev.issue_reopened": "issue reopened",
15 "set.ev.issue_reopened": "issue reopened",
@@ -17,6 +19,8 @@ var hookEvEN = map[string]string{
17}
19}
18
20
19var hookEvNL = map[string]string{
21var hookEvNL = map[string]string{
22 "err.badSHA": "Geef sha als 7 tot 40 hextekens.",
23 "err.pipeFilter": "Gebruik ref of mr, niet allebei.",
20 "set.ev.issue_opened": "issue geopend",
24 "set.ev.issue_opened": "issue geopend",
21 "set.ev.issue_closed": "issue gesloten",
25 "set.ev.issue_closed": "issue gesloten",
22 "set.ev.issue_reopened": "issue heropend",
26 "set.ev.issue_reopened": "issue heropend",
@@ -26,6 +30,8 @@ var hookEvNL = map[string]string{
26}
30}
27
31
28var hookEvDE = map[string]string{
32var hookEvDE = map[string]string{
33 "err.badSHA": "Gib sha als 7 bis 40 Hexzeichen an.",
34 "err.pipeFilter": "Nutze ref oder mr, nicht beides.",
29 "set.ev.issue_opened": "Issue eröffnet",
35 "set.ev.issue_opened": "Issue eröffnet",
30 "set.ev.issue_closed": "Issue geschlossen",
36 "set.ev.issue_closed": "Issue geschlossen",
31 "set.ev.issue_reopened": "Issue wieder geöffnet",
37 "set.ev.issue_reopened": "Issue wieder geöffnet",
@@ -35,6 +41,8 @@ var hookEvDE = map[string]string{
35}
41}
36
42
37var hookEvFR = map[string]string{
43var hookEvFR = map[string]string{
44 "err.badSHA": "Donnez sha en 7 à 40 caractères hexadécimaux.",
45 "err.pipeFilter": "Utilisez ref ou mr, pas les deux.",
38 "set.ev.issue_opened": "ticket ouvert",
46 "set.ev.issue_opened": "ticket ouvert",
39 "set.ev.issue_closed": "ticket fermé",
47 "set.ev.issue_closed": "ticket fermé",
40 "set.ev.issue_reopened": "ticket rouvert",
48 "set.ev.issue_reopened": "ticket rouvert",
internal/server/api.go +4 −0
@@ -49,6 +49,10 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
49 49 return
50 50 }
51 51 role, err := s.Store.EffectiveRole(r.Context(), author.ID, repo.ID)
52 if err == nil && !role.CanRead() && repo.Visibility != "public" {
53 s.writeAPIErr(w, r, fail(http.StatusNotFound, i18n.E("err.notFound")))
54 return
55 }
52 56 if err != nil || !role.AtLeast(access.RoleMaintainer) {
53 57 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.onlyAdmin")))
54 58 return
@@ -49,6 +49,10 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
49 return
49 return
50 }
50 }
51 role, err := s.Store.EffectiveRole(r.Context(), author.ID, repo.ID)
51 role, err := s.Store.EffectiveRole(r.Context(), author.ID, repo.ID)
52 if err == nil && !role.CanRead() && repo.Visibility != "public" {
53 s.writeAPIErr(w, r, fail(http.StatusNotFound, i18n.E("err.notFound")))
54 return
55 }
52 if err != nil || !role.AtLeast(access.RoleMaintainer) {
56 if err != nil || !role.AtLeast(access.RoleMaintainer) {
53 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.onlyAdmin")))
57 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.onlyAdmin")))
54 return
58 return
internal/server/api_flow.go +57 −1
@@ -78,9 +78,23 @@ func (s *Server) apiMRs(w http.ResponseWriter, r *http.Request) {
78 78 if !s.apiOK(w, r, err) {
79 79 return
80 80 }
81 // Optionele filters: state (open, merged, closed of all), source_branch, target_branch.
82 q := r.URL.Query()
83 wantState := strings.TrimSpace(q.Get("state"))
84 wantSource := strings.TrimSpace(q.Get("source_branch"))
85 wantTarget := strings.TrimSpace(q.Get("target_branch"))
81 86 page, per := pageQuery(r)
82 87 rows := make([]map[string]any, 0, len(list))
83 88 for _, mr := range list {
89 if wantState != "" && wantState != "all" && mr.Status != wantState {
90 continue
91 }
92 if wantSource != "" && mr.SourceBranch != wantSource {
93 continue
94 }
95 if wantTarget != "" && mr.TargetBranch != wantTarget {
96 continue
97 }
84 98 rows = append(rows, s.mrJSON(repo, mr))
85 99 }
86 100 writePage(w, r, slicePage(rows, page, per), len(rows), page, per)
@@ -364,7 +378,11 @@ func (s *Server) apiPipelines(w http.ResponseWriter, r *http.Request) {
364 378 })
365 379 return
366 380 }
367 list, err := s.Store.ListPipelines(r.Context(), repo.ID)
381 f, err := s.pipelineFilter(r, repo)
382 if !s.apiOK(w, r, err) {
383 return
384 }
385 list, err := s.Store.FindPipelines(r.Context(), repo.ID, f)
368 386 if !s.apiOK(w, r, err) {
369 387 return
370 388 }
@@ -697,3 +715,41 @@ func (s *Server) apiReleaseAsset(w http.ResponseWriter, r *http.Request) {
697 715 }
698 716 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
699 717 }
718
719 // pipelineFilter leest sha, ref en mr uit de query.
720 // ref mag een branchnaam zijn (refs/heads/ en refs/tags/ worden geprobeerd)
721 // of een volledige ref. mr is het MR-nummer: pipelines van die MR plus
722 // pushes naar de bronbranch.
723 func (s *Server) pipelineFilter(r *http.Request, repo store.Repo) (store.PipelineFilter, error) {
724 q := r.URL.Query()
725 var f store.PipelineFilter
726 if sha := strings.TrimSpace(q.Get("sha")); sha != "" {
727 if len(sha) < 7 || len(sha) > 40 || strings.Trim(strings.ToLower(sha), "0123456789abcdef") != "" {
728 return f, fail(400, i18n.E("err.badSHA"))
729 }
730 f.SHA = sha
731 }
732 if ref := strings.TrimSpace(q.Get("ref")); ref != "" {
733 if strings.HasPrefix(ref, "refs/") {
734 f.Refs = []string{ref}
735 } else {
736 f.Refs = []string{"refs/heads/" + ref, "refs/tags/" + ref}
737 }
738 }
739 if raw := strings.TrimSpace(q.Get("mr")); raw != "" {
740 n, err := strconv.ParseInt(raw, 10, 64)
741 if err != nil || n < 1 {
742 return f, fail(400, i18n.E("err.notFound"))
743 }
744 mr, err := s.Store.MergeRequestByNumber(r.Context(), repo.ID, n)
745 if err != nil {
746 return f, notFound(err)
747 }
748 if len(f.Refs) > 0 {
749 return f, fail(400, i18n.E("err.pipeFilter"))
750 }
751 f.MRID = mr.ID
752 f.Refs = []string{"refs/heads/" + mr.SourceBranch}
753 }
754 return f, nil
755 }
@@ -78,9 +78,23 @@ func (s *Server) apiMRs(w http.ResponseWriter, r *http.Request) {
78 if !s.apiOK(w, r, err) {
78 if !s.apiOK(w, r, err) {
79 return
79 return
80 }
80 }
81 // Optionele filters: state (open, merged, closed of all), source_branch, target_branch.
82 q := r.URL.Query()
83 wantState := strings.TrimSpace(q.Get("state"))
84 wantSource := strings.TrimSpace(q.Get("source_branch"))
85 wantTarget := strings.TrimSpace(q.Get("target_branch"))
81 page, per := pageQuery(r)
86 page, per := pageQuery(r)
82 rows := make([]map[string]any, 0, len(list))
87 rows := make([]map[string]any, 0, len(list))
83 for _, mr := range list {
88 for _, mr := range list {
89 if wantState != "" && wantState != "all" && mr.Status != wantState {
90 continue
91 }
92 if wantSource != "" && mr.SourceBranch != wantSource {
93 continue
94 }
95 if wantTarget != "" && mr.TargetBranch != wantTarget {
96 continue
97 }
84 rows = append(rows, s.mrJSON(repo, mr))
98 rows = append(rows, s.mrJSON(repo, mr))
85 }
99 }
86 writePage(w, r, slicePage(rows, page, per), len(rows), page, per)
100 writePage(w, r, slicePage(rows, page, per), len(rows), page, per)
@@ -364,7 +378,11 @@ func (s *Server) apiPipelines(w http.ResponseWriter, r *http.Request) {
364 })
378 })
365 return
379 return
366 }
380 }
367 list, err := s.Store.ListPipelines(r.Context(), repo.ID)
381 f, err := s.pipelineFilter(r, repo)
382 if !s.apiOK(w, r, err) {
383 return
384 }
385 list, err := s.Store.FindPipelines(r.Context(), repo.ID, f)
368 if !s.apiOK(w, r, err) {
386 if !s.apiOK(w, r, err) {
369 return
387 return
370 }
388 }
@@ -697,3 +715,41 @@ func (s *Server) apiReleaseAsset(w http.ResponseWriter, r *http.Request) {
697 }
715 }
698 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
716 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
699}
717}
718
719// pipelineFilter leest sha, ref en mr uit de query.
720// ref mag een branchnaam zijn (refs/heads/ en refs/tags/ worden geprobeerd)
721// of een volledige ref. mr is het MR-nummer: pipelines van die MR plus
722// pushes naar de bronbranch.
723func (s *Server) pipelineFilter(r *http.Request, repo store.Repo) (store.PipelineFilter, error) {
724 q := r.URL.Query()
725 var f store.PipelineFilter
726 if sha := strings.TrimSpace(q.Get("sha")); sha != "" {
727 if len(sha) < 7 || len(sha) > 40 || strings.Trim(strings.ToLower(sha), "0123456789abcdef") != "" {
728 return f, fail(400, i18n.E("err.badSHA"))
729 }
730 f.SHA = sha
731 }
732 if ref := strings.TrimSpace(q.Get("ref")); ref != "" {
733 if strings.HasPrefix(ref, "refs/") {
734 f.Refs = []string{ref}
735 } else {
736 f.Refs = []string{"refs/heads/" + ref, "refs/tags/" + ref}
737 }
738 }
739 if raw := strings.TrimSpace(q.Get("mr")); raw != "" {
740 n, err := strconv.ParseInt(raw, 10, 64)
741 if err != nil || n < 1 {
742 return f, fail(400, i18n.E("err.notFound"))
743 }
744 mr, err := s.Store.MergeRequestByNumber(r.Context(), repo.ID, n)
745 if err != nil {
746 return f, notFound(err)
747 }
748 if len(f.Refs) > 0 {
749 return f, fail(400, i18n.E("err.pipeFilter"))
750 }
751 f.MRID = mr.ID
752 f.Refs = []string{"refs/heads/" + mr.SourceBranch}
753 }
754 return f, nil
755}
internal/server/api_routes.go +25 −25
@@ -43,11 +43,11 @@ var apiCatalog = []apiRoute{
43 43
44 44 {http.MethodGet, "/api/v1/projects", access.ScopeRead, authUser, "List projects", (*Server).apiListProjects},
45 45 {http.MethodPost, "/api/v1/projects", access.ScopeWrite, authUser, "Create project", (*Server).apiCreateProject},
46 {http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authUser, "Get project", (*Server).apiGetProject},
46 {http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authOptional, "Get project", (*Server).apiGetProject},
47 47 {http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
48 48 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project", (*Server).apiDeleteProject},
49 49 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
50 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authUser, "Project logo", (*Server).apiProjectLogo},
50 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authOptional, "Project logo", (*Server).apiProjectLogo},
51 51 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeWrite, authUser, "Upload project logo", (*Server).apiProjectLogo},
52 52 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/members", access.ScopeRead, authUser, "List project members", (*Server).apiProjectMembers},
53 53 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/members", access.ScopeWrite, authUser, "Add project member", (*Server).apiProjectMembers},
@@ -67,33 +67,33 @@ var apiCatalog = []apiRoute{
67 67 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/protected_tags", access.ScopeWrite, authUser, "Protect tag pattern", (*Server).apiProtectTags},
68 68 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/protected_tags/{pattern...}", access.ScopeWrite, authUser, "Unprotect tag pattern", (*Server).apiUnprotectTag},
69 69
70 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoRead, authUser, "List branches", (*Server).apiBranches},
70 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoRead, authOptional, "List branches", (*Server).apiBranches},
71 71 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoWrite, authUser, "Create branch", (*Server).apiBranches},
72 72 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/repository/branches/{branch...}", access.ScopeRepoWrite, authUser, "Rename branch", (*Server).apiBranch},
73 73 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/repository/branches/{branch...}", access.ScopeRepoWrite, authUser, "Delete branch", (*Server).apiBranch},
74 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoRead, authUser, "List tags", (*Server).apiTags},
74 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoRead, authOptional, "List tags", (*Server).apiTags},
75 75 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoWrite, authUser, "Create tag", (*Server).apiTags},
76 76 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}", access.ScopeRepoWrite, authUser, "Delete tag", (*Server).apiDeleteTag},
77 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}/archive", access.ScopeRepoRead, authUser, "Download tag archive", (*Server).apiTagArchive},
78 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tree", access.ScopeRepoRead, authUser, "List tree", (*Server).apiTree},
79 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/files/{path...}", access.ScopeRepoRead, authUser, "Read file", (*Server).apiFile},
80 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoRead, authUser, "List commits", (*Server).apiCommits},
77 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}/archive", access.ScopeRepoRead, authOptional, "Download tag archive", (*Server).apiTagArchive},
78 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tree", access.ScopeRepoRead, authOptional, "List tree", (*Server).apiTree},
79 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/files/{path...}", access.ScopeRepoRead, authOptional, "Read file", (*Server).apiFile},
80 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoRead, authOptional, "List commits", (*Server).apiCommits},
81 81 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoWrite, authUser, "Create commit", (*Server).apiCommits},
82 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}", access.ScopeRepoRead, authUser, "Get commit", (*Server).apiCommit},
83 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}/diff", access.ScopeRepoRead, authUser, "Commit diff", (*Server).apiCommitDiff},
82 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}", access.ScopeRepoRead, authOptional, "Get commit", (*Server).apiCommit},
83 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}/diff", access.ScopeRepoRead, authOptional, "Commit diff", (*Server).apiCommitDiff},
84 84
85 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeRead, authUser, "List issues", (*Server).issuesAPI},
85 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeRead, authOptional, "List issues", (*Server).issuesAPI},
86 86 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeWrite, authUser, "Create issue", (*Server).issuesAPI},
87 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeRead, authUser, "Get issue", (*Server).issueAPI},
87 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeRead, authOptional, "Get issue", (*Server).issueAPI},
88 88 {http.MethodPut, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeWrite, authUser, "Update issue", (*Server).issueAPI},
89 89 {http.MethodDelete, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeWrite, authUser, "Delete issue", (*Server).issueAPI},
90 90 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/issues/{number}/notes", access.ScopeWrite, authUser, "Create issue note", (*Server).issueNoteAPI},
91 91
92 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeRead, authUser, "List merge requests", (*Server).apiMRs},
92 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeRead, authOptional, "List merge requests. Optional query: state (open, merged, closed, all), source_branch, target_branch.", (*Server).apiMRs},
93 93 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeWrite, authUser, "Create merge request", (*Server).apiMRs},
94 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeRead, authUser, "Get merge request", (*Server).apiMR},
94 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeRead, authOptional, "Get merge request", (*Server).apiMR},
95 95 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeWrite, authUser, "Update merge request", (*Server).apiMR},
96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeRead, authUser, "List notes", (*Server).apiMRNotes},
96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeRead, authOptional, "List notes", (*Server).apiMRNotes},
97 97 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeWrite, authUser, "Create note", (*Server).apiMRNotes},
98 98 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reviews", access.ScopeWrite, authUser, "Submit review", (*Server).apiReview},
99 99 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reviews/dismiss", access.ScopeWrite, authUser, "Dismiss review", (*Server).apiDismissReview},
@@ -102,26 +102,26 @@ var apiCatalog = []apiRoute{
102 102 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/close", access.ScopeWrite, authUser, "Close merge request", (*Server).apiCloseMR},
103 103 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reopen", access.ScopeWrite, authUser, "Reopen merge request", (*Server).apiReopenMR},
104 104
105 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authUser, "List pipelines", (*Server).apiPipelines},
105 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authOptional, "List pipelines, newest first. Optional query: sha (7-40 hex, prefix), ref (branch, tag or full ref), mr (merge request number; its pipelines plus pushes to its source branch).", (*Server).apiPipelines},
106 106 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeWrite, authUser, "Start pipeline", (*Server).apiPipelines},
107 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authUser, "Get pipeline", (*Server).apiPipeline},
107 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authOptional, "Get pipeline", (*Server).apiPipeline},
108 108 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline", (*Server).apiCancelPipeline},
109 109 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/retry", access.ScopeWrite, authUser, "Retry pipeline", (*Server).apiRetryPipeline},
110 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authUser, "List jobs", (*Server).apiJobs},
111 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authUser, "Get job", (*Server).apiJob},
112 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authUser, "Job log", (*Server).apiJobLog},
110 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authOptional, "List jobs", (*Server).apiJobs},
111 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authOptional, "Get job", (*Server).apiJob},
112 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authOptional, "Job log", (*Server).apiJobLog},
113 113 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/play", access.ScopeWrite, authUser, "Play manual job", (*Server).apiPlayJob},
114 114 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/retry", access.ScopeWrite, authUser, "Retry job", (*Server).apiRetryJob},
115 115 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job", (*Server).apiCancelJob},
116 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authUser, "List artifacts", (*Server).apiArtifacts},
117 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authUser, "Download artifact", (*Server).apiArtifact},
116 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authOptional, "List artifacts", (*Server).apiArtifacts},
117 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authOptional, "Download artifact", (*Server).apiArtifact},
118 118
119 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoRead, authUser, "Read CI file", (*Server).apiCIFile},
119 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoRead, authOptional, "Read CI file", (*Server).apiCIFile},
120 120 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoWrite, authUser, "Save CI file", (*Server).apiCIFile},
121 121 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/ci/lint", access.ScopeRead, authUser, "Lint CI file", (*Server).apiLintCI},
122 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authUser, "List releases", (*Server).apiReleases},
122 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authOptional, "List releases", (*Server).apiReleases},
123 123 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeWrite, authUser, "Publish release", (*Server).createRelease},
124 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authUser, "Download release asset", (*Server).apiReleaseAsset},
124 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authOptional, "Download release asset", (*Server).apiReleaseAsset},
125 125 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/releases", access.ScopeWrite, authRelease, "Publish release from a job or user token", (*Server).createRelease},
126 126
127 127 {http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
@@ -43,11 +43,11 @@ var apiCatalog = []apiRoute{
43
43
44 {http.MethodGet, "/api/v1/projects", access.ScopeRead, authUser, "List projects", (*Server).apiListProjects},
44 {http.MethodGet, "/api/v1/projects", access.ScopeRead, authUser, "List projects", (*Server).apiListProjects},
45 {http.MethodPost, "/api/v1/projects", access.ScopeWrite, authUser, "Create project", (*Server).apiCreateProject},
45 {http.MethodPost, "/api/v1/projects", access.ScopeWrite, authUser, "Create project", (*Server).apiCreateProject},
46 {http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authUser, "Get project", (*Server).apiGetProject},
46 {http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authOptional, "Get project", (*Server).apiGetProject},
47 {http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
47 {http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
48 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project", (*Server).apiDeleteProject},
48 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project", (*Server).apiDeleteProject},
49 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
49 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
50 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authUser, "Project logo", (*Server).apiProjectLogo},
50 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authOptional, "Project logo", (*Server).apiProjectLogo},
51 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeWrite, authUser, "Upload project logo", (*Server).apiProjectLogo},
51 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeWrite, authUser, "Upload project logo", (*Server).apiProjectLogo},
52 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/members", access.ScopeRead, authUser, "List project members", (*Server).apiProjectMembers},
52 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/members", access.ScopeRead, authUser, "List project members", (*Server).apiProjectMembers},
53 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/members", access.ScopeWrite, authUser, "Add project member", (*Server).apiProjectMembers},
53 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/members", access.ScopeWrite, authUser, "Add project member", (*Server).apiProjectMembers},
@@ -67,33 +67,33 @@ var apiCatalog = []apiRoute{
67 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/protected_tags", access.ScopeWrite, authUser, "Protect tag pattern", (*Server).apiProtectTags},
67 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/protected_tags", access.ScopeWrite, authUser, "Protect tag pattern", (*Server).apiProtectTags},
68 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/protected_tags/{pattern...}", access.ScopeWrite, authUser, "Unprotect tag pattern", (*Server).apiUnprotectTag},
68 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/protected_tags/{pattern...}", access.ScopeWrite, authUser, "Unprotect tag pattern", (*Server).apiUnprotectTag},
69
69
70 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoRead, authUser, "List branches", (*Server).apiBranches},
70 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoRead, authOptional, "List branches", (*Server).apiBranches},
71 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoWrite, authUser, "Create branch", (*Server).apiBranches},
71 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/branches", access.ScopeRepoWrite, authUser, "Create branch", (*Server).apiBranches},
72 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/repository/branches/{branch...}", access.ScopeRepoWrite, authUser, "Rename branch", (*Server).apiBranch},
72 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/repository/branches/{branch...}", access.ScopeRepoWrite, authUser, "Rename branch", (*Server).apiBranch},
73 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/repository/branches/{branch...}", access.ScopeRepoWrite, authUser, "Delete branch", (*Server).apiBranch},
73 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/repository/branches/{branch...}", access.ScopeRepoWrite, authUser, "Delete branch", (*Server).apiBranch},
74 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoRead, authUser, "List tags", (*Server).apiTags},
74 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoRead, authOptional, "List tags", (*Server).apiTags},
75 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoWrite, authUser, "Create tag", (*Server).apiTags},
75 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/tags", access.ScopeRepoWrite, authUser, "Create tag", (*Server).apiTags},
76 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}", access.ScopeRepoWrite, authUser, "Delete tag", (*Server).apiDeleteTag},
76 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}", access.ScopeRepoWrite, authUser, "Delete tag", (*Server).apiDeleteTag},
77 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}/archive", access.ScopeRepoRead, authUser, "Download tag archive", (*Server).apiTagArchive},
77 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tags/{tag}/archive", access.ScopeRepoRead, authOptional, "Download tag archive", (*Server).apiTagArchive},
78 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tree", access.ScopeRepoRead, authUser, "List tree", (*Server).apiTree},
78 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/tree", access.ScopeRepoRead, authOptional, "List tree", (*Server).apiTree},
79 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/files/{path...}", access.ScopeRepoRead, authUser, "Read file", (*Server).apiFile},
79 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/files/{path...}", access.ScopeRepoRead, authOptional, "Read file", (*Server).apiFile},
80 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoRead, authUser, "List commits", (*Server).apiCommits},
80 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoRead, authOptional, "List commits", (*Server).apiCommits},
81 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoWrite, authUser, "Create commit", (*Server).apiCommits},
81 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/repository/commits", access.ScopeRepoWrite, authUser, "Create commit", (*Server).apiCommits},
82 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}", access.ScopeRepoRead, authUser, "Get commit", (*Server).apiCommit},
82 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}", access.ScopeRepoRead, authOptional, "Get commit", (*Server).apiCommit},
83 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}/diff", access.ScopeRepoRead, authUser, "Commit diff", (*Server).apiCommitDiff},
83 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/repository/commits/{sha}/diff", access.ScopeRepoRead, authOptional, "Commit diff", (*Server).apiCommitDiff},
84
84
85 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeRead, authUser, "List issues", (*Server).issuesAPI},
85 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeRead, authOptional, "List issues", (*Server).issuesAPI},
86 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeWrite, authUser, "Create issue", (*Server).issuesAPI},
86 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/issues", access.ScopeWrite, authUser, "Create issue", (*Server).issuesAPI},
87 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeRead, authUser, "Get issue", (*Server).issueAPI},
87 {http.MethodGet, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeRead, authOptional, "Get issue", (*Server).issueAPI},
88 {http.MethodPut, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeWrite, authUser, "Update issue", (*Server).issueAPI},
88 {http.MethodPut, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeWrite, authUser, "Update issue", (*Server).issueAPI},
89 {http.MethodDelete, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeWrite, authUser, "Delete issue", (*Server).issueAPI},
89 {http.MethodDelete, "/api/v1/repos/{owner}/{repo}/issues/{number}", access.ScopeWrite, authUser, "Delete issue", (*Server).issueAPI},
90 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/issues/{number}/notes", access.ScopeWrite, authUser, "Create issue note", (*Server).issueNoteAPI},
90 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/issues/{number}/notes", access.ScopeWrite, authUser, "Create issue note", (*Server).issueNoteAPI},
91
91
92 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeRead, authUser, "List merge requests", (*Server).apiMRs},
92 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeRead, authOptional, "List merge requests. Optional query: state (open, merged, closed, all), source_branch, target_branch.", (*Server).apiMRs},
93 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeWrite, authUser, "Create merge request", (*Server).apiMRs},
93 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests", access.ScopeWrite, authUser, "Create merge request", (*Server).apiMRs},
94 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeRead, authUser, "Get merge request", (*Server).apiMR},
94 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeRead, authOptional, "Get merge request", (*Server).apiMR},
95 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeWrite, authUser, "Update merge request", (*Server).apiMR},
95 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}", access.ScopeWrite, authUser, "Update merge request", (*Server).apiMR},
96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeRead, authUser, "List notes", (*Server).apiMRNotes},
96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeRead, authOptional, "List notes", (*Server).apiMRNotes},
97 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeWrite, authUser, "Create note", (*Server).apiMRNotes},
97 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/notes", access.ScopeWrite, authUser, "Create note", (*Server).apiMRNotes},
98 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reviews", access.ScopeWrite, authUser, "Submit review", (*Server).apiReview},
98 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reviews", access.ScopeWrite, authUser, "Submit review", (*Server).apiReview},
99 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reviews/dismiss", access.ScopeWrite, authUser, "Dismiss review", (*Server).apiDismissReview},
99 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reviews/dismiss", access.ScopeWrite, authUser, "Dismiss review", (*Server).apiDismissReview},
@@ -102,26 +102,26 @@ var apiCatalog = []apiRoute{
102 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/close", access.ScopeWrite, authUser, "Close merge request", (*Server).apiCloseMR},
102 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/close", access.ScopeWrite, authUser, "Close merge request", (*Server).apiCloseMR},
103 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reopen", access.ScopeWrite, authUser, "Reopen merge request", (*Server).apiReopenMR},
103 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/merge_requests/{number}/reopen", access.ScopeWrite, authUser, "Reopen merge request", (*Server).apiReopenMR},
104
104
105 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authUser, "List pipelines", (*Server).apiPipelines},
105 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authOptional, "List pipelines, newest first. Optional query: sha (7-40 hex, prefix), ref (branch, tag or full ref), mr (merge request number; its pipelines plus pushes to its source branch).", (*Server).apiPipelines},
106 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeWrite, authUser, "Start pipeline", (*Server).apiPipelines},
106 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeWrite, authUser, "Start pipeline", (*Server).apiPipelines},
107 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authUser, "Get pipeline", (*Server).apiPipeline},
107 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authOptional, "Get pipeline", (*Server).apiPipeline},
108 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline", (*Server).apiCancelPipeline},
108 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline", (*Server).apiCancelPipeline},
109 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/retry", access.ScopeWrite, authUser, "Retry pipeline", (*Server).apiRetryPipeline},
109 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/retry", access.ScopeWrite, authUser, "Retry pipeline", (*Server).apiRetryPipeline},
110 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authUser, "List jobs", (*Server).apiJobs},
110 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authOptional, "List jobs", (*Server).apiJobs},
111 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authUser, "Get job", (*Server).apiJob},
111 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authOptional, "Get job", (*Server).apiJob},
112 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authUser, "Job log", (*Server).apiJobLog},
112 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authOptional, "Job log", (*Server).apiJobLog},
113 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/play", access.ScopeWrite, authUser, "Play manual job", (*Server).apiPlayJob},
113 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/play", access.ScopeWrite, authUser, "Play manual job", (*Server).apiPlayJob},
114 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/retry", access.ScopeWrite, authUser, "Retry job", (*Server).apiRetryJob},
114 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/retry", access.ScopeWrite, authUser, "Retry job", (*Server).apiRetryJob},
115 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job", (*Server).apiCancelJob},
115 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job", (*Server).apiCancelJob},
116 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authUser, "List artifacts", (*Server).apiArtifacts},
116 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authOptional, "List artifacts", (*Server).apiArtifacts},
117 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authUser, "Download artifact", (*Server).apiArtifact},
117 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authOptional, "Download artifact", (*Server).apiArtifact},
118
118
119 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoRead, authUser, "Read CI file", (*Server).apiCIFile},
119 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoRead, authOptional, "Read CI file", (*Server).apiCIFile},
120 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoWrite, authUser, "Save CI file", (*Server).apiCIFile},
120 {http.MethodPut, "/api/v1/projects/{owner}/{repo}/ci/file", access.ScopeRepoWrite, authUser, "Save CI file", (*Server).apiCIFile},
121 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/ci/lint", access.ScopeRead, authUser, "Lint CI file", (*Server).apiLintCI},
121 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/ci/lint", access.ScopeRead, authUser, "Lint CI file", (*Server).apiLintCI},
122 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authUser, "List releases", (*Server).apiReleases},
122 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authOptional, "List releases", (*Server).apiReleases},
123 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeWrite, authUser, "Publish release", (*Server).createRelease},
123 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeWrite, authUser, "Publish release", (*Server).createRelease},
124 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authUser, "Download release asset", (*Server).apiReleaseAsset},
124 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authOptional, "Download release asset", (*Server).apiReleaseAsset},
125 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/releases", access.ScopeWrite, authRelease, "Publish release from a job or user token", (*Server).createRelease},
125 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/releases", access.ScopeWrite, authRelease, "Publish release from a job or user token", (*Server).createRelease},
126
126
127 {http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
127 {http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
internal/server/api_test.go +10 −0
@@ -276,6 +276,16 @@ func TestAPIPermissionsAndResources(t *testing.T) {
276 276 want(code, body, "heropenen", 200, "open")
277 277 code, body = call(http.MethodPost, "/api/v1/projects/ada/demo/pipelines", devTok, `{"ref":"feature"}`, "")
278 278 want(code, body, "pipeline", 201, `"id"`)
279 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?ref=feature", roTok, "", "")
280 want(code, body, "pipelines op ref", 200, `"ref":"refs/heads/feature"`)
281 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?mr=1", roTok, "", "")
282 want(code, body, "pipelines op mr", 200, `"ref":"refs/heads/feature"`)
283 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?ref=bestaatniet", roTok, "", "")
284 want(code, body, "pipelines leeg", 200, `[]`)
285 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?sha=xyz", roTok, "", "")
286 want(code, body, "slechte sha", 400, "message")
287 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?mr=1&ref=feature", roTok, "", "")
288 want(code, body, "ref en mr", 400, "message")
279 289
280 290 code, body = call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team","description":"samen"}`, "")
281 291 want(code, body, "groep", 201, `"path":"team"`)
@@ -276,6 +276,16 @@ func TestAPIPermissionsAndResources(t *testing.T) {
276 want(code, body, "heropenen", 200, "open")
276 want(code, body, "heropenen", 200, "open")
277 code, body = call(http.MethodPost, "/api/v1/projects/ada/demo/pipelines", devTok, `{"ref":"feature"}`, "")
277 code, body = call(http.MethodPost, "/api/v1/projects/ada/demo/pipelines", devTok, `{"ref":"feature"}`, "")
278 want(code, body, "pipeline", 201, `"id"`)
278 want(code, body, "pipeline", 201, `"id"`)
279 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?ref=feature", roTok, "", "")
280 want(code, body, "pipelines op ref", 200, `"ref":"refs/heads/feature"`)
281 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?mr=1", roTok, "", "")
282 want(code, body, "pipelines op mr", 200, `"ref":"refs/heads/feature"`)
283 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?ref=bestaatniet", roTok, "", "")
284 want(code, body, "pipelines leeg", 200, `[]`)
285 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?sha=xyz", roTok, "", "")
286 want(code, body, "slechte sha", 400, "message")
287 code, body = call(http.MethodGet, "/api/v1/projects/ada/demo/pipelines?mr=1&ref=feature", roTok, "", "")
288 want(code, body, "ref en mr", 400, "message")
279
289
280 code, body = call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team","description":"samen"}`, "")
290 code, body = call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team","description":"samen"}`, "")
281 want(code, body, "groep", 201, `"path":"team"`)
291 want(code, body, "groep", 201, `"path":"team"`)
internal/server/api_visibility_test.go added +171 −0
@@ -0,0 +1,171 @@
1 package server
2
3 import (
4 "context"
5 "fmt"
6 "net/http"
7 "net/http/httptest"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 // Anoniem en als niet-lid: publiek lezen mag, privé en groepsprivé geeft 404,
19 // schrijven zonder token geeft 401. Geldt voor de leesroutes die agents gebruiken.
20 func TestAPIAnonymousReadsRespectVisibility(t *testing.T) {
21 storage := t.TempDir()
22 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
23 if err != nil {
24 t.Fatal(err)
25 }
26 t.Cleanup(func() { _ = st.Close() })
27 ctx := context.Background()
28 ada, _ := st.UpsertUser(ctx, 1, "ada", "", false)
29 eve, _ := st.UpsertUser(ctx, 2, "eve", "", false)
30 tok := func(u store.User) string {
31 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: "t", Scopes: "api"})
32 if err != nil {
33 t.Fatal(err)
34 }
35 return plain
36 }
37 adaTok, eveTok := tok(ada), tok(eve)
38 team, err := st.CreateGroup(ctx, ada.ID, "Team", "team", "", access.RoleDeveloper)
39 if err != nil {
40 t.Fatal(err)
41 }
42 type fixture struct {
43 path string
44 pipe, job int64
45 mr, issues int64
46 }
47 mk := func(kind string, owner int64, ownerPath, name, vis string) fixture {
48 repo, err := st.CreateRepo(ctx, kind, owner, name, "", "master", vis)
49 if err != nil {
50 t.Fatal(err)
51 }
52 sha := strings.Repeat("a", 40)
53 pid, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "ada", "c", []store.NewJob{{Name: "t", Stage: "test", Script: "true"}})
54 if err != nil {
55 t.Fatal(err)
56 }
57 jobs, _ := st.JobsByPipeline(ctx, pid)
58 _ = st.AppendJobLog(ctx, jobs[0].ID, "geheim-log-"+name+"\n")
59 mr, err := st.CreateMergeRequest(ctx, repo.ID, ada.ID, "mr "+name, "", "topic", "master")
60 if err != nil {
61 t.Fatal(err)
62 }
63 if _, err := st.CreateIssue(ctx, repo.ID, ada.ID, store.NewIssue{Title: "issue " + name}); err != nil {
64 t.Fatal(err)
65 }
66 return fixture{path: ownerPath + "/" + name, pipe: pid, job: jobs[0].ID, mr: mr.Number}
67 }
68 pub := mk("user", ada.ID, "ada", "pub", "public")
69 priv := mk("user", ada.ID, "ada", "priv", "private")
70 grp := mk("group", team.ID, "team", "intern", "private")
71
72 cfg := config.Config{
73 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
74 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
75 Git: config.Git{Binary: "git", DefaultBranch: "master"},
76 CI: config.CI{Enabled: true},
77 }
78 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
79 ts := httptest.NewServer(srv.Handler())
80 t.Cleanup(ts.Close)
81 call := func(method, path, token string) (int, string) {
82 t.Helper()
83 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader("{}"))
84 req.Header.Set("Content-Type", "application/json")
85 if token != "" {
86 req.Header.Set("Authorization", "Bearer "+token)
87 }
88 res, err := http.DefaultClient.Do(req)
89 if err != nil {
90 t.Fatal(err)
91 }
92 return res.StatusCode, read(t, res)
93 }
94 reads := func(f fixture) []string {
95 p := "/api/v1/projects/" + f.path
96 return []string{
97 p,
98 p + "/pipelines",
99 p + "/pipelines?ref=master",
100 p + "/pipelines?sha=aaaaaaa",
101 fmt.Sprintf("%s/pipelines/%d", p, f.pipe),
102 fmt.Sprintf("%s/pipelines/%d/jobs", p, f.pipe),
103 fmt.Sprintf("%s/pipelines/%d/jobs/%d", p, f.pipe, f.job),
104 fmt.Sprintf("%s/pipelines/%d/jobs/%d/log", p, f.pipe, f.job),
105 p + "/merge_requests",
106 p + "/merge_requests?source_branch=topic",
107 fmt.Sprintf("%s/merge_requests/%d", p, f.mr),
108 fmt.Sprintf("%s/merge_requests/%d/notes", p, f.mr),
109 p + "/releases",
110 "/api/v1/repos/" + f.path + "/issues",
111 "/api/v1/repos/" + f.path + "/issues/1",
112 }
113 }
114 pubRepo, _ := st.RepoByPath(ctx, "ada", "pub")
115 if _, err := st.CreateIssue(ctx, pubRepo.ID, ada.ID, store.NewIssue{Title: "vertrouwelijk-x", Confidential: true}); err != nil {
116 t.Fatal(err)
117 }
118 for _, token := range []string{"", eveTok} {
119 if code, body := call(http.MethodGet, "/api/v1/repos/ada/pub/issues/2", token); code == 200 || strings.Contains(body, "vertrouwelijk-x") {
120 t.Fatalf("vertrouwelijk issue zichtbaar: %d %s", code, body)
121 }
122 if _, body := call(http.MethodGet, "/api/v1/repos/ada/pub/issues", token); strings.Contains(body, "vertrouwelijk-x") {
123 t.Fatalf("vertrouwelijk issue in lijst: %s", body)
124 }
125 }
126 for _, path := range reads(pub) {
127 if code, body := call(http.MethodGet, path, ""); code != 200 {
128 t.Fatalf("anoniem publiek %s: %d %s", path, code, body)
129 }
130 }
131 for _, f := range []fixture{priv, grp} {
132 for _, path := range reads(f) {
133 for who, token := range map[string]string{"anoniem": "", "niet-lid": eveTok} {
134 code, body := call(http.MethodGet, path, token)
135 if code != 404 || strings.Contains(body, "geheim-log") || strings.Contains(body, "mr ") || strings.Contains(body, "issue ") {
136 t.Fatalf("%s ziet privé %s: %d %s", who, path, code, body)
137 }
138 }
139 if code, body := call(http.MethodGet, path, adaTok); code != 200 {
140 t.Fatalf("eigenaar %s: %d %s", path, code, body)
141 }
142 }
143 }
144 writes := func(f fixture) []string {
145 p := "/api/v1/projects/" + f.path
146 return []string{
147 p + "/merge_requests",
148 p + "/releases",
149 fmt.Sprintf("%s/merge_requests/%d/notes", p, f.mr),
150 fmt.Sprintf("%s/pipelines/%d/retry", p, f.pipe),
151 "/api/v1/repos/" + f.path + "/issues",
152 }
153 }
154 for _, f := range []fixture{pub, priv, grp} {
155 for _, path := range writes(f) {
156 if code, body := call(http.MethodPost, path, ""); code != 401 {
157 t.Fatalf("anoniem schrijven %s: %d %s", path, code, body)
158 }
159 }
160 }
161 for _, f := range []fixture{priv, grp} {
162 for _, path := range writes(f) {
163 if code, body := call(http.MethodPost, path, eveTok); code != 404 {
164 t.Fatalf("niet-lid schrijft privé %s: %d %s", path, code, body)
165 }
166 }
167 }
168 if code, body := call(http.MethodPost, fmt.Sprintf("/api/v1/projects/%s/pipelines/%d/retry", pub.path, pub.pipe), eveTok); code != 403 {
169 t.Fatalf("niet-lid retry publiek: %d %s", code, body)
170 }
171 }
@@ -0,0 +1,171 @@
1package server
2
3import (
4 "context"
5 "fmt"
6 "net/http"
7 "net/http/httptest"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18// Anoniem en als niet-lid: publiek lezen mag, privé en groepsprivé geeft 404,
19// schrijven zonder token geeft 401. Geldt voor de leesroutes die agents gebruiken.
20func TestAPIAnonymousReadsRespectVisibility(t *testing.T) {
21 storage := t.TempDir()
22 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
23 if err != nil {
24 t.Fatal(err)
25 }
26 t.Cleanup(func() { _ = st.Close() })
27 ctx := context.Background()
28 ada, _ := st.UpsertUser(ctx, 1, "ada", "", false)
29 eve, _ := st.UpsertUser(ctx, 2, "eve", "", false)
30 tok := func(u store.User) string {
31 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: "t", Scopes: "api"})
32 if err != nil {
33 t.Fatal(err)
34 }
35 return plain
36 }
37 adaTok, eveTok := tok(ada), tok(eve)
38 team, err := st.CreateGroup(ctx, ada.ID, "Team", "team", "", access.RoleDeveloper)
39 if err != nil {
40 t.Fatal(err)
41 }
42 type fixture struct {
43 path string
44 pipe, job int64
45 mr, issues int64
46 }
47 mk := func(kind string, owner int64, ownerPath, name, vis string) fixture {
48 repo, err := st.CreateRepo(ctx, kind, owner, name, "", "master", vis)
49 if err != nil {
50 t.Fatal(err)
51 }
52 sha := strings.Repeat("a", 40)
53 pid, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "ada", "c", []store.NewJob{{Name: "t", Stage: "test", Script: "true"}})
54 if err != nil {
55 t.Fatal(err)
56 }
57 jobs, _ := st.JobsByPipeline(ctx, pid)
58 _ = st.AppendJobLog(ctx, jobs[0].ID, "geheim-log-"+name+"\n")
59 mr, err := st.CreateMergeRequest(ctx, repo.ID, ada.ID, "mr "+name, "", "topic", "master")
60 if err != nil {
61 t.Fatal(err)
62 }
63 if _, err := st.CreateIssue(ctx, repo.ID, ada.ID, store.NewIssue{Title: "issue " + name}); err != nil {
64 t.Fatal(err)
65 }
66 return fixture{path: ownerPath + "/" + name, pipe: pid, job: jobs[0].ID, mr: mr.Number}
67 }
68 pub := mk("user", ada.ID, "ada", "pub", "public")
69 priv := mk("user", ada.ID, "ada", "priv", "private")
70 grp := mk("group", team.ID, "team", "intern", "private")
71
72 cfg := config.Config{
73 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
74 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
75 Git: config.Git{Binary: "git", DefaultBranch: "master"},
76 CI: config.CI{Enabled: true},
77 }
78 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
79 ts := httptest.NewServer(srv.Handler())
80 t.Cleanup(ts.Close)
81 call := func(method, path, token string) (int, string) {
82 t.Helper()
83 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader("{}"))
84 req.Header.Set("Content-Type", "application/json")
85 if token != "" {
86 req.Header.Set("Authorization", "Bearer "+token)
87 }
88 res, err := http.DefaultClient.Do(req)
89 if err != nil {
90 t.Fatal(err)
91 }
92 return res.StatusCode, read(t, res)
93 }
94 reads := func(f fixture) []string {
95 p := "/api/v1/projects/" + f.path
96 return []string{
97 p,
98 p + "/pipelines",
99 p + "/pipelines?ref=master",
100 p + "/pipelines?sha=aaaaaaa",
101 fmt.Sprintf("%s/pipelines/%d", p, f.pipe),
102 fmt.Sprintf("%s/pipelines/%d/jobs", p, f.pipe),
103 fmt.Sprintf("%s/pipelines/%d/jobs/%d", p, f.pipe, f.job),
104 fmt.Sprintf("%s/pipelines/%d/jobs/%d/log", p, f.pipe, f.job),
105 p + "/merge_requests",
106 p + "/merge_requests?source_branch=topic",
107 fmt.Sprintf("%s/merge_requests/%d", p, f.mr),
108 fmt.Sprintf("%s/merge_requests/%d/notes", p, f.mr),
109 p + "/releases",
110 "/api/v1/repos/" + f.path + "/issues",
111 "/api/v1/repos/" + f.path + "/issues/1",
112 }
113 }
114 pubRepo, _ := st.RepoByPath(ctx, "ada", "pub")
115 if _, err := st.CreateIssue(ctx, pubRepo.ID, ada.ID, store.NewIssue{Title: "vertrouwelijk-x", Confidential: true}); err != nil {
116 t.Fatal(err)
117 }
118 for _, token := range []string{"", eveTok} {
119 if code, body := call(http.MethodGet, "/api/v1/repos/ada/pub/issues/2", token); code == 200 || strings.Contains(body, "vertrouwelijk-x") {
120 t.Fatalf("vertrouwelijk issue zichtbaar: %d %s", code, body)
121 }
122 if _, body := call(http.MethodGet, "/api/v1/repos/ada/pub/issues", token); strings.Contains(body, "vertrouwelijk-x") {
123 t.Fatalf("vertrouwelijk issue in lijst: %s", body)
124 }
125 }
126 for _, path := range reads(pub) {
127 if code, body := call(http.MethodGet, path, ""); code != 200 {
128 t.Fatalf("anoniem publiek %s: %d %s", path, code, body)
129 }
130 }
131 for _, f := range []fixture{priv, grp} {
132 for _, path := range reads(f) {
133 for who, token := range map[string]string{"anoniem": "", "niet-lid": eveTok} {
134 code, body := call(http.MethodGet, path, token)
135 if code != 404 || strings.Contains(body, "geheim-log") || strings.Contains(body, "mr ") || strings.Contains(body, "issue ") {
136 t.Fatalf("%s ziet privé %s: %d %s", who, path, code, body)
137 }
138 }
139 if code, body := call(http.MethodGet, path, adaTok); code != 200 {
140 t.Fatalf("eigenaar %s: %d %s", path, code, body)
141 }
142 }
143 }
144 writes := func(f fixture) []string {
145 p := "/api/v1/projects/" + f.path
146 return []string{
147 p + "/merge_requests",
148 p + "/releases",
149 fmt.Sprintf("%s/merge_requests/%d/notes", p, f.mr),
150 fmt.Sprintf("%s/pipelines/%d/retry", p, f.pipe),
151 "/api/v1/repos/" + f.path + "/issues",
152 }
153 }
154 for _, f := range []fixture{pub, priv, grp} {
155 for _, path := range writes(f) {
156 if code, body := call(http.MethodPost, path, ""); code != 401 {
157 t.Fatalf("anoniem schrijven %s: %d %s", path, code, body)
158 }
159 }
160 }
161 for _, f := range []fixture{priv, grp} {
162 for _, path := range writes(f) {
163 if code, body := call(http.MethodPost, path, eveTok); code != 404 {
164 t.Fatalf("niet-lid schrijft privé %s: %d %s", path, code, body)
165 }
166 }
167 }
168 if code, body := call(http.MethodPost, fmt.Sprintf("/api/v1/projects/%s/pipelines/%d/retry", pub.path, pub.pipe), eveTok); code != 403 {
169 t.Fatalf("niet-lid retry publiek: %d %s", code, body)
170 }
171}
internal/server/issues_api.go +10 −2
@@ -459,6 +459,14 @@ func (s *Server) issueAuth(w http.ResponseWriter, r *http.Request, write bool) (
459 459 return store.User{}, store.Repo{}, "", false
460 460 }
461 461 token := bearer(r)
462 if token == "" && !write {
463 // Anoniem lezen mag alleen in een publieke repository, net als in de UI.
464 if repo.Visibility != "public" {
465 http.NotFound(w, r)
466 return store.User{}, store.Repo{}, "", false
467 }
468 return store.User{}, repo, "", true
469 }
462 470 if token == "" {
463 471 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
464 472 return store.User{}, store.Repo{}, "", false
@@ -477,8 +485,8 @@ func (s *Server) issueAuth(w http.ResponseWriter, r *http.Request, write bool) (
477 485 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
478 486 return store.User{}, store.Repo{}, "", false
479 487 }
480 if !write && !role.CanRead() && repo.Visibility != "public" {
481 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
488 if !role.CanRead() && repo.Visibility != "public" {
489 http.NotFound(w, r)
482 490 return store.User{}, store.Repo{}, "", false
483 491 }
484 492 return u, repo, role, true
@@ -459,6 +459,14 @@ func (s *Server) issueAuth(w http.ResponseWriter, r *http.Request, write bool) (
459 return store.User{}, store.Repo{}, "", false
459 return store.User{}, store.Repo{}, "", false
460 }
460 }
461 token := bearer(r)
461 token := bearer(r)
462 if token == "" && !write {
463 // Anoniem lezen mag alleen in een publieke repository, net als in de UI.
464 if repo.Visibility != "public" {
465 http.NotFound(w, r)
466 return store.User{}, store.Repo{}, "", false
467 }
468 return store.User{}, repo, "", true
469 }
462 if token == "" {
470 if token == "" {
463 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
471 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
464 return store.User{}, store.Repo{}, "", false
472 return store.User{}, store.Repo{}, "", false
@@ -477,8 +485,8 @@ func (s *Server) issueAuth(w http.ResponseWriter, r *http.Request, write bool) (
477 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
485 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
478 return store.User{}, store.Repo{}, "", false
486 return store.User{}, store.Repo{}, "", false
479 }
487 }
480 if !write && !role.CanRead() && repo.Visibility != "public" {
488 if !role.CanRead() && repo.Visibility != "public" {
481 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
489 http.NotFound(w, r)
482 return store.User{}, store.Repo{}, "", false
490 return store.User{}, store.Repo{}, "", false
483 }
491 }
484 return u, repo, role, true
492 return u, repo, role, true
internal/store/find_pipelines_test.go added +51 −0
@@ -0,0 +1,51 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 )
7
8 func TestFindPipelines(t *testing.T) {
9 s := openTest(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 repo, err := s.CreateRepo(ctx, "user", tim.ID, "app", "", "master", "public")
16 if err != nil {
17 t.Fatal(err)
18 }
19 jobs := []NewJob{{Name: "t", Stage: "test", Script: "true"}}
20 a := "abcdef1111111111111111111111111111111111"
21 b := "abcdef2222222222222222222222222222222222"
22 idA, _ := s.CreatePipeline(ctx, repo.ID, a, "refs/heads/master", "push", "tim", "a", jobs)
23 idB, _ := s.CreatePipeline(ctx, repo.ID, b, "refs/heads/topic", "push", "tim", "b", jobs)
24 idT, _ := s.CreatePipeline(ctx, repo.ID, a, "refs/tags/v1", "push", "tim", "tag", jobs)
25 got := func(f PipelineFilter) []int64 {
26 list, err := s.FindPipelines(ctx, repo.ID, f)
27 if err != nil {
28 t.Fatal(err)
29 }
30 var ids []int64
31 for _, p := range list {
32 ids = append(ids, p.ID)
33 }
34 return ids
35 }
36 if ids := got(PipelineFilter{}); len(ids) != 3 || ids[0] != idT {
37 t.Fatalf("alles %v", ids)
38 }
39 if ids := got(PipelineFilter{SHA: "ABCDEF1"}); len(ids) != 2 || ids[0] != idT || ids[1] != idA {
40 t.Fatalf("sha %v", ids)
41 }
42 if ids := got(PipelineFilter{Refs: []string{"refs/heads/topic"}}); len(ids) != 1 || ids[0] != idB {
43 t.Fatalf("ref %v", ids)
44 }
45 if ids := got(PipelineFilter{SHA: a[:7], Refs: []string{"refs/heads/master"}}); len(ids) != 1 || ids[0] != idA {
46 t.Fatalf("sha+ref %v", ids)
47 }
48 if ids := got(PipelineFilter{Refs: []string{"refs/heads/nope"}}); len(ids) != 0 {
49 t.Fatalf("leeg %v", ids)
50 }
51 }
@@ -0,0 +1,51 @@
1package store
2
3import (
4 "context"
5 "testing"
6)
7
8func TestFindPipelines(t *testing.T) {
9 s := openTest(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 repo, err := s.CreateRepo(ctx, "user", tim.ID, "app", "", "master", "public")
16 if err != nil {
17 t.Fatal(err)
18 }
19 jobs := []NewJob{{Name: "t", Stage: "test", Script: "true"}}
20 a := "abcdef1111111111111111111111111111111111"
21 b := "abcdef2222222222222222222222222222222222"
22 idA, _ := s.CreatePipeline(ctx, repo.ID, a, "refs/heads/master", "push", "tim", "a", jobs)
23 idB, _ := s.CreatePipeline(ctx, repo.ID, b, "refs/heads/topic", "push", "tim", "b", jobs)
24 idT, _ := s.CreatePipeline(ctx, repo.ID, a, "refs/tags/v1", "push", "tim", "tag", jobs)
25 got := func(f PipelineFilter) []int64 {
26 list, err := s.FindPipelines(ctx, repo.ID, f)
27 if err != nil {
28 t.Fatal(err)
29 }
30 var ids []int64
31 for _, p := range list {
32 ids = append(ids, p.ID)
33 }
34 return ids
35 }
36 if ids := got(PipelineFilter{}); len(ids) != 3 || ids[0] != idT {
37 t.Fatalf("alles %v", ids)
38 }
39 if ids := got(PipelineFilter{SHA: "ABCDEF1"}); len(ids) != 2 || ids[0] != idT || ids[1] != idA {
40 t.Fatalf("sha %v", ids)
41 }
42 if ids := got(PipelineFilter{Refs: []string{"refs/heads/topic"}}); len(ids) != 1 || ids[0] != idB {
43 t.Fatalf("ref %v", ids)
44 }
45 if ids := got(PipelineFilter{SHA: a[:7], Refs: []string{"refs/heads/master"}}); len(ids) != 1 || ids[0] != idA {
46 t.Fatalf("sha+ref %v", ids)
47 }
48 if ids := got(PipelineFilter{Refs: []string{"refs/heads/nope"}}); len(ids) != 0 {
49 t.Fatalf("leeg %v", ids)
50 }
51}
internal/store/flow.go +47 −0
@@ -5,6 +5,7 @@ import (
5 5 "database/sql"
6 6 "encoding/json"
7 7 "errors"
8 "strings"
8 9 "time"
9 10
10 11 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -816,6 +817,52 @@ func (s *Store) ListPipelines(ctx context.Context, repoID int64) ([]Pipeline, er
816 817 return out, rows.Err()
817 818 }
818 819
820 // PipelineFilter beperkt FindPipelines. Lege velden filteren niet.
821 // SHA mag een prefix van minstens 7 tekens zijn. Refs is een lijst van
822 // volledige refs; MRID neemt ook pipelines van de MR zelf mee.
823 type PipelineFilter struct {
824 SHA string
825 Refs []string
826 MRID int64
827 }
828
829 // FindPipelines geeft de nieuwste pipelines die bij f passen, hooguit 50.
830 func (s *Store) FindPipelines(ctx context.Context, repoID int64, f PipelineFilter) ([]Pipeline, error) {
831 q := pipelineCols + ` WHERE repo_id = ?`
832 args := []any{repoID}
833 if f.SHA != "" {
834 q += ` AND commit_sha LIKE ?`
835 args = append(args, strings.ToLower(f.SHA)+"%")
836 }
837 var alt []string
838 if f.MRID != 0 {
839 alt = append(alt, `mr_id = ?`)
840 args = append(args, f.MRID)
841 }
842 for _, ref := range f.Refs {
843 alt = append(alt, `ref = ?`)
844 args = append(args, ref)
845 }
846 if len(alt) > 0 {
847 q += ` AND (` + strings.Join(alt, ` OR `) + `)`
848 }
849 q += ` ORDER BY id DESC LIMIT 50`
850 rows, err := s.db.QueryContext(ctx, q, args...)
851 if err != nil {
852 return nil, err
853 }
854 defer rows.Close()
855 var out []Pipeline
856 for rows.Next() {
857 p, err := scanPipeline(rows)
858 if err != nil {
859 return nil, err
860 }
861 out = append(out, p)
862 }
863 return out, rows.Err()
864 }
865
819 866 const pipelineCols = `SELECT id, repo_id, commit_sha, ref, status, created_at, finished_at, source, actor, commit_title, started_at, mr_id, target_sha FROM pipelines`
820 867
821 868 func scanPipeline(rows *sql.Rows) (Pipeline, error) {
@@ -5,6 +5,7 @@ import (
5 "database/sql"
5 "database/sql"
6 "encoding/json"
6 "encoding/json"
7 "errors"
7 "errors"
8 "strings"
8 "time"
9 "time"
9
10
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -816,6 +817,52 @@ func (s *Store) ListPipelines(ctx context.Context, repoID int64) ([]Pipeline, er
816 return out, rows.Err()
817 return out, rows.Err()
817}
818}
818
819
820// PipelineFilter beperkt FindPipelines. Lege velden filteren niet.
821// SHA mag een prefix van minstens 7 tekens zijn. Refs is een lijst van
822// volledige refs; MRID neemt ook pipelines van de MR zelf mee.
823type PipelineFilter struct {
824 SHA string
825 Refs []string
826 MRID int64
827}
828
829// FindPipelines geeft de nieuwste pipelines die bij f passen, hooguit 50.
830func (s *Store) FindPipelines(ctx context.Context, repoID int64, f PipelineFilter) ([]Pipeline, error) {
831 q := pipelineCols + ` WHERE repo_id = ?`
832 args := []any{repoID}
833 if f.SHA != "" {
834 q += ` AND commit_sha LIKE ?`
835 args = append(args, strings.ToLower(f.SHA)+"%")
836 }
837 var alt []string
838 if f.MRID != 0 {
839 alt = append(alt, `mr_id = ?`)
840 args = append(args, f.MRID)
841 }
842 for _, ref := range f.Refs {
843 alt = append(alt, `ref = ?`)
844 args = append(args, ref)
845 }
846 if len(alt) > 0 {
847 q += ` AND (` + strings.Join(alt, ` OR `) + `)`
848 }
849 q += ` ORDER BY id DESC LIMIT 50`
850 rows, err := s.db.QueryContext(ctx, q, args...)
851 if err != nil {
852 return nil, err
853 }
854 defer rows.Close()
855 var out []Pipeline
856 for rows.Next() {
857 p, err := scanPipeline(rows)
858 if err != nil {
859 return nil, err
860 }
861 out = append(out, p)
862 }
863 return out, rows.Err()
864}
865
819const pipelineCols = `SELECT id, repo_id, commit_sha, ref, status, created_at, finished_at, source, actor, commit_title, started_at, mr_id, target_sha FROM pipelines`
866const pipelineCols = `SELECT id, repo_id, commit_sha, ref, status, created_at, finished_at, source, actor, commit_title, started_at, mr_id, target_sha FROM pipelines`
820
867
821func scanPipeline(rows *sql.Rows) (Pipeline, error) {
868func scanPipeline(rows *sql.Rows) (Pipeline, error) {