alice.pds.demo.boltless.dev
This repository has no description
2.9 kB
111 lines
1package xrpc
2
3import (
4 "encoding/json"
5 "errors"
6 "fmt"
7 "net/http"
8
9 "github.com/bluesky-social/indigo/atproto/syntax"
10 "tangled.org/core/api/tangled"
11 "tangled.org/core/knotserver/git"
12 "tangled.org/core/patchutil"
13 "tangled.org/core/rbac"
14 "tangled.org/core/types"
15 xrpcerr "tangled.org/core/xrpc/errors"
16)
17
18func (x *Xrpc) Merge(w http.ResponseWriter, r *http.Request) {
19 l := x.Logger.With("handler", "Merge")
20 fail := func(e xrpcerr.XrpcError) {
21 l.Error("failed", "kind", e.Tag, "error", e.Message)
22 writeError(w, e, http.StatusBadRequest)
23 }
24
25 actorDid, ok := r.Context().Value(ActorDid).(syntax.DID)
26 if !ok {
27 fail(xrpcerr.MissingActorDidError)
28 return
29 }
30
31 var data tangled.RepoMerge_Input
32 if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
33 fail(xrpcerr.GenericError(err))
34 return
35 }
36
37 did := data.Did
38 name := data.Name
39
40 if did == "" || name == "" {
41 fail(xrpcerr.GenericError(fmt.Errorf("did and name are required")))
42 return
43 }
44
45 repoDid, repoPath, err := x.resolveRepoDID(data.Repo, did, name)
46 if err != nil {
47 l.Error("failed to resolve repo", "err", err)
48 fail(xrpcerr.RepoNotFoundError)
49 return
50 }
51
52 if ok, err := x.Enforcer.IsPushAllowed(actorDid.String(), rbac.ThisServer, repoDid.String()); !ok || err != nil {
53 l.Error("insufficient permissions", "did", actorDid.String(), "repo", repoDid.String())
54 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized)
55 return
56 }
57
58 gr, err := git.Open(repoPath, data.Branch)
59 if err != nil {
60 fail(xrpcerr.GenericError(fmt.Errorf("failed to open repository: %w", err)))
61 return
62 }
63 if x.Sandbox != nil {
64 gr = gr.WithSandbox(x.Sandbox)
65 }
66
67 mo := git.MergeOptions{}
68 if data.AuthorName != nil {
69 mo.AuthorName = *data.AuthorName
70 }
71 if data.AuthorEmail != nil {
72 mo.AuthorEmail = *data.AuthorEmail
73 }
74 if data.CommitBody != nil {
75 mo.CommitBody = *data.CommitBody
76 }
77 if data.CommitMessage != nil {
78 mo.CommitMessage = *data.CommitMessage
79 }
80
81 mo.CommitterName = x.Config.Git.UserName
82 mo.CommitterEmail = x.Config.Git.UserEmail
83 mo.FormatPatch = patchutil.IsFormatPatch(data.Patch)
84
85 err = gr.MergeWithOptions(data.Patch, data.Branch, mo)
86 if err != nil {
87 var mergeErr *git.ErrMerge
88 if errors.As(err, &mergeErr) {
89 conflicts := make([]types.ConflictInfo, len(mergeErr.Conflicts))
90 for i, conflict := range mergeErr.Conflicts {
91 conflicts[i] = types.ConflictInfo{
92 Filename: conflict.Filename,
93 Reason: conflict.Reason,
94 }
95 }
96
97 conflictErr := xrpcerr.NewXrpcError(
98 xrpcerr.WithTag("MergeConflict"),
99 xrpcerr.WithMessage(fmt.Sprintf("Merge failed due to conflicts: %s", mergeErr.Message)),
100 )
101 writeError(w, conflictErr, http.StatusConflict)
102 return
103 } else {
104 l.Error("failed to merge", "error", err.Error())
105 writeError(w, xrpcerr.GitError(err), http.StatusInternalServerError)
106 return
107 }
108 }
109
110 w.WriteHeader(http.StatusOK)
111}