BlueGit

timfa bluegit

wip runner module: API, UI, bluegit-runner binary

timfa Tim Falken · pushed by timfa

Authored 2026-10-24 · 3 weeks ago

Hash
a7578bb106660b6716c7b55fcb67a55a9a327948
Parent
49c37d34
11 files changed +1029 −7
cmd/bluegit-runner/main.go added +437 −0
@@ -0,0 +1,437 @@
1 // Command bluegit-runner draait BlueGit CI-jobs op een eigen machine.
2 // Hij maakt alleen uitgaande HTTPS-verbindingen (long-poll), er hoeft
3 // geen poort open.
4 package main
5
6 import (
7 "bytes"
8 "context"
9 "encoding/json"
10 "errors"
11 "flag"
12 "fmt"
13 "io"
14 "log/slog"
15 "net/http"
16 "os"
17 "os/exec"
18 "os/signal"
19 "os/user"
20 "path/filepath"
21 "strconv"
22 "strings"
23 "sync"
24 "syscall"
25 "time"
26
27 "gopkg.in/yaml.v3"
28
29 "gitlab.com/Timfa/bluegit/internal/runner"
30 )
31
32 var version = "dev"
33
34 const defaultConfig = "/etc/bluegit-runner/config.yml"
35
36 // Config staat in /etc/bluegit-runner/config.yml.
37 type Config struct {
38 URL string `yaml:"url"`
39 Token string `yaml:"token"`
40 Name string `yaml:"name"`
41 Docker string `yaml:"docker"`
42 Git string `yaml:"git"`
43 WorkDir string `yaml:"work_dir"`
44 Network string `yaml:"network"`
45 Concurrency int `yaml:"concurrency"`
46 }
47
48 func (c *Config) defaults() {
49 if c.Docker == "" {
50 c.Docker = "docker"
51 }
52 if c.Git == "" {
53 c.Git = "git"
54 }
55 if c.WorkDir == "" {
56 c.WorkDir = "/var/lib/bluegit-runner"
57 }
58 if c.Network == "" {
59 c.Network = "bridge"
60 }
61 if c.Concurrency < 1 {
62 c.Concurrency = 1
63 }
64 c.URL = strings.TrimRight(c.URL, "/")
65 }
66
67 func main() {
68 if len(os.Args) < 2 {
69 usage()
70 os.Exit(2)
71 }
72 var err error
73 switch os.Args[1] {
74 case "register":
75 err = cmdRegister(os.Args[2:])
76 case "run":
77 err = cmdRun(os.Args[2:])
78 case "version", "--version":
79 fmt.Println(version)
80 default:
81 usage()
82 os.Exit(2)
83 }
84 if err != nil {
85 fmt.Fprintln(os.Stderr, "bluegit-runner:", err)
86 os.Exit(1)
87 }
88 }
89
90 func usage() {
91 fmt.Fprintln(os.Stderr, `usage:
92 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
93 bluegit-runner run [--config PATH]
94 bluegit-runner version`)
95 }
96
97 func loadConfig(path string) (Config, error) {
98 var c Config
99 b, err := os.ReadFile(path)
100 if err != nil {
101 return c, err
102 }
103 if err := yaml.Unmarshal(b, &c); err != nil {
104 return c, err
105 }
106 c.defaults()
107 if c.URL == "" || c.Token == "" {
108 return c, fmt.Errorf("%s: url and token are required; run bluegit-runner register first", path)
109 }
110 return c, nil
111 }
112
113 func cmdRegister(args []string) error {
114 fs := flag.NewFlagSet("register", flag.ExitOnError)
115 url := fs.String("url", "", "BlueGit base URL")
116 token := fs.String("token", "", "registration token from the BlueGit UI")
117 name := fs.String("name", "", "runner name (default: hostname)")
118 cfgPath := fs.String("config", defaultConfig, "config file")
119 _ = fs.Parse(args)
120 if *token == "" {
121 *token = os.Getenv("BLUEGIT_RUNNER_REGISTRATION_TOKEN")
122 }
123 if *url == "" || *token == "" {
124 return errors.New("--url and --token are required")
125 }
126 if *name == "" {
127 *name, _ = os.Hostname()
128 }
129 var existing Config
130 if b, err := os.ReadFile(*cfgPath); err == nil {
131 _ = yaml.Unmarshal(b, &existing)
132 }
133 body, _ := json.Marshal(map[string]string{"token": *token, "name": *name, "version": version})
134 resp, err := http.Post(strings.TrimRight(*url, "/")+"/api/v1/runners/register", "application/json", bytes.NewReader(body))
135 if err != nil {
136 return err
137 }
138 defer resp.Body.Close()
139 var out struct {
140 ID int64 `json:"id"`
141 Name string `json:"name"`
142 Token string `json:"token"`
143 Message string `json:"message"`
144 }
145 _ = json.NewDecoder(resp.Body).Decode(&out)
146 if resp.StatusCode != http.StatusCreated || out.Token == "" {
147 return fmt.Errorf("registration failed (%d): %s", resp.StatusCode, out.Message)
148 }
149 existing.URL, existing.Token, existing.Name = strings.TrimRight(*url, "/"), out.Token, out.Name
150 b, err := yaml.Marshal(existing)
151 if err != nil {
152 return err
153 }
154 if err := os.MkdirAll(filepath.Dir(*cfgPath), 0o755); err != nil {
155 return err
156 }
157 if err := os.WriteFile(*cfgPath, b, 0o600); err != nil {
158 return err
159 }
160 if os.Geteuid() == 0 {
161 if u, err := user.Lookup("bluegit-runner"); err == nil {
162 uid, _ := strconv.Atoi(u.Uid)
163 gid, _ := strconv.Atoi(u.Gid)
164 _ = os.Chown(*cfgPath, uid, gid)
165 }
166 }
167 fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)
168 fmt.Println("start it with: sudo systemctl enable --now bluegit-runner")
169 return nil
170 }
171
172 type client struct {
173 cfg Config
174 http *http.Client
175 log *slog.Logger
176 }
177
178 func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
179 req, err := http.NewRequestWithContext(ctx, method, c.cfg.URL+path, body)
180 if err != nil {
181 return nil, err
182 }
183 req.Header.Set("Authorization", "Bearer "+c.cfg.Token)
184 req.Header.Set("X-Runner-Version", version)
185 if ctype != "" {
186 req.Header.Set("Content-Type", ctype)
187 }
188 return c.http.Do(req)
189 }
190
191 func (c *client) postJSON(ctx context.Context, path string, in, out any) error {
192 b, _ := json.Marshal(in)
193 resp, err := c.do(ctx, http.MethodPost, path, bytes.NewReader(b), "application/json")
194 if err != nil {
195 return err
196 }
197 defer resp.Body.Close()
198 if resp.StatusCode >= 300 {
199 msg, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
200 return fmt.Errorf("%s: %d %s", path, resp.StatusCode, strings.TrimSpace(string(msg)))
201 }
202 if out != nil {
203 return json.NewDecoder(resp.Body).Decode(out)
204 }
205 return nil
206 }
207
208 func cmdRun(args []string) error {
209 fs := flag.NewFlagSet("run", flag.ExitOnError)
210 cfgPath := fs.String("config", defaultConfig, "config file")
211 once := fs.Bool("once", false, "run at most one job, then exit (for tests)")
212 _ = fs.Parse(args)
213 cfg, err := loadConfig(*cfgPath)
214 if err != nil {
215 return err
216 }
217 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
218 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
219 defer stop()
220 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log}
221 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil {
222 return fmt.Errorf("cannot reach BlueGit: %w", err)
223 }
224 log.Info("bluegit-runner started", "url", cfg.URL, "name", cfg.Name, "version", version, "concurrency", cfg.Concurrency)
225 go func() {
226 t := time.NewTicker(30 * time.Second)
227 defer t.Stop()
228 for {
229 select {
230 case <-ctx.Done():
231 return
232 case <-t.C:
233 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil && ctx.Err() == nil {
234 log.Warn("heartbeat", "err", err)
235 }
236 }
237 }
238 }()
239 var wg sync.WaitGroup
240 for i := 0; i < cfg.Concurrency; i++ {
241 wg.Add(1)
242 go func() {
243 defer wg.Done()
244 for ctx.Err() == nil {
245 ran, err := c.poll(ctx)
246 if err != nil && ctx.Err() == nil {
247 log.Warn("poll", "err", err)
248 select {
249 case <-ctx.Done():
250 case <-time.After(5 * time.Second):
251 }
252 }
253 if ran && *once {
254 stop()
255 }
256 }
257 }()
258 }
259 wg.Wait()
260 return nil
261 }
262
263 func (c *client) poll(ctx context.Context) (bool, error) {
264 pctx, cancel := context.WithTimeout(ctx, 60*time.Second)
265 defer cancel()
266 resp, err := c.do(pctx, http.MethodPost, "/api/v1/runner/jobs/request", strings.NewReader("{}"), "application/json")
267 if err != nil {
268 return false, err
269 }
270 defer resp.Body.Close()
271 if resp.StatusCode == http.StatusNoContent {
272 return false, nil
273 }
274 if resp.StatusCode != http.StatusOK {
275 msg, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
276 return false, fmt.Errorf("request: %d %s", resp.StatusCode, strings.TrimSpace(string(msg)))
277 }
278 var pl runner.RemotePayload
279 if err := json.NewDecoder(resp.Body).Decode(&pl); err != nil {
280 return false, err
281 }
282 c.runJob(ctx, pl)
283 return true, nil
284 }
285
286 // logBuffer verzamelt logregels en stuurt ze elke seconde door.
287 type logBuffer struct {
288 mu sync.Mutex
289 buf strings.Builder
290 }
291
292 func (l *logBuffer) add(s string) {
293 l.mu.Lock()
294 l.buf.WriteString(s)
295 l.mu.Unlock()
296 }
297
298 func (l *logBuffer) take() string {
299 l.mu.Lock()
300 defer l.mu.Unlock()
301 s := l.buf.String()
302 l.buf.Reset()
303 return s
304 }
305
306 func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
307 c.log.Info("job", "id", pl.JobID, "name", pl.Job.Name)
308 base := fmt.Sprintf("/api/v1/runner/jobs/%d", pl.JobID)
309 ctx, cancel := context.WithCancel(parent)
310 defer cancel()
311 runCtx := ctx
312 if pl.Timeout > 0 {
313 var tc context.CancelFunc
314 runCtx, tc = context.WithTimeout(ctx, time.Duration(pl.Timeout)*time.Second)
315 defer tc()
316 }
317 var canceled bool
318 var cmu sync.Mutex
319 logs := &logBuffer{}
320 send := func() {
321 chunk := logs.take()
322 var out struct {
323 Cancel bool `json:"cancel"`
324 }
325 sctx, sc := context.WithTimeout(context.Background(), 30*time.Second)
326 defer sc()
327 err := func() error {
328 resp, err := c.do(sctx, http.MethodPost, base+"/log", strings.NewReader(chunk), "text/plain")
329 if err != nil {
330 return err
331 }
332 defer resp.Body.Close()
333 if resp.StatusCode != http.StatusOK {
334 return fmt.Errorf("log: %d", resp.StatusCode)
335 }
336 return json.NewDecoder(resp.Body).Decode(&out)
337 }()
338 if err != nil {
339 // Bij een fout gaat de chunk terug in de buffer voor de volgende poging.
340 if chunk != "" {
341 logs.mu.Lock()
342 rest := logs.buf.String()
343 logs.buf.Reset()
344 logs.buf.WriteString(chunk + rest)
345 logs.mu.Unlock()
346 }
347 return
348 }
349 if out.Cancel {
350 cmu.Lock()
351 canceled = true
352 cmu.Unlock()
353 cancel()
354 }
355 }
356 done := make(chan struct{})
357 flushed := make(chan struct{})
358 go func() {
359 defer close(flushed)
360 t := time.NewTicker(time.Second)
361 defer t.Stop()
362 for {
363 select {
364 case <-done:
365 return
366 case <-t.C:
367 send()
368 }
369 }
370 }()
371 r := &runner.Runner{GitBin: c.cfg.Git, Docker: c.cfg.Docker, Storage: c.cfg.WorkDir, Network: c.cfg.Network, Name: c.cfg.Name}
372 work := filepath.Join(c.cfg.WorkDir, "work", strconv.FormatInt(pl.JobID, 10))
373 defer os.RemoveAll(work)
374 clone := func(ctx context.Context, dir string) error {
375 cmd := exec.CommandContext(ctx, c.cfg.Git, "clone", "--quiet", pl.CloneURL, dir)
376 // Het runner-token via de omgeving, niet in de proceslijst.
377 cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0", "GIT_CONFIG_COUNT=1",
378 "GIT_CONFIG_KEY_0=http.extraHeader", "GIT_CONFIG_VALUE_0=Authorization: Bearer "+c.cfg.Token)
379 out, err := cmd.CombinedOutput()
380 if err != nil {
381 return fmt.Errorf("%s", strings.ReplaceAll(strings.TrimSpace(string(out)), c.cfg.Token, "[MASKED]"))
382 }
383 return nil
384 }
385 inputs := func(ctx context.Context, dir string) error {
386 resp, err := c.do(ctx, http.MethodGet, base+"/inputs", nil, "")
387 if err != nil {
388 return err
389 }
390 defer resp.Body.Close()
391 if resp.StatusCode != http.StatusOK {
392 return fmt.Errorf("inputs: %d", resp.StatusCode)
393 }
394 return runner.ReadTar(resp.Body, dir, nil, 0)
395 }
396 err := r.RunRemote(runCtx, pl, work, logs.add, clone, inputs)
397 if err == nil && len(pl.Job.ArtifactPaths) > 0 {
398 err = c.upload(runCtx, base, work, pl.Job.ArtifactPaths)
399 }
400 close(done)
401 <-flushed
402 send()
403 status, msg := "success", ""
404 cmu.Lock()
405 wasCanceled := canceled
406 cmu.Unlock()
407 switch {
408 case err == nil:
409 case wasCanceled:
410 status = "canceled"
411 case errors.Is(runCtx.Err(), context.DeadlineExceeded):
412 status, msg = "failed", "job_execution_timeout: "+err.Error()
413 default:
414 status, msg = "failed", err.Error()
415 }
416 fctx, fc := context.WithTimeout(context.Background(), time.Minute)
417 defer fc()
418 if ferr := c.postJSON(fctx, base+"/finish", map[string]string{"status": status, "message": msg}, nil); ferr != nil {
419 c.log.Error("finish", "job", pl.JobID, "err", ferr)
420 }
421 c.log.Info("job done", "id", pl.JobID, "status", status)
422 }
423
424 func (c *client) upload(ctx context.Context, base, work string, paths []string) error {
425 pr, pw := io.Pipe()
426 go func() { pw.CloseWithError(runner.WriteTar(pw, work, paths)) }()
427 resp, err := c.do(ctx, http.MethodPut, base+"/artifacts", pr, "application/gzip")
428 if err != nil {
429 return fmt.Errorf("artifacts upload: %w", err)
430 }
431 defer resp.Body.Close()
432 if resp.StatusCode != http.StatusOK {
433 msg, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
434 return fmt.Errorf("artifacts upload: %d %s", resp.StatusCode, strings.TrimSpace(string(msg)))
435 }
436 return nil
437 }
@@ -0,0 +1,437 @@
1// Command bluegit-runner draait BlueGit CI-jobs op een eigen machine.
2// Hij maakt alleen uitgaande HTTPS-verbindingen (long-poll), er hoeft
3// geen poort open.
4package main
5
6import (
7 "bytes"
8 "context"
9 "encoding/json"
10 "errors"
11 "flag"
12 "fmt"
13 "io"
14 "log/slog"
15 "net/http"
16 "os"
17 "os/exec"
18 "os/signal"
19 "os/user"
20 "path/filepath"
21 "strconv"
22 "strings"
23 "sync"
24 "syscall"
25 "time"
26
27 "gopkg.in/yaml.v3"
28
29 "gitlab.com/Timfa/bluegit/internal/runner"
30)
31
32var version = "dev"
33
34const defaultConfig = "/etc/bluegit-runner/config.yml"
35
36// Config staat in /etc/bluegit-runner/config.yml.
37type Config struct {
38 URL string `yaml:"url"`
39 Token string `yaml:"token"`
40 Name string `yaml:"name"`
41 Docker string `yaml:"docker"`
42 Git string `yaml:"git"`
43 WorkDir string `yaml:"work_dir"`
44 Network string `yaml:"network"`
45 Concurrency int `yaml:"concurrency"`
46}
47
48func (c *Config) defaults() {
49 if c.Docker == "" {
50 c.Docker = "docker"
51 }
52 if c.Git == "" {
53 c.Git = "git"
54 }
55 if c.WorkDir == "" {
56 c.WorkDir = "/var/lib/bluegit-runner"
57 }
58 if c.Network == "" {
59 c.Network = "bridge"
60 }
61 if c.Concurrency < 1 {
62 c.Concurrency = 1
63 }
64 c.URL = strings.TrimRight(c.URL, "/")
65}
66
67func main() {
68 if len(os.Args) < 2 {
69 usage()
70 os.Exit(2)
71 }
72 var err error
73 switch os.Args[1] {
74 case "register":
75 err = cmdRegister(os.Args[2:])
76 case "run":
77 err = cmdRun(os.Args[2:])
78 case "version", "--version":
79 fmt.Println(version)
80 default:
81 usage()
82 os.Exit(2)
83 }
84 if err != nil {
85 fmt.Fprintln(os.Stderr, "bluegit-runner:", err)
86 os.Exit(1)
87 }
88}
89
90func usage() {
91 fmt.Fprintln(os.Stderr, `usage:
92 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
93 bluegit-runner run [--config PATH]
94 bluegit-runner version`)
95}
96
97func loadConfig(path string) (Config, error) {
98 var c Config
99 b, err := os.ReadFile(path)
100 if err != nil {
101 return c, err
102 }
103 if err := yaml.Unmarshal(b, &c); err != nil {
104 return c, err
105 }
106 c.defaults()
107 if c.URL == "" || c.Token == "" {
108 return c, fmt.Errorf("%s: url and token are required; run bluegit-runner register first", path)
109 }
110 return c, nil
111}
112
113func cmdRegister(args []string) error {
114 fs := flag.NewFlagSet("register", flag.ExitOnError)
115 url := fs.String("url", "", "BlueGit base URL")
116 token := fs.String("token", "", "registration token from the BlueGit UI")
117 name := fs.String("name", "", "runner name (default: hostname)")
118 cfgPath := fs.String("config", defaultConfig, "config file")
119 _ = fs.Parse(args)
120 if *token == "" {
121 *token = os.Getenv("BLUEGIT_RUNNER_REGISTRATION_TOKEN")
122 }
123 if *url == "" || *token == "" {
124 return errors.New("--url and --token are required")
125 }
126 if *name == "" {
127 *name, _ = os.Hostname()
128 }
129 var existing Config
130 if b, err := os.ReadFile(*cfgPath); err == nil {
131 _ = yaml.Unmarshal(b, &existing)
132 }
133 body, _ := json.Marshal(map[string]string{"token": *token, "name": *name, "version": version})
134 resp, err := http.Post(strings.TrimRight(*url, "/")+"/api/v1/runners/register", "application/json", bytes.NewReader(body))
135 if err != nil {
136 return err
137 }
138 defer resp.Body.Close()
139 var out struct {
140 ID int64 `json:"id"`
141 Name string `json:"name"`
142 Token string `json:"token"`
143 Message string `json:"message"`
144 }
145 _ = json.NewDecoder(resp.Body).Decode(&out)
146 if resp.StatusCode != http.StatusCreated || out.Token == "" {
147 return fmt.Errorf("registration failed (%d): %s", resp.StatusCode, out.Message)
148 }
149 existing.URL, existing.Token, existing.Name = strings.TrimRight(*url, "/"), out.Token, out.Name
150 b, err := yaml.Marshal(existing)
151 if err != nil {
152 return err
153 }
154 if err := os.MkdirAll(filepath.Dir(*cfgPath), 0o755); err != nil {
155 return err
156 }
157 if err := os.WriteFile(*cfgPath, b, 0o600); err != nil {
158 return err
159 }
160 if os.Geteuid() == 0 {
161 if u, err := user.Lookup("bluegit-runner"); err == nil {
162 uid, _ := strconv.Atoi(u.Uid)
163 gid, _ := strconv.Atoi(u.Gid)
164 _ = os.Chown(*cfgPath, uid, gid)
165 }
166 }
167 fmt.Printf("registered runner %q (id %d); config written to %s\n", out.Name, out.ID, *cfgPath)
168 fmt.Println("start it with: sudo systemctl enable --now bluegit-runner")
169 return nil
170}
171
172type client struct {
173 cfg Config
174 http *http.Client
175 log *slog.Logger
176}
177
178func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
179 req, err := http.NewRequestWithContext(ctx, method, c.cfg.URL+path, body)
180 if err != nil {
181 return nil, err
182 }
183 req.Header.Set("Authorization", "Bearer "+c.cfg.Token)
184 req.Header.Set("X-Runner-Version", version)
185 if ctype != "" {
186 req.Header.Set("Content-Type", ctype)
187 }
188 return c.http.Do(req)
189}
190
191func (c *client) postJSON(ctx context.Context, path string, in, out any) error {
192 b, _ := json.Marshal(in)
193 resp, err := c.do(ctx, http.MethodPost, path, bytes.NewReader(b), "application/json")
194 if err != nil {
195 return err
196 }
197 defer resp.Body.Close()
198 if resp.StatusCode >= 300 {
199 msg, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
200 return fmt.Errorf("%s: %d %s", path, resp.StatusCode, strings.TrimSpace(string(msg)))
201 }
202 if out != nil {
203 return json.NewDecoder(resp.Body).Decode(out)
204 }
205 return nil
206}
207
208func cmdRun(args []string) error {
209 fs := flag.NewFlagSet("run", flag.ExitOnError)
210 cfgPath := fs.String("config", defaultConfig, "config file")
211 once := fs.Bool("once", false, "run at most one job, then exit (for tests)")
212 _ = fs.Parse(args)
213 cfg, err := loadConfig(*cfgPath)
214 if err != nil {
215 return err
216 }
217 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
218 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
219 defer stop()
220 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log}
221 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil {
222 return fmt.Errorf("cannot reach BlueGit: %w", err)
223 }
224 log.Info("bluegit-runner started", "url", cfg.URL, "name", cfg.Name, "version", version, "concurrency", cfg.Concurrency)
225 go func() {
226 t := time.NewTicker(30 * time.Second)
227 defer t.Stop()
228 for {
229 select {
230 case <-ctx.Done():
231 return
232 case <-t.C:
233 if err := c.postJSON(ctx, "/api/v1/runner/heartbeat", map[string]string{}, nil); err != nil && ctx.Err() == nil {
234 log.Warn("heartbeat", "err", err)
235 }
236 }
237 }
238 }()
239 var wg sync.WaitGroup
240 for i := 0; i < cfg.Concurrency; i++ {
241 wg.Add(1)
242 go func() {
243 defer wg.Done()
244 for ctx.Err() == nil {
245 ran, err := c.poll(ctx)
246 if err != nil && ctx.Err() == nil {
247 log.Warn("poll", "err", err)
248 select {
249 case <-ctx.Done():
250 case <-time.After(5 * time.Second):
251 }
252 }
253 if ran && *once {
254 stop()
255 }
256 }
257 }()
258 }
259 wg.Wait()
260 return nil
261}
262
263func (c *client) poll(ctx context.Context) (bool, error) {
264 pctx, cancel := context.WithTimeout(ctx, 60*time.Second)
265 defer cancel()
266 resp, err := c.do(pctx, http.MethodPost, "/api/v1/runner/jobs/request", strings.NewReader("{}"), "application/json")
267 if err != nil {
268 return false, err
269 }
270 defer resp.Body.Close()
271 if resp.StatusCode == http.StatusNoContent {
272 return false, nil
273 }
274 if resp.StatusCode != http.StatusOK {
275 msg, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
276 return false, fmt.Errorf("request: %d %s", resp.StatusCode, strings.TrimSpace(string(msg)))
277 }
278 var pl runner.RemotePayload
279 if err := json.NewDecoder(resp.Body).Decode(&pl); err != nil {
280 return false, err
281 }
282 c.runJob(ctx, pl)
283 return true, nil
284}
285
286// logBuffer verzamelt logregels en stuurt ze elke seconde door.
287type logBuffer struct {
288 mu sync.Mutex
289 buf strings.Builder
290}
291
292func (l *logBuffer) add(s string) {
293 l.mu.Lock()
294 l.buf.WriteString(s)
295 l.mu.Unlock()
296}
297
298func (l *logBuffer) take() string {
299 l.mu.Lock()
300 defer l.mu.Unlock()
301 s := l.buf.String()
302 l.buf.Reset()
303 return s
304}
305
306func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
307 c.log.Info("job", "id", pl.JobID, "name", pl.Job.Name)
308 base := fmt.Sprintf("/api/v1/runner/jobs/%d", pl.JobID)
309 ctx, cancel := context.WithCancel(parent)
310 defer cancel()
311 runCtx := ctx
312 if pl.Timeout > 0 {
313 var tc context.CancelFunc
314 runCtx, tc = context.WithTimeout(ctx, time.Duration(pl.Timeout)*time.Second)
315 defer tc()
316 }
317 var canceled bool
318 var cmu sync.Mutex
319 logs := &logBuffer{}
320 send := func() {
321 chunk := logs.take()
322 var out struct {
323 Cancel bool `json:"cancel"`
324 }
325 sctx, sc := context.WithTimeout(context.Background(), 30*time.Second)
326 defer sc()
327 err := func() error {
328 resp, err := c.do(sctx, http.MethodPost, base+"/log", strings.NewReader(chunk), "text/plain")
329 if err != nil {
330 return err
331 }
332 defer resp.Body.Close()
333 if resp.StatusCode != http.StatusOK {
334 return fmt.Errorf("log: %d", resp.StatusCode)
335 }
336 return json.NewDecoder(resp.Body).Decode(&out)
337 }()
338 if err != nil {
339 // Bij een fout gaat de chunk terug in de buffer voor de volgende poging.
340 if chunk != "" {
341 logs.mu.Lock()
342 rest := logs.buf.String()
343 logs.buf.Reset()
344 logs.buf.WriteString(chunk + rest)
345 logs.mu.Unlock()
346 }
347 return
348 }
349 if out.Cancel {
350 cmu.Lock()
351 canceled = true
352 cmu.Unlock()
353 cancel()
354 }
355 }
356 done := make(chan struct{})
357 flushed := make(chan struct{})
358 go func() {
359 defer close(flushed)
360 t := time.NewTicker(time.Second)
361 defer t.Stop()
362 for {
363 select {
364 case <-done:
365 return
366 case <-t.C:
367 send()
368 }
369 }
370 }()
371 r := &runner.Runner{GitBin: c.cfg.Git, Docker: c.cfg.Docker, Storage: c.cfg.WorkDir, Network: c.cfg.Network, Name: c.cfg.Name}
372 work := filepath.Join(c.cfg.WorkDir, "work", strconv.FormatInt(pl.JobID, 10))
373 defer os.RemoveAll(work)
374 clone := func(ctx context.Context, dir string) error {
375 cmd := exec.CommandContext(ctx, c.cfg.Git, "clone", "--quiet", pl.CloneURL, dir)
376 // Het runner-token via de omgeving, niet in de proceslijst.
377 cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0", "GIT_CONFIG_COUNT=1",
378 "GIT_CONFIG_KEY_0=http.extraHeader", "GIT_CONFIG_VALUE_0=Authorization: Bearer "+c.cfg.Token)
379 out, err := cmd.CombinedOutput()
380 if err != nil {
381 return fmt.Errorf("%s", strings.ReplaceAll(strings.TrimSpace(string(out)), c.cfg.Token, "[MASKED]"))
382 }
383 return nil
384 }
385 inputs := func(ctx context.Context, dir string) error {
386 resp, err := c.do(ctx, http.MethodGet, base+"/inputs", nil, "")
387 if err != nil {
388 return err
389 }
390 defer resp.Body.Close()
391 if resp.StatusCode != http.StatusOK {
392 return fmt.Errorf("inputs: %d", resp.StatusCode)
393 }
394 return runner.ReadTar(resp.Body, dir, nil, 0)
395 }
396 err := r.RunRemote(runCtx, pl, work, logs.add, clone, inputs)
397 if err == nil && len(pl.Job.ArtifactPaths) > 0 {
398 err = c.upload(runCtx, base, work, pl.Job.ArtifactPaths)
399 }
400 close(done)
401 <-flushed
402 send()
403 status, msg := "success", ""
404 cmu.Lock()
405 wasCanceled := canceled
406 cmu.Unlock()
407 switch {
408 case err == nil:
409 case wasCanceled:
410 status = "canceled"
411 case errors.Is(runCtx.Err(), context.DeadlineExceeded):
412 status, msg = "failed", "job_execution_timeout: "+err.Error()
413 default:
414 status, msg = "failed", err.Error()
415 }
416 fctx, fc := context.WithTimeout(context.Background(), time.Minute)
417 defer fc()
418 if ferr := c.postJSON(fctx, base+"/finish", map[string]string{"status": status, "message": msg}, nil); ferr != nil {
419 c.log.Error("finish", "job", pl.JobID, "err", ferr)
420 }
421 c.log.Info("job done", "id", pl.JobID, "status", status)
422}
423
424func (c *client) upload(ctx context.Context, base, work string, paths []string) error {
425 pr, pw := io.Pipe()
426 go func() { pw.CloseWithError(runner.WriteTar(pw, work, paths)) }()
427 resp, err := c.do(ctx, http.MethodPut, base+"/artifacts", pr, "application/gzip")
428 if err != nil {
429 return fmt.Errorf("artifacts upload: %w", err)
430 }
431 defer resp.Body.Close()
432 if resp.StatusCode != http.StatusOK {
433 msg, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
434 return fmt.Errorf("artifacts upload: %d %s", resp.StatusCode, strings.TrimSpace(string(msg)))
435 }
436 return nil
437}
internal/i18n/catalog_runner.go added +112 −0
@@ -0,0 +1,112 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, runnerEN)
5 addCatalog(nl, runnerNL)
6 addCatalog(de, runnerDE)
7 addCatalog(fr, runnerFR)
8 }
9
10 var runnerEN = map[string]string{
11 "runner.title": "Runners",
12 "runner.userLead": "Run CI jobs of your projects on your own machine with bluegit-runner. Create a registration token and run the command on that machine.",
13 "runner.groupLead": "Order for this group: group runners, then account runners of maintainers who allowed it, then the BlueGit runner.",
14 "runner.prefBuiltin": "Use my runners only when the BlueGit runner is not available right away",
15 "runner.prefOwn": "My own runners first",
16 "runner.builtinFirst": "Try the BlueGit runner first",
17 "runner.optinOff": "Your account runners are not used for this group.",
18 "runner.optinOn": "Your account runners may run jobs of this group.",
19 "runner.optinStart": "Allow my runners for this group",
20 "runner.optinStop": "Stop using my runners here",
21 "runner.optinWho": "Allowed by:",
22 "runner.new": "New registration token",
23 "runner.tokenOnce": "Registration token (valid 24 hours, single use). It is shown only once:",
24 "runner.tokenMade": "Registration token created.",
25 "runner.revoked": "Runner revoked.",
26 "runner.missing": "That runner does not exist.",
27 "runner.revokeAsk": "Revoke this runner? It can no longer pick up jobs.",
28 "runner.none": "No runners registered yet.",
29 "runner.status": "Status",
30 "runner.seen": "Last contact",
31 "runner.version": "Version",
32 "runner.online": "online",
33 "runner.offline": "offline",
34 }
35
36 var runnerNL = map[string]string{
37 "runner.title": "Runners",
38 "runner.userLead": "Draai CI-jobs van je projecten op je eigen machine met bluegit-runner. Maak een registratietoken en voer het commando uit op die machine.",
39 "runner.groupLead": "Volgorde voor deze groep: groepsrunners, dan account-runners van maintainers die toestemming gaven, dan de BlueGit-runner.",
40 "runner.prefBuiltin": "Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is",
41 "runner.prefOwn": "Eigen runners eerst",
42 "runner.builtinFirst": "Probeer BlueGit runner eerst",
43 "runner.optinOff": "Je account-runners worden niet gebruikt voor deze groep.",
44 "runner.optinOn": "Je account-runners mogen jobs van deze groep draaien.",
45 "runner.optinStart": "Mijn runners toestaan voor deze groep",
46 "runner.optinStop": "Mijn runners hier niet meer gebruiken",
47 "runner.optinWho": "Toegestaan door:",
48 "runner.new": "Nieuw registratietoken",
49 "runner.tokenOnce": "Registratietoken (24 uur geldig, eenmalig). Je ziet het maar één keer:",
50 "runner.tokenMade": "Registratietoken gemaakt.",
51 "runner.revoked": "Runner ingetrokken.",
52 "runner.missing": "Die runner bestaat niet.",
53 "runner.revokeAsk": "Deze runner intrekken? Hij kan dan geen jobs meer oppakken.",
54 "runner.none": "Nog geen runners geregistreerd.",
55 "runner.status": "Status",
56 "runner.seen": "Laatste contact",
57 "runner.version": "Versie",
58 "runner.online": "online",
59 "runner.offline": "offline",
60 }
61
62 var runnerDE = map[string]string{
63 "runner.title": "Runner",
64 "runner.userLead": "Führe CI-Jobs deiner Projekte mit bluegit-runner auf deinem eigenen Rechner aus. Erstelle ein Registrierungstoken und führe den Befehl dort aus.",
65 "runner.groupLead": "Reihenfolge für diese Gruppe: Gruppen-Runner, dann Konto-Runner von Maintainern mit Zustimmung, dann der BlueGit-Runner.",
66 "runner.prefBuiltin": "Meine Runner nur, wenn der BlueGit-Runner nicht sofort frei ist",
67 "runner.prefOwn": "Eigene Runner zuerst",
68 "runner.builtinFirst": "Zuerst den BlueGit-Runner versuchen",
69 "runner.optinOff": "Deine Konto-Runner werden für diese Gruppe nicht verwendet.",
70 "runner.optinOn": "Deine Konto-Runner dürfen Jobs dieser Gruppe ausführen.",
71 "runner.optinStart": "Meine Runner für diese Gruppe erlauben",
72 "runner.optinStop": "Meine Runner hier nicht mehr verwenden",
73 "runner.optinWho": "Erlaubt von:",
74 "runner.new": "Neues Registrierungstoken",
75 "runner.tokenOnce": "Registrierungstoken (24 Stunden gültig, einmalig). Es wird nur einmal angezeigt:",
76 "runner.tokenMade": "Registrierungstoken erstellt.",
77 "runner.revoked": "Runner widerrufen.",
78 "runner.missing": "Dieser Runner existiert nicht.",
79 "runner.revokeAsk": "Diesen Runner widerrufen? Er kann dann keine Jobs mehr annehmen.",
80 "runner.none": "Noch keine Runner registriert.",
81 "runner.status": "Status",
82 "runner.seen": "Letzter Kontakt",
83 "runner.version": "Version",
84 "runner.online": "online",
85 "runner.offline": "offline",
86 }
87
88 var runnerFR = map[string]string{
89 "runner.title": "Runners",
90 "runner.userLead": "Exécutez les jobs CI de vos projets sur votre propre machine avec bluegit-runner. Créez un jeton d'enregistrement et lancez la commande sur cette machine.",
91 "runner.groupLead": "Ordre pour ce groupe : runners du groupe, puis runners de compte des mainteneurs qui l'ont autorisé, puis le runner BlueGit.",
92 "runner.prefBuiltin": "Mes runners seulement si le runner BlueGit n'est pas disponible tout de suite",
93 "runner.prefOwn": "Mes runners d'abord",
94 "runner.builtinFirst": "Essayer d'abord le runner BlueGit",
95 "runner.optinOff": "Vos runners de compte ne sont pas utilisés pour ce groupe.",
96 "runner.optinOn": "Vos runners de compte peuvent exécuter les jobs de ce groupe.",
97 "runner.optinStart": "Autoriser mes runners pour ce groupe",
98 "runner.optinStop": "Ne plus utiliser mes runners ici",
99 "runner.optinWho": "Autorisé par :",
100 "runner.new": "Nouveau jeton d'enregistrement",
101 "runner.tokenOnce": "Jeton d'enregistrement (valable 24 heures, usage unique). Il n'est affiché qu'une fois :",
102 "runner.tokenMade": "Jeton d'enregistrement créé.",
103 "runner.revoked": "Runner révoqué.",
104 "runner.missing": "Ce runner n'existe pas.",
105 "runner.revokeAsk": "Révoquer ce runner ? Il ne pourra plus prendre de jobs.",
106 "runner.none": "Aucun runner enregistré.",
107 "runner.status": "Statut",
108 "runner.seen": "Dernier contact",
109 "runner.version": "Version",
110 "runner.online": "en ligne",
111 "runner.offline": "hors ligne",
112 }
@@ -0,0 +1,112 @@
1package i18n
2
3func init() {
4 addCatalog(en, runnerEN)
5 addCatalog(nl, runnerNL)
6 addCatalog(de, runnerDE)
7 addCatalog(fr, runnerFR)
8}
9
10var runnerEN = map[string]string{
11 "runner.title": "Runners",
12 "runner.userLead": "Run CI jobs of your projects on your own machine with bluegit-runner. Create a registration token and run the command on that machine.",
13 "runner.groupLead": "Order for this group: group runners, then account runners of maintainers who allowed it, then the BlueGit runner.",
14 "runner.prefBuiltin": "Use my runners only when the BlueGit runner is not available right away",
15 "runner.prefOwn": "My own runners first",
16 "runner.builtinFirst": "Try the BlueGit runner first",
17 "runner.optinOff": "Your account runners are not used for this group.",
18 "runner.optinOn": "Your account runners may run jobs of this group.",
19 "runner.optinStart": "Allow my runners for this group",
20 "runner.optinStop": "Stop using my runners here",
21 "runner.optinWho": "Allowed by:",
22 "runner.new": "New registration token",
23 "runner.tokenOnce": "Registration token (valid 24 hours, single use). It is shown only once:",
24 "runner.tokenMade": "Registration token created.",
25 "runner.revoked": "Runner revoked.",
26 "runner.missing": "That runner does not exist.",
27 "runner.revokeAsk": "Revoke this runner? It can no longer pick up jobs.",
28 "runner.none": "No runners registered yet.",
29 "runner.status": "Status",
30 "runner.seen": "Last contact",
31 "runner.version": "Version",
32 "runner.online": "online",
33 "runner.offline": "offline",
34}
35
36var runnerNL = map[string]string{
37 "runner.title": "Runners",
38 "runner.userLead": "Draai CI-jobs van je projecten op je eigen machine met bluegit-runner. Maak een registratietoken en voer het commando uit op die machine.",
39 "runner.groupLead": "Volgorde voor deze groep: groepsrunners, dan account-runners van maintainers die toestemming gaven, dan de BlueGit-runner.",
40 "runner.prefBuiltin": "Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is",
41 "runner.prefOwn": "Eigen runners eerst",
42 "runner.builtinFirst": "Probeer BlueGit runner eerst",
43 "runner.optinOff": "Je account-runners worden niet gebruikt voor deze groep.",
44 "runner.optinOn": "Je account-runners mogen jobs van deze groep draaien.",
45 "runner.optinStart": "Mijn runners toestaan voor deze groep",
46 "runner.optinStop": "Mijn runners hier niet meer gebruiken",
47 "runner.optinWho": "Toegestaan door:",
48 "runner.new": "Nieuw registratietoken",
49 "runner.tokenOnce": "Registratietoken (24 uur geldig, eenmalig). Je ziet het maar één keer:",
50 "runner.tokenMade": "Registratietoken gemaakt.",
51 "runner.revoked": "Runner ingetrokken.",
52 "runner.missing": "Die runner bestaat niet.",
53 "runner.revokeAsk": "Deze runner intrekken? Hij kan dan geen jobs meer oppakken.",
54 "runner.none": "Nog geen runners geregistreerd.",
55 "runner.status": "Status",
56 "runner.seen": "Laatste contact",
57 "runner.version": "Versie",
58 "runner.online": "online",
59 "runner.offline": "offline",
60}
61
62var runnerDE = map[string]string{
63 "runner.title": "Runner",
64 "runner.userLead": "Führe CI-Jobs deiner Projekte mit bluegit-runner auf deinem eigenen Rechner aus. Erstelle ein Registrierungstoken und führe den Befehl dort aus.",
65 "runner.groupLead": "Reihenfolge für diese Gruppe: Gruppen-Runner, dann Konto-Runner von Maintainern mit Zustimmung, dann der BlueGit-Runner.",
66 "runner.prefBuiltin": "Meine Runner nur, wenn der BlueGit-Runner nicht sofort frei ist",
67 "runner.prefOwn": "Eigene Runner zuerst",
68 "runner.builtinFirst": "Zuerst den BlueGit-Runner versuchen",
69 "runner.optinOff": "Deine Konto-Runner werden für diese Gruppe nicht verwendet.",
70 "runner.optinOn": "Deine Konto-Runner dürfen Jobs dieser Gruppe ausführen.",
71 "runner.optinStart": "Meine Runner für diese Gruppe erlauben",
72 "runner.optinStop": "Meine Runner hier nicht mehr verwenden",
73 "runner.optinWho": "Erlaubt von:",
74 "runner.new": "Neues Registrierungstoken",
75 "runner.tokenOnce": "Registrierungstoken (24 Stunden gültig, einmalig). Es wird nur einmal angezeigt:",
76 "runner.tokenMade": "Registrierungstoken erstellt.",
77 "runner.revoked": "Runner widerrufen.",
78 "runner.missing": "Dieser Runner existiert nicht.",
79 "runner.revokeAsk": "Diesen Runner widerrufen? Er kann dann keine Jobs mehr annehmen.",
80 "runner.none": "Noch keine Runner registriert.",
81 "runner.status": "Status",
82 "runner.seen": "Letzter Kontakt",
83 "runner.version": "Version",
84 "runner.online": "online",
85 "runner.offline": "offline",
86}
87
88var runnerFR = map[string]string{
89 "runner.title": "Runners",
90 "runner.userLead": "Exécutez les jobs CI de vos projets sur votre propre machine avec bluegit-runner. Créez un jeton d'enregistrement et lancez la commande sur cette machine.",
91 "runner.groupLead": "Ordre pour ce groupe : runners du groupe, puis runners de compte des mainteneurs qui l'ont autorisé, puis le runner BlueGit.",
92 "runner.prefBuiltin": "Mes runners seulement si le runner BlueGit n'est pas disponible tout de suite",
93 "runner.prefOwn": "Mes runners d'abord",
94 "runner.builtinFirst": "Essayer d'abord le runner BlueGit",
95 "runner.optinOff": "Vos runners de compte ne sont pas utilisés pour ce groupe.",
96 "runner.optinOn": "Vos runners de compte peuvent exécuter les jobs de ce groupe.",
97 "runner.optinStart": "Autoriser mes runners pour ce groupe",
98 "runner.optinStop": "Ne plus utiliser mes runners ici",
99 "runner.optinWho": "Autorisé par :",
100 "runner.new": "Nouveau jeton d'enregistrement",
101 "runner.tokenOnce": "Jeton d'enregistrement (valable 24 heures, usage unique). Il n'est affiché qu'une fois :",
102 "runner.tokenMade": "Jeton d'enregistrement créé.",
103 "runner.revoked": "Runner révoqué.",
104 "runner.missing": "Ce runner n'existe pas.",
105 "runner.revokeAsk": "Révoquer ce runner ? Il ne pourra plus prendre de jobs.",
106 "runner.none": "Aucun runner enregistré.",
107 "runner.status": "Statut",
108 "runner.seen": "Dernier contact",
109 "runner.version": "Version",
110 "runner.online": "en ligne",
111 "runner.offline": "hors ligne",
112}
internal/server/api_flow.go +15 −5
@@ -1,6 +1,7 @@
1 1 package server
2 2
3 3 import (
4 "context"
4 5 "net/http"
5 6 "strconv"
6 7 "strings"
@@ -345,11 +346,20 @@ func (s *Server) pipeJSON(repo store.Repo, p store.Pipeline) map[string]any {
345 346 }
346 347 }
347 348
348 func jobJSON(j store.Job) map[string]any {
349 return map[string]any{
349 func (s *Server) jobJSON(ctx context.Context, j store.Job) map[string]any {
350 out := map[string]any{
350 351 "id": j.ID, "name": j.Name, "stage": j.Stage, "status": j.Status, "when": j.When,
351 352 "allow_failure": j.AllowFailure, "started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt),
353 "runner": nil,
354 }
355 if jr := s.Store.JobRun(ctx, j.ID); jr.RunnerName != "" {
356 kind := "builtin"
357 if jr.RunnerID > 0 {
358 kind = "remote"
359 }
360 out["runner"] = map[string]any{"id": jr.RunnerID, "name": jr.RunnerName, "kind": kind}
352 361 }
362 return out
353 363 }
354 364
355 365 func (s *Server) apiPipelines(w http.ResponseWriter, r *http.Request) {
@@ -488,7 +498,7 @@ func (s *Server) apiJobs(w http.ResponseWriter, r *http.Request) {
488 498 }
489 499 rows := make([]map[string]any, 0, len(jobs))
490 500 for _, j := range jobs {
491 rows = append(rows, jobJSON(j))
501 rows = append(rows, s.jobJSON(r.Context(), j))
492 502 }
493 503 writeJSON(w, http.StatusOK, rows)
494 504 }
@@ -498,7 +508,7 @@ func (s *Server) apiJob(w http.ResponseWriter, r *http.Request) {
498 508 if !ok {
499 509 return
500 510 }
501 writeJSON(w, http.StatusOK, jobJSON(job))
511 writeJSON(w, http.StatusOK, s.jobJSON(r.Context(), job))
502 512 }
503 513
504 514 func (s *Server) apiJobLog(w http.ResponseWriter, r *http.Request) {
@@ -520,7 +530,7 @@ func (s *Server) apiJobAction(w http.ResponseWriter, r *http.Request, action str
520 530 if !s.apiOK(w, r, err) {
521 531 return
522 532 }
523 writeJSON(w, http.StatusOK, jobJSON(updated))
533 writeJSON(w, http.StatusOK, s.jobJSON(r.Context(), updated))
524 534 }
525 535
526 536 func (s *Server) apiPlayJob(w http.ResponseWriter, r *http.Request) { s.apiJobAction(w, r, "play") }
@@ -1,6 +1,7 @@
1package server
1package server
2
2
3import (
3import (
4 "context"
4 "net/http"
5 "net/http"
5 "strconv"
6 "strconv"
6 "strings"
7 "strings"
@@ -345,11 +346,20 @@ func (s *Server) pipeJSON(repo store.Repo, p store.Pipeline) map[string]any {
345 }
346 }
346}
347}
347
348
348func jobJSON(j store.Job) map[string]any {
349func (s *Server) jobJSON(ctx context.Context, j store.Job) map[string]any {
349 return map[string]any{
350 out := map[string]any{
350 "id": j.ID, "name": j.Name, "stage": j.Stage, "status": j.Status, "when": j.When,
351 "id": j.ID, "name": j.Name, "stage": j.Stage, "status": j.Status, "when": j.When,
351 "allow_failure": j.AllowFailure, "started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt),
352 "allow_failure": j.AllowFailure, "started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt),
353 "runner": nil,
354 }
355 if jr := s.Store.JobRun(ctx, j.ID); jr.RunnerName != "" {
356 kind := "builtin"
357 if jr.RunnerID > 0 {
358 kind = "remote"
359 }
360 out["runner"] = map[string]any{"id": jr.RunnerID, "name": jr.RunnerName, "kind": kind}
352 }
361 }
362 return out
353}
363}
354
364
355func (s *Server) apiPipelines(w http.ResponseWriter, r *http.Request) {
365func (s *Server) apiPipelines(w http.ResponseWriter, r *http.Request) {
@@ -488,7 +498,7 @@ func (s *Server) apiJobs(w http.ResponseWriter, r *http.Request) {
488 }
498 }
489 rows := make([]map[string]any, 0, len(jobs))
499 rows := make([]map[string]any, 0, len(jobs))
490 for _, j := range jobs {
500 for _, j := range jobs {
491 rows = append(rows, jobJSON(j))
501 rows = append(rows, s.jobJSON(r.Context(), j))
492 }
502 }
493 writeJSON(w, http.StatusOK, rows)
503 writeJSON(w, http.StatusOK, rows)
494}
504}
@@ -498,7 +508,7 @@ func (s *Server) apiJob(w http.ResponseWriter, r *http.Request) {
498 if !ok {
508 if !ok {
499 return
509 return
500 }
510 }
501 writeJSON(w, http.StatusOK, jobJSON(job))
511 writeJSON(w, http.StatusOK, s.jobJSON(r.Context(), job))
502}
512}
503
513
504func (s *Server) apiJobLog(w http.ResponseWriter, r *http.Request) {
514func (s *Server) apiJobLog(w http.ResponseWriter, r *http.Request) {
@@ -520,7 +530,7 @@ func (s *Server) apiJobAction(w http.ResponseWriter, r *http.Request, action str
520 if !s.apiOK(w, r, err) {
530 if !s.apiOK(w, r, err) {
521 return
531 return
522 }
532 }
523 writeJSON(w, http.StatusOK, jobJSON(updated))
533 writeJSON(w, http.StatusOK, s.jobJSON(r.Context(), updated))
524}
534}
525
535
526func (s *Server) apiPlayJob(w http.ResponseWriter, r *http.Request) { s.apiJobAction(w, r, "play") }
536func (s *Server) apiPlayJob(w http.ResponseWriter, r *http.Request) { s.apiJobAction(w, r, "play") }
internal/server/auth_handlers.go +1 −0
@@ -160,6 +160,7 @@ func (s *Server) account(w http.ResponseWriter, r *http.Request) {
160 160 if v.NewToken != "" {
161 161 http.SetCookie(w, &http.Cookie{Name: "bluegit_token_once", Value: "", Path: "/", MaxAge: -1})
162 162 }
163 s.fillUserRunners(w, r, &v, u)
163 164 s.render(w, "account", v)
164 165 }
165 166
@@ -160,6 +160,7 @@ func (s *Server) account(w http.ResponseWriter, r *http.Request) {
160 if v.NewToken != "" {
160 if v.NewToken != "" {
161 http.SetCookie(w, &http.Cookie{Name: "bluegit_token_once", Value: "", Path: "/", MaxAge: -1})
161 http.SetCookie(w, &http.Cookie{Name: "bluegit_token_once", Value: "", Path: "/", MaxAge: -1})
162 }
162 }
163 s.fillUserRunners(w, r, &v, u)
163 s.render(w, "account", v)
164 s.render(w, "account", v)
164}
165}
165
166
internal/server/git_http.go +22 −0
@@ -28,6 +28,13 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
28 28 }
29 29 service := r.URL.Query().Get("service")
30 30 write := service == "git-receive-pack" || strings.HasSuffix(r.URL.Path, "/git-receive-pack")
31 if !write && s.runnerMayClone(r, repo.ID) {
32 rest := strings.TrimPrefix(r.URL.Path, "/"+owner+"/"+repoSeg)
33 if err := gitrepo.ServeSmartHTTP(w, r, s.Git, gitrepo.ProjectRoot(s.StoragePath()), gitrepo.PathInfo(owner, repoSeg, rest), nil); err != nil && s.Log != nil {
34 s.Log.Error("git http", "err", err, "path", r.URL.Path)
35 }
36 return
37 }
31 38 user, scopes, authed := s.gitUser(r)
32 39 var role access.Role
33 40 if authed {
@@ -102,6 +109,21 @@ func (s *Server) gitUser(r *http.Request) (store.User, access.Scopes, bool) {
102 109 return auth.User, access.StoredScopes(auth.Token.Scopes), true
103 110 }
104 111
112 // runnerMayClone: een aparte runner (bgr_-token) mag alleen lezen uit de
113 // repo van een job die hij nu draait. Job-tokens krijgen geen git-toegang.
114 func (s *Server) runnerMayClone(r *http.Request, repoID int64) bool {
115 h := r.Header.Get("Authorization")
116 if !strings.HasPrefix(strings.ToLower(h), "bearer ") {
117 return false
118 }
119 tok := strings.TrimSpace(h[7:])
120 if !strings.HasPrefix(tok, "bgr_") {
121 return false
122 }
123 rn, err := s.Store.RunnerByToken(r.Context(), tok)
124 return err == nil && s.Store.RunnerRunsRepo(r.Context(), rn.ID, repoID)
125 }
126
105 127 func (s *Server) askAuth(w http.ResponseWriter) {
106 128 w.Header().Set("WWW-Authenticate", `Basic realm="BlueGit"`)
107 129 http.Error(w, "aanmelden met een toegangstoken als wachtwoord", http.StatusUnauthorized)
@@ -28,6 +28,13 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
28 }
28 }
29 service := r.URL.Query().Get("service")
29 service := r.URL.Query().Get("service")
30 write := service == "git-receive-pack" || strings.HasSuffix(r.URL.Path, "/git-receive-pack")
30 write := service == "git-receive-pack" || strings.HasSuffix(r.URL.Path, "/git-receive-pack")
31 if !write && s.runnerMayClone(r, repo.ID) {
32 rest := strings.TrimPrefix(r.URL.Path, "/"+owner+"/"+repoSeg)
33 if err := gitrepo.ServeSmartHTTP(w, r, s.Git, gitrepo.ProjectRoot(s.StoragePath()), gitrepo.PathInfo(owner, repoSeg, rest), nil); err != nil && s.Log != nil {
34 s.Log.Error("git http", "err", err, "path", r.URL.Path)
35 }
36 return
37 }
31 user, scopes, authed := s.gitUser(r)
38 user, scopes, authed := s.gitUser(r)
32 var role access.Role
39 var role access.Role
33 if authed {
40 if authed {
@@ -102,6 +109,21 @@ func (s *Server) gitUser(r *http.Request) (store.User, access.Scopes, bool) {
102 return auth.User, access.StoredScopes(auth.Token.Scopes), true
109 return auth.User, access.StoredScopes(auth.Token.Scopes), true
103}
110}
104
111
112// runnerMayClone: een aparte runner (bgr_-token) mag alleen lezen uit de
113// repo van een job die hij nu draait. Job-tokens krijgen geen git-toegang.
114func (s *Server) runnerMayClone(r *http.Request, repoID int64) bool {
115 h := r.Header.Get("Authorization")
116 if !strings.HasPrefix(strings.ToLower(h), "bearer ") {
117 return false
118 }
119 tok := strings.TrimSpace(h[7:])
120 if !strings.HasPrefix(tok, "bgr_") {
121 return false
122 }
123 rn, err := s.Store.RunnerByToken(r.Context(), tok)
124 return err == nil && s.Store.RunnerRunsRepo(r.Context(), rn.ID, repoID)
125}
126
105func (s *Server) askAuth(w http.ResponseWriter) {
127func (s *Server) askAuth(w http.ResponseWriter) {
106 w.Header().Set("WWW-Authenticate", `Basic realm="BlueGit"`)
128 w.Header().Set("WWW-Authenticate", `Basic realm="BlueGit"`)
107 http.Error(w, "aanmelden met een toegangstoken als wachtwoord", http.StatusUnauthorized)
129 http.Error(w, "aanmelden met een toegangstoken als wachtwoord", http.StatusUnauthorized)
internal/server/pipeline_page.go +2 −0
@@ -62,6 +62,7 @@ type JobLink struct {
62 62 // JobPage is de console van één job.
63 63 type JobPage struct {
64 64 Job store.Job
65 Runner string
65 66 Pipe store.Pipeline
66 67 Name string
67 68 Status string
@@ -598,6 +599,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
598 599 source = p.Source
599 600 }
600 601 return &JobPage{
602 Runner: s.Store.JobRun(r.Context(), job.ID).RunnerName,
601 603 Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
602 604 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
603 605 Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
@@ -62,6 +62,7 @@ type JobLink struct {
62// JobPage is de console van één job.
62// JobPage is de console van één job.
63type JobPage struct {
63type JobPage struct {
64 Job store.Job
64 Job store.Job
65 Runner string
65 Pipe store.Pipeline
66 Pipe store.Pipeline
66 Name string
67 Name string
67 Status string
68 Status string
@@ -598,6 +599,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
598 source = p.Source
599 source = p.Source
599 }
600 }
600 return &JobPage{
601 return &JobPage{
602 Runner: s.Store.JobRun(r.Context(), job.ID).RunnerName,
601 Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
603 Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
602 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
604 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
603 Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
605 Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
internal/server/runners.go added +374 −0
@@ -0,0 +1,374 @@
1 package server
2
3 import (
4 "encoding/json"
5 "errors"
6 "io"
7 "net/http"
8 "os"
9 "strconv"
10 "strings"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/access"
14 "gitlab.com/Timfa/bluegit/internal/runner"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 // RunnerView is één aparte runner in de beheer-UI.
19 type RunnerView struct {
20 ID int64
21 Name string
22 Online bool
23 LastSeen time.Time
24 Created time.Time
25 Version string
26 }
27
28 func runnerViews(rs []store.Runner) []RunnerView {
29 now := time.Now()
30 out := make([]RunnerView, 0, len(rs))
31 for _, r := range rs {
32 out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version})
33 }
34 return out
35 }
36
37 // Long-poll-duur voor runner-jobaanvragen.
38 var runnerPollWait = 25 * time.Second
39
40 func (s *Server) routeRunners(mux *http.ServeMux) {
41 mux.HandleFunc("POST /settings/runners/token", s.userRunnerToken)
42 mux.HandleFunc("POST /settings/runners/delete", s.userRunnerDelete)
43 mux.HandleFunc("POST /settings/runners/pref", s.userRunnerPref)
44 mux.HandleFunc("POST /groups/{path}/runners/token", s.groupRunnerToken)
45 mux.HandleFunc("POST /groups/{path}/runners/delete", s.groupRunnerDelete)
46 mux.HandleFunc("POST /groups/{path}/runners/options", s.groupRunnerOptions)
47 mux.HandleFunc("POST /groups/{path}/runners/optin", s.groupRunnerOptIn)
48
49 mux.HandleFunc("POST /api/v1/runners/register", s.runnerRegister)
50 mux.HandleFunc("POST /api/v1/runner/heartbeat", s.runnerHeartbeat)
51 mux.HandleFunc("POST /api/v1/runner/jobs/request", s.runnerRequest)
52 mux.HandleFunc("POST /api/v1/runner/jobs/{id}/log", s.runnerLog)
53 mux.HandleFunc("GET /api/v1/runner/jobs/{id}/inputs", s.runnerInputs)
54 mux.HandleFunc("PUT /api/v1/runner/jobs/{id}/artifacts", s.runnerArtifacts)
55 mux.HandleFunc("POST /api/v1/runner/jobs/{id}/finish", s.runnerFinish)
56 }
57
58 // ---- beheer-UI ----
59
60 func (s *Server) setRunnerOnce(w http.ResponseWriter, path, plain string) {
61 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
62 http.SetCookie(w, &http.Cookie{Name: "bluegit_runner_once", Value: plain, Path: path, MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
63 }
64
65 func (s *Server) takeRunnerOnce(w http.ResponseWriter, r *http.Request, path string) string {
66 v := cookieVal(r, "bluegit_runner_once")
67 if v != "" {
68 http.SetCookie(w, &http.Cookie{Name: "bluegit_runner_once", Value: "", Path: path, MaxAge: -1})
69 }
70 return v
71 }
72
73 func (s *Server) fillUserRunners(w http.ResponseWriter, r *http.Request, v *View, u store.User) {
74 rs, _ := s.Store.ListRunners(r.Context(), "user", u.ID)
75 v.RunnerList = runnerViews(rs)
76 v.RunnerPref = s.Store.UserRunnerPref(r.Context(), u.ID)
77 v.NewRunnerToken = s.takeRunnerOnce(w, r, "/settings")
78 }
79
80 func (s *Server) userRunnerToken(w http.ResponseWriter, r *http.Request) {
81 u, ok := s.loginRequired(w, r)
82 if !ok || !s.csrfOK(w, r) {
83 return
84 }
85 plain, err := s.Store.CreateRunnerRegToken(r.Context(), "user", u.ID, u.ID)
86 if err != nil {
87 s.redirect(w, r, "/settings#runners", "", s.trErr(r, err))
88 return
89 }
90 s.setRunnerOnce(w, "/settings", plain)
91 s.redirect(w, r, "/settings#runners", s.tr(r, "runner.tokenMade"), "")
92 }
93
94 func (s *Server) userRunnerDelete(w http.ResponseWriter, r *http.Request) {
95 u, ok := s.loginRequired(w, r)
96 if !ok || !s.csrfOK(w, r) {
97 return
98 }
99 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
100 if err := s.Store.RevokeRunner(r.Context(), "user", u.ID, id); err != nil {
101 s.redirect(w, r, "/settings#runners", "", s.tr(r, "runner.missing"))
102 return
103 }
104 s.redirect(w, r, "/settings#runners", s.tr(r, "runner.revoked"), "")
105 }
106
107 func (s *Server) userRunnerPref(w http.ResponseWriter, r *http.Request) {
108 u, ok := s.loginRequired(w, r)
109 if !ok || !s.csrfOK(w, r) {
110 return
111 }
112 _ = s.Store.SetUserRunnerPref(r.Context(), u.ID, r.FormValue("pref"))
113 s.redirect(w, r, "/settings#runners", s.tr(r, "flash.saved"), "")
114 }
115
116 func (s *Server) fillGroupRunners(w http.ResponseWriter, r *http.Request, v *View, g store.Group) {
117 rs, _ := s.Store.ListRunners(r.Context(), "group", g.ID)
118 v.RunnerList = runnerViews(rs)
119 v.BuiltinFirst = s.Store.GroupBuiltinFirst(r.Context(), g.ID)
120 ids, _ := s.Store.RunnerOptIns(r.Context(), g.ID)
121 for _, id := range ids {
122 if v.User != nil && id == v.User.ID {
123 v.RunnerOptIn = true
124 }
125 if u, err := s.Store.UserByID(r.Context(), id); err == nil {
126 v.OptInNames = append(v.OptInNames, u.Username)
127 }
128 }
129 v.NewRunnerToken = s.takeRunnerOnce(w, r, "/groups/"+g.Path)
130 }
131
132 func (s *Server) groupRunnerToken(w http.ResponseWriter, r *http.Request) {
133 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
134 if !ok || !s.csrfOK(w, r) {
135 return
136 }
137 back := "/groups/" + g.Path + "?tab=settings#runners"
138 plain, err := s.Store.CreateRunnerRegToken(r.Context(), "group", g.ID, s.who(r).User.ID)
139 if err != nil {
140 s.redirect(w, r, back, "", s.trErr(r, err))
141 return
142 }
143 s.setRunnerOnce(w, "/groups/"+g.Path, plain)
144 s.redirect(w, r, back, s.tr(r, "runner.tokenMade"), "")
145 }
146
147 func (s *Server) groupRunnerDelete(w http.ResponseWriter, r *http.Request) {
148 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
149 if !ok || !s.csrfOK(w, r) {
150 return
151 }
152 back := "/groups/" + g.Path + "?tab=settings#runners"
153 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
154 if err := s.Store.RevokeRunner(r.Context(), "group", g.ID, id); err != nil {
155 s.redirect(w, r, back, "", s.tr(r, "runner.missing"))
156 return
157 }
158 s.redirect(w, r, back, s.tr(r, "runner.revoked"), "")
159 }
160
161 func (s *Server) groupRunnerOptions(w http.ResponseWriter, r *http.Request) {
162 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
163 if !ok || !s.csrfOK(w, r) {
164 return
165 }
166 _ = s.Store.SetGroupBuiltinFirst(r.Context(), g.ID, r.FormValue("builtin_first") == "1")
167 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings#runners", s.tr(r, "flash.saved"), "")
168 }
169
170 // groupRunnerOptIn: een maintainer staat zijn eigen account-runners toe
171 // voor de groep (of trekt dat in). Alleen voor zichzelf.
172 func (s *Server) groupRunnerOptIn(w http.ResponseWriter, r *http.Request) {
173 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
174 if !ok || !s.csrfOK(w, r) {
175 return
176 }
177 _ = s.Store.SetRunnerOptIn(r.Context(), g.ID, s.who(r).User.ID, r.FormValue("on") == "1")
178 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings#runners", s.tr(r, "flash.saved"), "")
179 }
180
181 // ---- runner-protocol ----
182
183 func runnerJSONErr(w http.ResponseWriter, code int, msg string) {
184 writeJSON(w, code, map[string]any{"message": msg})
185 }
186
187 func (s *Server) runnerAuth(w http.ResponseWriter, r *http.Request) (store.Runner, bool) {
188 h := r.Header.Get("Authorization")
189 tok := ""
190 if strings.HasPrefix(strings.ToLower(h), "bearer ") {
191 tok = strings.TrimSpace(h[7:])
192 }
193 rn, err := s.Store.RunnerByToken(r.Context(), tok)
194 if err != nil {
195 runnerJSONErr(w, http.StatusUnauthorized, "invalid runner token")
196 return store.Runner{}, false
197 }
198 if s.Runner == nil || s.StoragePath() == "" {
199 runnerJSONErr(w, http.StatusServiceUnavailable, "CI is disabled on this server")
200 return store.Runner{}, false
201 }
202 _ = s.Store.TouchRunner(r.Context(), rn.ID, r.Header.Get("X-Runner-Version"))
203 return rn, true
204 }
205
206 func (s *Server) runnerJob(w http.ResponseWriter, r *http.Request, rn store.Runner) (store.Job, bool) {
207 id, _ := strconv.ParseInt(r.PathValue("id"), 10, 64)
208 job, err := s.Store.JobForRunner(r.Context(), rn.ID, id)
209 if err != nil {
210 runnerJSONErr(w, http.StatusNotFound, "job not found")
211 return store.Job{}, false
212 }
213 return job, true
214 }
215
216 func (s *Server) runnerRegister(w http.ResponseWriter, r *http.Request) {
217 var body struct {
218 Token string `json:"token"`
219 Name string `json:"name"`
220 Version string `json:"version"`
221 }
222 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&body); err != nil {
223 runnerJSONErr(w, http.StatusBadRequest, "invalid JSON")
224 return
225 }
226 rn, plain, err := s.Store.RegisterRunner(r.Context(), strings.TrimSpace(body.Token), body.Name, body.Version)
227 if err != nil {
228 if errors.Is(err, store.ErrRegToken) {
229 runnerJSONErr(w, http.StatusForbidden, err.Error())
230 return
231 }
232 runnerJSONErr(w, http.StatusInternalServerError, "registration failed")
233 return
234 }
235 writeJSON(w, http.StatusCreated, map[string]any{"id": rn.ID, "name": rn.Name, "token": plain})
236 }
237
238 func (s *Server) runnerHeartbeat(w http.ResponseWriter, r *http.Request) {
239 rn, ok := s.runnerAuth(w, r)
240 if !ok {
241 return
242 }
243 writeJSON(w, http.StatusOK, map[string]any{"id": rn.ID, "name": rn.Name})
244 }
245
246 func (s *Server) runnerRequest(w http.ResponseWriter, r *http.Request) {
247 rn, ok := s.runnerAuth(w, r)
248 if !ok {
249 return
250 }
251 deadline := time.Now().Add(runnerPollWait)
252 for {
253 pl, err := s.Runner.Claim(r.Context(), rn)
254 if err != nil {
255 runnerJSONErr(w, http.StatusInternalServerError, "claim failed")
256 return
257 }
258 if pl != nil {
259 writeJSON(w, http.StatusOK, pl)
260 return
261 }
262 if time.Now().After(deadline) {
263 w.WriteHeader(http.StatusNoContent)
264 return
265 }
266 select {
267 case <-r.Context().Done():
268 return
269 case <-time.After(time.Second):
270 }
271 _ = s.Store.TouchRunner(r.Context(), rn.ID, "")
272 }
273 }
274
275 func (s *Server) runnerLog(w http.ResponseWriter, r *http.Request) {
276 rn, ok := s.runnerAuth(w, r)
277 if !ok {
278 return
279 }
280 job, ok := s.runnerJob(w, r, rn)
281 if !ok {
282 return
283 }
284 chunk, _ := io.ReadAll(io.LimitReader(r.Body, 4<<20))
285 cancel, err := s.Runner.RemoteLog(r.Context(), job, string(chunk))
286 if err != nil {
287 runnerJSONErr(w, http.StatusInternalServerError, "log failed")
288 return
289 }
290 writeJSON(w, http.StatusOK, map[string]any{"cancel": cancel})
291 }
292
293 func (s *Server) runnerInputs(w http.ResponseWriter, r *http.Request) {
294 rn, ok := s.runnerAuth(w, r)
295 if !ok {
296 return
297 }
298 job, ok := s.runnerJob(w, r, rn)
299 if !ok || job.Status != "running" {
300 if ok {
301 runnerJSONErr(w, http.StatusConflict, "job is not running")
302 }
303 return
304 }
305 dir, err := os.MkdirTemp("", "bluegit-inputs-")
306 if err != nil {
307 runnerJSONErr(w, http.StatusInternalServerError, "temp dir")
308 return
309 }
310 defer os.RemoveAll(dir)
311 if err := s.Runner.RemoteInputs(r.Context(), job, dir); err != nil {
312 runnerJSONErr(w, http.StatusInternalServerError, "inputs failed")
313 return
314 }
315 w.Header().Set("Content-Type", "application/gzip")
316 _ = runner.WriteTar(w, dir, nil)
317 }
318
319 func (s *Server) runnerArtifacts(w http.ResponseWriter, r *http.Request) {
320 rn, ok := s.runnerAuth(w, r)
321 if !ok {
322 return
323 }
324 job, ok := s.runnerJob(w, r, rn)
325 if !ok || job.Status != "running" {
326 if ok {
327 runnerJSONErr(w, http.StatusConflict, "job is not running")
328 }
329 return
330 }
331 dir, err := os.MkdirTemp("", "bluegit-artifacts-")
332 if err != nil {
333 runnerJSONErr(w, http.StatusInternalServerError, "temp dir")
334 return
335 }
336 defer os.RemoveAll(dir)
337 paths := job.ArtifactPaths
338 if paths == nil {
339 paths = []string{}
340 }
341 if err := runner.ReadTar(r.Body, dir, paths, 4<<30); err != nil {
342 runnerJSONErr(w, http.StatusBadRequest, "bad archive: "+err.Error())
343 return
344 }
345 if err := s.Runner.RemoteArtifacts(r.Context(), job, dir); err != nil {
346 runnerJSONErr(w, http.StatusBadRequest, err.Error())
347 return
348 }
349 writeJSON(w, http.StatusOK, map[string]any{"ok": true})
350 }
351
352 func (s *Server) runnerFinish(w http.ResponseWriter, r *http.Request) {
353 rn, ok := s.runnerAuth(w, r)
354 if !ok {
355 return
356 }
357 job, ok := s.runnerJob(w, r, rn)
358 if !ok {
359 return
360 }
361 var body struct {
362 Status string `json:"status"`
363 Message string `json:"message"`
364 }
365 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body); err != nil {
366 runnerJSONErr(w, http.StatusBadRequest, "invalid JSON")
367 return
368 }
369 if err := s.Runner.RemoteFinish(r.Context(), rn, job.ID, body.Status, body.Message); err != nil {
370 runnerJSONErr(w, http.StatusInternalServerError, "finish failed")
371 return
372 }
373 writeJSON(w, http.StatusOK, map[string]any{"ok": true})
374 }
@@ -0,0 +1,374 @@
1package server
2
3import (
4 "encoding/json"
5 "errors"
6 "io"
7 "net/http"
8 "os"
9 "strconv"
10 "strings"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/access"
14 "gitlab.com/Timfa/bluegit/internal/runner"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18// RunnerView is één aparte runner in de beheer-UI.
19type RunnerView struct {
20 ID int64
21 Name string
22 Online bool
23 LastSeen time.Time
24 Created time.Time
25 Version string
26}
27
28func runnerViews(rs []store.Runner) []RunnerView {
29 now := time.Now()
30 out := make([]RunnerView, 0, len(rs))
31 for _, r := range rs {
32 out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version})
33 }
34 return out
35}
36
37// Long-poll-duur voor runner-jobaanvragen.
38var runnerPollWait = 25 * time.Second
39
40func (s *Server) routeRunners(mux *http.ServeMux) {
41 mux.HandleFunc("POST /settings/runners/token", s.userRunnerToken)
42 mux.HandleFunc("POST /settings/runners/delete", s.userRunnerDelete)
43 mux.HandleFunc("POST /settings/runners/pref", s.userRunnerPref)
44 mux.HandleFunc("POST /groups/{path}/runners/token", s.groupRunnerToken)
45 mux.HandleFunc("POST /groups/{path}/runners/delete", s.groupRunnerDelete)
46 mux.HandleFunc("POST /groups/{path}/runners/options", s.groupRunnerOptions)
47 mux.HandleFunc("POST /groups/{path}/runners/optin", s.groupRunnerOptIn)
48
49 mux.HandleFunc("POST /api/v1/runners/register", s.runnerRegister)
50 mux.HandleFunc("POST /api/v1/runner/heartbeat", s.runnerHeartbeat)
51 mux.HandleFunc("POST /api/v1/runner/jobs/request", s.runnerRequest)
52 mux.HandleFunc("POST /api/v1/runner/jobs/{id}/log", s.runnerLog)
53 mux.HandleFunc("GET /api/v1/runner/jobs/{id}/inputs", s.runnerInputs)
54 mux.HandleFunc("PUT /api/v1/runner/jobs/{id}/artifacts", s.runnerArtifacts)
55 mux.HandleFunc("POST /api/v1/runner/jobs/{id}/finish", s.runnerFinish)
56}
57
58// ---- beheer-UI ----
59
60func (s *Server) setRunnerOnce(w http.ResponseWriter, path, plain string) {
61 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
62 http.SetCookie(w, &http.Cookie{Name: "bluegit_runner_once", Value: plain, Path: path, MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
63}
64
65func (s *Server) takeRunnerOnce(w http.ResponseWriter, r *http.Request, path string) string {
66 v := cookieVal(r, "bluegit_runner_once")
67 if v != "" {
68 http.SetCookie(w, &http.Cookie{Name: "bluegit_runner_once", Value: "", Path: path, MaxAge: -1})
69 }
70 return v
71}
72
73func (s *Server) fillUserRunners(w http.ResponseWriter, r *http.Request, v *View, u store.User) {
74 rs, _ := s.Store.ListRunners(r.Context(), "user", u.ID)
75 v.RunnerList = runnerViews(rs)
76 v.RunnerPref = s.Store.UserRunnerPref(r.Context(), u.ID)
77 v.NewRunnerToken = s.takeRunnerOnce(w, r, "/settings")
78}
79
80func (s *Server) userRunnerToken(w http.ResponseWriter, r *http.Request) {
81 u, ok := s.loginRequired(w, r)
82 if !ok || !s.csrfOK(w, r) {
83 return
84 }
85 plain, err := s.Store.CreateRunnerRegToken(r.Context(), "user", u.ID, u.ID)
86 if err != nil {
87 s.redirect(w, r, "/settings#runners", "", s.trErr(r, err))
88 return
89 }
90 s.setRunnerOnce(w, "/settings", plain)
91 s.redirect(w, r, "/settings#runners", s.tr(r, "runner.tokenMade"), "")
92}
93
94func (s *Server) userRunnerDelete(w http.ResponseWriter, r *http.Request) {
95 u, ok := s.loginRequired(w, r)
96 if !ok || !s.csrfOK(w, r) {
97 return
98 }
99 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
100 if err := s.Store.RevokeRunner(r.Context(), "user", u.ID, id); err != nil {
101 s.redirect(w, r, "/settings#runners", "", s.tr(r, "runner.missing"))
102 return
103 }
104 s.redirect(w, r, "/settings#runners", s.tr(r, "runner.revoked"), "")
105}
106
107func (s *Server) userRunnerPref(w http.ResponseWriter, r *http.Request) {
108 u, ok := s.loginRequired(w, r)
109 if !ok || !s.csrfOK(w, r) {
110 return
111 }
112 _ = s.Store.SetUserRunnerPref(r.Context(), u.ID, r.FormValue("pref"))
113 s.redirect(w, r, "/settings#runners", s.tr(r, "flash.saved"), "")
114}
115
116func (s *Server) fillGroupRunners(w http.ResponseWriter, r *http.Request, v *View, g store.Group) {
117 rs, _ := s.Store.ListRunners(r.Context(), "group", g.ID)
118 v.RunnerList = runnerViews(rs)
119 v.BuiltinFirst = s.Store.GroupBuiltinFirst(r.Context(), g.ID)
120 ids, _ := s.Store.RunnerOptIns(r.Context(), g.ID)
121 for _, id := range ids {
122 if v.User != nil && id == v.User.ID {
123 v.RunnerOptIn = true
124 }
125 if u, err := s.Store.UserByID(r.Context(), id); err == nil {
126 v.OptInNames = append(v.OptInNames, u.Username)
127 }
128 }
129 v.NewRunnerToken = s.takeRunnerOnce(w, r, "/groups/"+g.Path)
130}
131
132func (s *Server) groupRunnerToken(w http.ResponseWriter, r *http.Request) {
133 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
134 if !ok || !s.csrfOK(w, r) {
135 return
136 }
137 back := "/groups/" + g.Path + "?tab=settings#runners"
138 plain, err := s.Store.CreateRunnerRegToken(r.Context(), "group", g.ID, s.who(r).User.ID)
139 if err != nil {
140 s.redirect(w, r, back, "", s.trErr(r, err))
141 return
142 }
143 s.setRunnerOnce(w, "/groups/"+g.Path, plain)
144 s.redirect(w, r, back, s.tr(r, "runner.tokenMade"), "")
145}
146
147func (s *Server) groupRunnerDelete(w http.ResponseWriter, r *http.Request) {
148 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
149 if !ok || !s.csrfOK(w, r) {
150 return
151 }
152 back := "/groups/" + g.Path + "?tab=settings#runners"
153 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
154 if err := s.Store.RevokeRunner(r.Context(), "group", g.ID, id); err != nil {
155 s.redirect(w, r, back, "", s.tr(r, "runner.missing"))
156 return
157 }
158 s.redirect(w, r, back, s.tr(r, "runner.revoked"), "")
159}
160
161func (s *Server) groupRunnerOptions(w http.ResponseWriter, r *http.Request) {
162 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
163 if !ok || !s.csrfOK(w, r) {
164 return
165 }
166 _ = s.Store.SetGroupBuiltinFirst(r.Context(), g.ID, r.FormValue("builtin_first") == "1")
167 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings#runners", s.tr(r, "flash.saved"), "")
168}
169
170// groupRunnerOptIn: een maintainer staat zijn eigen account-runners toe
171// voor de groep (of trekt dat in). Alleen voor zichzelf.
172func (s *Server) groupRunnerOptIn(w http.ResponseWriter, r *http.Request) {
173 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
174 if !ok || !s.csrfOK(w, r) {
175 return
176 }
177 _ = s.Store.SetRunnerOptIn(r.Context(), g.ID, s.who(r).User.ID, r.FormValue("on") == "1")
178 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings#runners", s.tr(r, "flash.saved"), "")
179}
180
181// ---- runner-protocol ----
182
183func runnerJSONErr(w http.ResponseWriter, code int, msg string) {
184 writeJSON(w, code, map[string]any{"message": msg})
185}
186
187func (s *Server) runnerAuth(w http.ResponseWriter, r *http.Request) (store.Runner, bool) {
188 h := r.Header.Get("Authorization")
189 tok := ""
190 if strings.HasPrefix(strings.ToLower(h), "bearer ") {
191 tok = strings.TrimSpace(h[7:])
192 }
193 rn, err := s.Store.RunnerByToken(r.Context(), tok)
194 if err != nil {
195 runnerJSONErr(w, http.StatusUnauthorized, "invalid runner token")
196 return store.Runner{}, false
197 }
198 if s.Runner == nil || s.StoragePath() == "" {
199 runnerJSONErr(w, http.StatusServiceUnavailable, "CI is disabled on this server")
200 return store.Runner{}, false
201 }
202 _ = s.Store.TouchRunner(r.Context(), rn.ID, r.Header.Get("X-Runner-Version"))
203 return rn, true
204}
205
206func (s *Server) runnerJob(w http.ResponseWriter, r *http.Request, rn store.Runner) (store.Job, bool) {
207 id, _ := strconv.ParseInt(r.PathValue("id"), 10, 64)
208 job, err := s.Store.JobForRunner(r.Context(), rn.ID, id)
209 if err != nil {
210 runnerJSONErr(w, http.StatusNotFound, "job not found")
211 return store.Job{}, false
212 }
213 return job, true
214}
215
216func (s *Server) runnerRegister(w http.ResponseWriter, r *http.Request) {
217 var body struct {
218 Token string `json:"token"`
219 Name string `json:"name"`
220 Version string `json:"version"`
221 }
222 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&body); err != nil {
223 runnerJSONErr(w, http.StatusBadRequest, "invalid JSON")
224 return
225 }
226 rn, plain, err := s.Store.RegisterRunner(r.Context(), strings.TrimSpace(body.Token), body.Name, body.Version)
227 if err != nil {
228 if errors.Is(err, store.ErrRegToken) {
229 runnerJSONErr(w, http.StatusForbidden, err.Error())
230 return
231 }
232 runnerJSONErr(w, http.StatusInternalServerError, "registration failed")
233 return
234 }
235 writeJSON(w, http.StatusCreated, map[string]any{"id": rn.ID, "name": rn.Name, "token": plain})
236}
237
238func (s *Server) runnerHeartbeat(w http.ResponseWriter, r *http.Request) {
239 rn, ok := s.runnerAuth(w, r)
240 if !ok {
241 return
242 }
243 writeJSON(w, http.StatusOK, map[string]any{"id": rn.ID, "name": rn.Name})
244}
245
246func (s *Server) runnerRequest(w http.ResponseWriter, r *http.Request) {
247 rn, ok := s.runnerAuth(w, r)
248 if !ok {
249 return
250 }
251 deadline := time.Now().Add(runnerPollWait)
252 for {
253 pl, err := s.Runner.Claim(r.Context(), rn)
254 if err != nil {
255 runnerJSONErr(w, http.StatusInternalServerError, "claim failed")
256 return
257 }
258 if pl != nil {
259 writeJSON(w, http.StatusOK, pl)
260 return
261 }
262 if time.Now().After(deadline) {
263 w.WriteHeader(http.StatusNoContent)
264 return
265 }
266 select {
267 case <-r.Context().Done():
268 return
269 case <-time.After(time.Second):
270 }
271 _ = s.Store.TouchRunner(r.Context(), rn.ID, "")
272 }
273}
274
275func (s *Server) runnerLog(w http.ResponseWriter, r *http.Request) {
276 rn, ok := s.runnerAuth(w, r)
277 if !ok {
278 return
279 }
280 job, ok := s.runnerJob(w, r, rn)
281 if !ok {
282 return
283 }
284 chunk, _ := io.ReadAll(io.LimitReader(r.Body, 4<<20))
285 cancel, err := s.Runner.RemoteLog(r.Context(), job, string(chunk))
286 if err != nil {
287 runnerJSONErr(w, http.StatusInternalServerError, "log failed")
288 return
289 }
290 writeJSON(w, http.StatusOK, map[string]any{"cancel": cancel})
291}
292
293func (s *Server) runnerInputs(w http.ResponseWriter, r *http.Request) {
294 rn, ok := s.runnerAuth(w, r)
295 if !ok {
296 return
297 }
298 job, ok := s.runnerJob(w, r, rn)
299 if !ok || job.Status != "running" {
300 if ok {
301 runnerJSONErr(w, http.StatusConflict, "job is not running")
302 }
303 return
304 }
305 dir, err := os.MkdirTemp("", "bluegit-inputs-")
306 if err != nil {
307 runnerJSONErr(w, http.StatusInternalServerError, "temp dir")
308 return
309 }
310 defer os.RemoveAll(dir)
311 if err := s.Runner.RemoteInputs(r.Context(), job, dir); err != nil {
312 runnerJSONErr(w, http.StatusInternalServerError, "inputs failed")
313 return
314 }
315 w.Header().Set("Content-Type", "application/gzip")
316 _ = runner.WriteTar(w, dir, nil)
317}
318
319func (s *Server) runnerArtifacts(w http.ResponseWriter, r *http.Request) {
320 rn, ok := s.runnerAuth(w, r)
321 if !ok {
322 return
323 }
324 job, ok := s.runnerJob(w, r, rn)
325 if !ok || job.Status != "running" {
326 if ok {
327 runnerJSONErr(w, http.StatusConflict, "job is not running")
328 }
329 return
330 }
331 dir, err := os.MkdirTemp("", "bluegit-artifacts-")
332 if err != nil {
333 runnerJSONErr(w, http.StatusInternalServerError, "temp dir")
334 return
335 }
336 defer os.RemoveAll(dir)
337 paths := job.ArtifactPaths
338 if paths == nil {
339 paths = []string{}
340 }
341 if err := runner.ReadTar(r.Body, dir, paths, 4<<30); err != nil {
342 runnerJSONErr(w, http.StatusBadRequest, "bad archive: "+err.Error())
343 return
344 }
345 if err := s.Runner.RemoteArtifacts(r.Context(), job, dir); err != nil {
346 runnerJSONErr(w, http.StatusBadRequest, err.Error())
347 return
348 }
349 writeJSON(w, http.StatusOK, map[string]any{"ok": true})
350}
351
352func (s *Server) runnerFinish(w http.ResponseWriter, r *http.Request) {
353 rn, ok := s.runnerAuth(w, r)
354 if !ok {
355 return
356 }
357 job, ok := s.runnerJob(w, r, rn)
358 if !ok {
359 return
360 }
361 var body struct {
362 Status string `json:"status"`
363 Message string `json:"message"`
364 }
365 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body); err != nil {
366 runnerJSONErr(w, http.StatusBadRequest, "invalid JSON")
367 return
368 }
369 if err := s.Runner.RemoteFinish(r.Context(), rn, job.ID, body.Status, body.Message); err != nil {
370 runnerJSONErr(w, http.StatusInternalServerError, "finish failed")
371 return
372 }
373 writeJSON(w, http.StatusOK, map[string]any{"ok": true})
374}
internal/server/server.go +7 −0
@@ -107,6 +107,7 @@ func (s *Server) Handler() http.Handler {
107 107 mux.HandleFunc("POST /setup", s.setupSave)
108 108 mux.HandleFunc("POST /setup/cache", s.setupCacheSave)
109 109 mux.HandleFunc("POST /setup/cache/clear", s.setupCacheClear)
110 s.routeRunners(mux)
110 111 mux.HandleFunc("GET /settings", s.account)
111 112 mux.HandleFunc("POST /settings/language", s.saveLanguage)
112 113 mux.HandleFunc("POST /settings/profile", s.saveProfile)
@@ -527,6 +528,12 @@ func randomState() (string, error) {
527 528
528 529 // View is de gegevensset voor elk scherm.
529 530 type View struct {
531 RunnerList []RunnerView
532 RunnerPref string
533 NewRunnerToken string
534 BuiltinFirst bool
535 RunnerOptIn bool
536 OptInNames []string
530 537 Title string
531 538 BaseURL string
532 539 RunnerName string
@@ -107,6 +107,7 @@ func (s *Server) Handler() http.Handler {
107 mux.HandleFunc("POST /setup", s.setupSave)
107 mux.HandleFunc("POST /setup", s.setupSave)
108 mux.HandleFunc("POST /setup/cache", s.setupCacheSave)
108 mux.HandleFunc("POST /setup/cache", s.setupCacheSave)
109 mux.HandleFunc("POST /setup/cache/clear", s.setupCacheClear)
109 mux.HandleFunc("POST /setup/cache/clear", s.setupCacheClear)
110 s.routeRunners(mux)
110 mux.HandleFunc("GET /settings", s.account)
111 mux.HandleFunc("GET /settings", s.account)
111 mux.HandleFunc("POST /settings/language", s.saveLanguage)
112 mux.HandleFunc("POST /settings/language", s.saveLanguage)
112 mux.HandleFunc("POST /settings/profile", s.saveProfile)
113 mux.HandleFunc("POST /settings/profile", s.saveProfile)
@@ -527,6 +528,12 @@ func randomState() (string, error) {
527
528
528// View is de gegevensset voor elk scherm.
529// View is de gegevensset voor elk scherm.
529type View struct {
530type View struct {
531 RunnerList []RunnerView
532 RunnerPref string
533 NewRunnerToken string
534 BuiltinFirst bool
535 RunnerOptIn bool
536 OptInNames []string
530 Title string
537 Title string
531 BaseURL string
538 BaseURL string
532 RunnerName string
539 RunnerName string
internal/server/settings_handlers.go +1 −0
@@ -631,6 +631,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
631 631 v.Hooks = s.hookViews(r, "group", g.ID)
632 632 s.fillHookEdit(r, &v, "group", g.ID)
633 633 s.fillGroupApproval(r, &v, g)
634 s.fillGroupRunners(w, r, &v, g)
634 635 if v.User != nil && v.User.ID == g.OwnerID {
635 636 v.IsOwner = true
636 637 v.Candidates = groupCandidates(v.Members, g.OwnerID)
@@ -631,6 +631,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
631 v.Hooks = s.hookViews(r, "group", g.ID)
631 v.Hooks = s.hookViews(r, "group", g.ID)
632 s.fillHookEdit(r, &v, "group", g.ID)
632 s.fillHookEdit(r, &v, "group", g.ID)
633 s.fillGroupApproval(r, &v, g)
633 s.fillGroupApproval(r, &v, g)
634 s.fillGroupRunners(w, r, &v, g)
634 if v.User != nil && v.User.ID == g.OwnerID {
635 if v.User != nil && v.User.ID == g.OwnerID {
635 v.IsOwner = true
636 v.IsOwner = true
636 v.Candidates = groupCandidates(v.Members, g.OwnerID)
637 v.Candidates = groupCandidates(v.Members, g.OwnerID)
internal/server/templates/collab.html +17 −2
@@ -447,7 +447,7 @@
447 447 </div>
448 448 </div>
449 449 <div class="console" data-log>
450 <p class="lognote">{{t "pipe.runningOn" $.RunnerName}}</p>
450 <p class="lognote">{{t "pipe.runningOn" (or .Runner $.RunnerName)}}</p>
451 451 <p class="lognote">{{t "pipe.utc"}}</p>
452 452 {{range .Blocks}}{{if .Section}}
453 453 <section class="logsec{{if .Open}} open{{end}}">
@@ -467,7 +467,7 @@
467 467 <dt>{{t "pipe.queued"}}</dt><dd>{{if .Queued}}{{.Queued}}{{else}}—{{end}}</dd>
468 468 <dt>{{t "pipe.timeout"}}</dt><dd>{{.Timeout}}</dd>
469 469 {{if .Environment}}<dt>{{t "pipe.environment"}}</dt><dd>{{.Environment}}{{if .EnvironmentLink}} <a href="{{.EnvironmentLink}}">{{.EnvironmentURL}}</a>{{else if .EnvironmentURL}} {{.EnvironmentURL}}{{end}}</dd>{{end}}
470 <dt>{{t "pipe.runner"}}</dt><dd>{{$.RunnerName}}</dd>
470 <dt>{{t "pipe.runner"}}</dt><dd>{{or .Runner $.RunnerName}}</dd>
471 471 <dt>{{t "pipe.source"}}</dt><dd>{{.Source}}</dd>
472 472 <dt>{{t "pipe.commit"}}</dt><dd><code>{{.Short}}</code> <button type="button" class="iconbtn" data-copy="{{.Pipe.CommitSHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{if .Title}}<div>{{.Title}}</div>{{end}}</dd>
473 473 <dt>{{t "pipe.one"}}</dt><dd><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}">#{{.Pipe.ID}}</a> <span class="status {{.PipeStatus}}"><span class="mark"></span>{{.PipeLabel}}</span> <span class="muted">{{t "pipe.for"}} {{.Ref}}</span></dd>
@@ -919,6 +919,21 @@
919 919 <script src="/assets/transfer.js"></script>
920 920 {{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
921 921 {{end}}
922 <h2 id="runners">{{t "runner.title"}}</h2>
923 <p class="muted">{{t "runner.groupLead"}}</p>
924 <form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
925 <input type="hidden" name="csrf" value="{{.CSRF}}">
926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
927 <button type="submit">{{t "action.save"}}</button>
928 </form>
929 <form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/optin">
930 <input type="hidden" name="csrf" value="{{.CSRF}}">
931 <input type="hidden" name="on" value="{{if .RunnerOptIn}}0{{else}}1{{end}}">
932 <p>{{if .RunnerOptIn}}{{t "runner.optinOn"}}{{else}}{{t "runner.optinOff"}}{{end}}</p>
933 {{if .OptInNames}}<p class="muted">{{t "runner.optinWho"}} {{range $i, $n := .OptInNames}}{{if $i}}, {{end}}{{$n}}{{end}}</p>{{end}}
934 <button type="submit">{{if .RunnerOptIn}}{{t "runner.optinStop"}}{{else}}{{t "runner.optinStart"}}{{end}}</button>
935 </form>
936 {{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" (printf "/groups/%s/runners/delete" .Group.Path) "Token" .NewRunnerToken "New" (printf "/groups/%s/runners/token" .Group.Path) "Base" .BaseURL)}}
922 937 <h2>{{t "set.webhooks"}}</h2>
923 938 <p class="muted">{{t "group.secretsNote"}}</p>
924 939 {{template "webhookform" .}}
@@ -447,7 +447,7 @@
447 </div>
447 </div>
448 </div>
448 </div>
449 <div class="console" data-log>
449 <div class="console" data-log>
450 <p class="lognote">{{t "pipe.runningOn" $.RunnerName}}</p>
450 <p class="lognote">{{t "pipe.runningOn" (or .Runner $.RunnerName)}}</p>
451 <p class="lognote">{{t "pipe.utc"}}</p>
451 <p class="lognote">{{t "pipe.utc"}}</p>
452 {{range .Blocks}}{{if .Section}}
452 {{range .Blocks}}{{if .Section}}
453 <section class="logsec{{if .Open}} open{{end}}">
453 <section class="logsec{{if .Open}} open{{end}}">
@@ -467,7 +467,7 @@
467 <dt>{{t "pipe.queued"}}</dt><dd>{{if .Queued}}{{.Queued}}{{else}}—{{end}}</dd>
467 <dt>{{t "pipe.queued"}}</dt><dd>{{if .Queued}}{{.Queued}}{{else}}—{{end}}</dd>
468 <dt>{{t "pipe.timeout"}}</dt><dd>{{.Timeout}}</dd>
468 <dt>{{t "pipe.timeout"}}</dt><dd>{{.Timeout}}</dd>
469 {{if .Environment}}<dt>{{t "pipe.environment"}}</dt><dd>{{.Environment}}{{if .EnvironmentLink}} <a href="{{.EnvironmentLink}}">{{.EnvironmentURL}}</a>{{else if .EnvironmentURL}} {{.EnvironmentURL}}{{end}}</dd>{{end}}
469 {{if .Environment}}<dt>{{t "pipe.environment"}}</dt><dd>{{.Environment}}{{if .EnvironmentLink}} <a href="{{.EnvironmentLink}}">{{.EnvironmentURL}}</a>{{else if .EnvironmentURL}} {{.EnvironmentURL}}{{end}}</dd>{{end}}
470 <dt>{{t "pipe.runner"}}</dt><dd>{{$.RunnerName}}</dd>
470 <dt>{{t "pipe.runner"}}</dt><dd>{{or .Runner $.RunnerName}}</dd>
471 <dt>{{t "pipe.source"}}</dt><dd>{{.Source}}</dd>
471 <dt>{{t "pipe.source"}}</dt><dd>{{.Source}}</dd>
472 <dt>{{t "pipe.commit"}}</dt><dd><code>{{.Short}}</code> <button type="button" class="iconbtn" data-copy="{{.Pipe.CommitSHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{if .Title}}<div>{{.Title}}</div>{{end}}</dd>
472 <dt>{{t "pipe.commit"}}</dt><dd><code>{{.Short}}</code> <button type="button" class="iconbtn" data-copy="{{.Pipe.CommitSHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>{{if .Title}}<div>{{.Title}}</div>{{end}}</dd>
473 <dt>{{t "pipe.one"}}</dt><dd><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}">#{{.Pipe.ID}}</a> <span class="status {{.PipeStatus}}"><span class="mark"></span>{{.PipeLabel}}</span> <span class="muted">{{t "pipe.for"}} {{.Ref}}</span></dd>
473 <dt>{{t "pipe.one"}}</dt><dd><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}">#{{.Pipe.ID}}</a> <span class="status {{.PipeStatus}}"><span class="mark"></span>{{.PipeLabel}}</span> <span class="muted">{{t "pipe.for"}} {{.Ref}}</span></dd>
@@ -919,6 +919,21 @@
919<script src="/assets/transfer.js"></script>
919<script src="/assets/transfer.js"></script>
920{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
920{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
921{{end}}
921{{end}}
922<h2 id="runners">{{t "runner.title"}}</h2>
923<p class="muted">{{t "runner.groupLead"}}</p>
924<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/options">
925 <input type="hidden" name="csrf" value="{{.CSRF}}">
926 <label><input type="checkbox" name="builtin_first" value="1" {{if .BuiltinFirst}}checked{{end}}> {{t "runner.builtinFirst"}}</label>
927 <button type="submit">{{t "action.save"}}</button>
928</form>
929<form class="panel" method="post" action="/groups/{{.Group.Path}}/runners/optin">
930 <input type="hidden" name="csrf" value="{{.CSRF}}">
931 <input type="hidden" name="on" value="{{if .RunnerOptIn}}0{{else}}1{{end}}">
932 <p>{{if .RunnerOptIn}}{{t "runner.optinOn"}}{{else}}{{t "runner.optinOff"}}{{end}}</p>
933 {{if .OptInNames}}<p class="muted">{{t "runner.optinWho"}} {{range $i, $n := .OptInNames}}{{if $i}}, {{end}}{{$n}}{{end}}</p>{{end}}
934 <button type="submit">{{if .RunnerOptIn}}{{t "runner.optinStop"}}{{else}}{{t "runner.optinStart"}}{{end}}</button>
935</form>
936{{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" (printf "/groups/%s/runners/delete" .Group.Path) "Token" .NewRunnerToken "New" (printf "/groups/%s/runners/token" .Group.Path) "Base" .BaseURL)}}
922<h2>{{t "set.webhooks"}}</h2>
937<h2>{{t "set.webhooks"}}</h2>
923<p class="muted">{{t "group.secretsNote"}}</p>
938<p class="muted">{{t "group.secretsNote"}}</p>
924{{template "webhookform" .}}
939{{template "webhookform" .}}
internal/server/templates/pages.html +41 −0
@@ -302,6 +302,17 @@
302 302 </div>
303 303 {{end}}
304 304 </section>
305 <section class="panel" id="runners">
306 <h2>{{t "runner.title"}}</h2>
307 <p class="muted">{{t "runner.userLead"}}</p>
308 <form method="post" action="/settings/runners/pref">
309 <input type="hidden" name="csrf" value="{{.CSRF}}">
310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
311 <label><input type="radio" name="pref" value="own_first" {{if eq .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefOwn"}}</label>
312 <button type="submit">{{t "action.save"}}</button>
313 </form>
314 {{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" "/settings/runners/delete" "Token" .NewRunnerToken "New" "/settings/runners/token" "Base" .BaseURL)}}
315 </section>
305 316 <section class="panel">
306 317 <h2>{{t "acct.ssh"}}</h2>
307 318 <form method="post" action="/settings/ssh">
@@ -675,3 +686,33 @@
675 686 {{template "layout-end" .}}
676 687 {{end}}
677 688
689
690 {{define "runnerlist"}}
691 {{if .Token}}<p>{{t "runner.tokenOnce"}}</p><p class="code">{{.Token}}</p>
692 <pre class="code">sudo bluegit-runner register --url {{.Base}} --token {{.Token}}</pre>{{end}}
693 <form method="post" action="{{.New}}">
694 <input type="hidden" name="csrf" value="{{.CSRF}}">
695 <button type="submit">{{t "runner.new"}}</button>
696 </form>
697 {{if .Runners}}
698 <div class="hscroll">
699 <table class="acct">
700 <thead><tr><th>{{t "acct.col.name"}}</th><th>{{t "runner.status"}}</th><th>{{t "runner.seen"}}</th><th>{{t "runner.version"}}</th><th></th></tr></thead>
701 <tbody>
702 {{range .Runners}}<tr>
703 <td>{{.Name}}</td>
704 <td>{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
705 <td>{{date .LastSeen}}</td>
706 <td>{{.Version}}</td>
707 <td class="act">
708 <form method="post" action="{{$.Delete}}" data-confirm="{{t "runner.revokeAsk"}}">
709 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
710 <button class="danger" type="submit">{{t "acct.revoke"}}</button>
711 </form>
712 </td>
713 </tr>{{end}}
714 </tbody>
715 </table>
716 </div>
717 {{else}}<p class="muted">{{t "runner.none"}}</p>{{end}}
718 {{end}}
@@ -302,6 +302,17 @@
302 </div>
302 </div>
303 {{end}}
303 {{end}}
304</section>
304</section>
305<section class="panel" id="runners">
306 <h2>{{t "runner.title"}}</h2>
307 <p class="muted">{{t "runner.userLead"}}</p>
308 <form method="post" action="/settings/runners/pref">
309 <input type="hidden" name="csrf" value="{{.CSRF}}">
310 <label><input type="radio" name="pref" value="builtin_first" {{if ne .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefBuiltin"}}</label>
311 <label><input type="radio" name="pref" value="own_first" {{if eq .RunnerPref "own_first"}}checked{{end}}> {{t "runner.prefOwn"}}</label>
312 <button type="submit">{{t "action.save"}}</button>
313 </form>
314 {{template "runnerlist" (dict "Runners" .RunnerList "CSRF" .CSRF "Delete" "/settings/runners/delete" "Token" .NewRunnerToken "New" "/settings/runners/token" "Base" .BaseURL)}}
315</section>
305<section class="panel">
316<section class="panel">
306 <h2>{{t "acct.ssh"}}</h2>
317 <h2>{{t "acct.ssh"}}</h2>
307 <form method="post" action="/settings/ssh">
318 <form method="post" action="/settings/ssh">
@@ -675,3 +686,33 @@
675{{template "layout-end" .}}
686{{template "layout-end" .}}
676{{end}}
687{{end}}
677
688
689
690{{define "runnerlist"}}
691{{if .Token}}<p>{{t "runner.tokenOnce"}}</p><p class="code">{{.Token}}</p>
692<pre class="code">sudo bluegit-runner register --url {{.Base}} --token {{.Token}}</pre>{{end}}
693<form method="post" action="{{.New}}">
694 <input type="hidden" name="csrf" value="{{.CSRF}}">
695 <button type="submit">{{t "runner.new"}}</button>
696</form>
697{{if .Runners}}
698<div class="hscroll">
699<table class="acct">
700 <thead><tr><th>{{t "acct.col.name"}}</th><th>{{t "runner.status"}}</th><th>{{t "runner.seen"}}</th><th>{{t "runner.version"}}</th><th></th></tr></thead>
701 <tbody>
702 {{range .Runners}}<tr>
703 <td>{{.Name}}</td>
704 <td>{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
705 <td>{{date .LastSeen}}</td>
706 <td>{{.Version}}</td>
707 <td class="act">
708 <form method="post" action="{{$.Delete}}" data-confirm="{{t "runner.revokeAsk"}}">
709 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
710 <button class="danger" type="submit">{{t "acct.revoke"}}</button>
711 </form>
712 </td>
713 </tr>{{end}}
714 </tbody>
715</table>
716</div>
717{{else}}<p class="muted">{{t "runner.none"}}</p>{{end}}
718{{end}}