commit e2385ead2f536e12c8d00eeff2312b39aa1b4914 · kot.pink/core

+41

knotserver/git/post_receive.go

···

       1
       1
       +
       package git

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"bufio"

     

       5
       5
       +
       	"io"

     

       6
       6
       +
       	"strings"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type PostReceiveLine struct {

     

       10
       10
       +
       	OldSha string // old sha of reference being updated

     

       11
       11
       +
       	NewSha string // new sha of reference being updated

     

       12
       12
       +
       	Ref    string // the reference being updated

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       func ParsePostReceive(buf io.Reader) ([]PostReceiveLine, error) {

     

       16
       16
       +
       	scanner := bufio.NewScanner(buf)

     

       17
       17
       +
       	var lines []PostReceiveLine

     

       18
       18
       +
       	for scanner.Scan() {

     

       19
       19
       +
       		line := scanner.Text()

     

       20
       20
       +
       		parts := strings.SplitN(line, " ", 3)

     

       21
       21
       +
       		if len(parts) != 3 {

     

       22
       22
       +
       			continue

     

       23
       23
       +
       		}

     

       24
       24
       +
       

     

       25
       25
       +
       		oldSha := parts[0]

     

       26
       26
       +
       		newSha := parts[1]

     

       27
       27
       +
       		ref := parts[2]

     

       28
       28
       +
       

     

       29
       29
       +
       		lines = append(lines, PostReceiveLine{

     

       30
       30
       +
       			OldSha: oldSha,

     

       31
       31
       +
       			NewSha: newSha,

     

       32
       32
       +
       			Ref:    ref,

     

       33
       33
       +
       		})

     

       34
       34
       +
       	}

     

       35
       35
       +
       

     

       36
       36
       +
       	if err := scanner.Err(); err != nil {

     

       37
       37
       +
       		return nil, err

     

       38
       38
       +
       	}

     

       39
       39
       +
       

     

       40
       40
       +
       	return lines, nil

     

       41
       41
       +
       }

+20 -34

knotserver/internal.go

···

       1
       1
        
       package knotserver

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"bufio"

     

       5
       4
        
       	"context"

     

       6
       5
        
       	"log/slog"

     

       7
       6
        
       	"net/http"

     

       8
       7
        
       	"path/filepath"

     

       9
       9
       -
       	"strings"

     

       10
       8
        
       

     

       11
       9
        
       	"github.com/go-chi/chi/v5"

     

       12
       10
        
       	"github.com/go-chi/chi/v5/middleware"

     

       13
       11
        
       	"tangled.sh/tangled.sh/core/knotserver/config"

     

       14
       12
        
       	"tangled.sh/tangled.sh/core/knotserver/db"

     

       13
       13
       +
       	"tangled.sh/tangled.sh/core/knotserver/git"

     

       15
       14
        
       	"tangled.sh/tangled.sh/core/knotserver/notifier"

     

       16
       15
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       17
       16
        
       )

     
···

       70
       69
        
       	}

     

       71
       70
        
       	gitUserDid := r.Header.Get("X-Git-User-Did")

     

       72
       71
        
       

     

       73
       73
       -
       	var ops []db.Op

     

       74
       74
       -
       	scanner := bufio.NewScanner(r.Body)

     

       75
       75
       -
       	for scanner.Scan() {

     

       76
       76
       -
       		line := scanner.Text()

     

       77
       77
       -
       		parts := strings.SplitN(line, " ", 3)

     

       78
       78
       -
       		if len(parts) != 3 {

     

       79
       79
       -
       			l.Error("invalid payload", "parts", parts)

     

       80
       80
       -
       			continue

     

       81
       81
       -
       		}

     

       82
       82
       -
       

     

       83
       83
       -
       		tid := TID()

     

       84
       84
       -
       		oldSha := parts[0]

     

       85
       85
       -
       		newSha := parts[1]

     

       86
       86
       -
       		ref := parts[2]

     

       87
       87
       -
       		op := db.Op{

     

       88
       88
       -
       			Tid:    tid,

     

       89
       89
       -
       			Did:    gitUserDid,

     

       90
       90
       -
       			Repo:   gitRelativeDir,

     

       91
       91
       -
       			OldSha: oldSha,

     

       92
       92
       -
       			NewSha: newSha,

     

       93
       93
       -
       			Ref:    ref,

     

       94
       94
       -
       		}

     

       95
       95
       -
       		ops = append(ops, op)

     

       72
       72
       +
       	lines, err := git.ParsePostReceive(r.Body)

     

       73
       73
       +
       	if err != nil {

     

       74
       74
       +
       		l.Error("failed to parse post-receive payload", "err", err)

     

       75
       75
       +
       		// non-fatal

     

       96
       76
        
       	}

     

       97
       77
        
       

     

       98
       98
       -
       	if err := scanner.Err(); err != nil {

     

       99
       99
       -
       		l.Error("failed to read payload", "err", err)

     

       100
       100
       -
       		return

     

       101
       101
       -
       	}

     

       102
       102
       -
       

     

       103
       103
       -
       	for _, op := range ops {

     

       104
       104
       -
       		err := h.db.InsertOp(op, h.n)

     

       78
       78
       +
       	for _, line := range lines {

     

       79
       79
       +
       		err := h.updateOpLog(line, gitUserDid, gitRelativeDir)

     

       105
       80
        
       		if err != nil {

     

       106
       106
       -
       			l.Error("failed to insert op", "err", err, "op", op)

     

       107
       107
       -
       			continue

     

       81
       81
       +
       			l.Error("failed to insert op", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir)

     

       108
       82
        
       		}

     

       109
       83
        
       	}

     

       110
       84
        
       

     

       111
       85
        
       	return

     

       86
       86
       +
       }

     

       87
       87
       +
       

     

       88
       88
       +
       func (h *InternalHandle) updateOpLog(line git.PostReceiveLine, did, repo string) error {

     

       89
       89
       +
       	op := db.Op{

     

       90
       90
       +
       		Tid:    TID(),

     

       91
       91
       +
       		Did:    did,

     

       92
       92
       +
       		Repo:   repo,

     

       93
       93
       +
       		OldSha: line.OldSha,

     

       94
       94
       +
       		NewSha: line.NewSha,

     

       95
       95
       +
       		Ref:    line.Ref,

     

       96
       96
       +
       	}

     

       97
       97
       +
       	return h.db.InsertOp(op, h.n)

     

       112
       98
        
       }

     

       113
       99
        
       

     

       114
       100
        
       func Internal(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, l *slog.Logger, n *notifier.Notifier) http.Handler {