lewis.moe
Monorepo for Tangled
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, err := x.Db.GetRepoDid(did, name)
46 if err != nil {
47 fail(xrpcerr.RepoNotFoundError)
48 return
49 }
50 repoPath, _, _, err := x.Db.ResolveRepoDIDOnDisk(x.Config.Repo.ScanPath, repoDid)
51 if err != nil {
52 fail(xrpcerr.RepoNotFoundError)
53 return
54 }
55
56 if ok, err := x.Enforcer.IsPushAllowed(actorDid.String(), rbac.ThisServer, repoDid); !ok || err != nil {
57 l.Error("insufficient permissions", "did", actorDid.String(), "repo", repoDid)
58 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized)
59 return
60 }
61
62 gr, err := git.Open(repoPath, data.Branch)
63 if err != nil {
64 fail(xrpcerr.GenericError(fmt.Errorf("failed to open repository: %w", err)))
65 return
66 }
67
68 mo := git.MergeOptions{}
69 if data.AuthorName != nil {
70 mo.AuthorName = *data.AuthorName
71 }
72 if data.AuthorEmail != nil {
73 mo.AuthorEmail = *data.AuthorEmail
74 }
75 if data.CommitBody != nil {
76 mo.CommitBody = *data.CommitBody
77 }
78 if data.CommitMessage != nil {
79 mo.CommitMessage = *data.CommitMessage
80 }
81
82 mo.CommitterName = x.Config.Git.UserName
83 mo.CommitterEmail = x.Config.Git.UserEmail
84 mo.FormatPatch = patchutil.IsFormatPatch(data.Patch)
85
86 err = gr.MergeWithOptions(data.Patch, data.Branch, mo)
87 if err != nil {
88 var mergeErr *git.ErrMerge
89 if errors.As(err, &mergeErr) {
90 conflicts := make([]types.ConflictInfo, len(mergeErr.Conflicts))
91 for i, conflict := range mergeErr.Conflicts {
92 conflicts[i] = types.ConflictInfo{
93 Filename: conflict.Filename,
94 Reason: conflict.Reason,
95 }
96 }
97
98 conflictErr := xrpcerr.NewXrpcError(
99 xrpcerr.WithTag("MergeConflict"),
100 xrpcerr.WithMessage(fmt.Sprintf("Merge failed due to conflicts: %s", mergeErr.Message)),
101 )
102 writeError(w, conflictErr, http.StatusConflict)
103 return
104 } else {
105 l.Error("failed to merge", "error", err.Error())
106 writeError(w, xrpcerr.GitError(err), http.StatusInternalServerError)
107 return
108 }
109 }
110
111 w.WriteHeader(http.StatusOK)
112}