1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
package operations
import (
"errors"
"fmt"
"time"
"gitlab.com/gitlab-org/gitaly/v15/internal/git"
"gitlab.com/gitlab-org/gitaly/v15/internal/git/updateref"
"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
//nolint:stylecheck // This is unintentionally missing documentation.
func (s *Server) UserRebaseConfirmable(stream gitalypb.OperationService_UserRebaseConfirmableServer) error {
firstRequest, err := stream.Recv()
if err != nil {
return err
}
header := firstRequest.GetHeader()
if header == nil {
return helper.ErrInvalidArgument(errors.New("UserRebaseConfirmable: empty UserRebaseConfirmableRequest.Header"))
}
if err := validateUserRebaseConfirmableHeader(header); err != nil {
return helper.ErrInvalidArgumentf("UserRebaseConfirmable: %v", err)
}
ctx := stream.Context()
quarantineDir, quarantineRepo, err := s.quarantinedRepo(ctx, header.GetRepository())
if err != nil {
return helper.ErrInternalf("creating repo quarantine: %w", err)
}
repoPath, err := quarantineRepo.Path()
if err != nil {
return err
}
branch := git.NewReferenceNameFromBranchName(string(header.Branch))
oldrev, err := git.ObjectHashSHA1.FromHex(header.BranchSha)
if err != nil {
return helper.ErrNotFound(err)
}
remoteFetch := rebaseRemoteFetch{header: header}
startRevision, err := s.fetchStartRevision(ctx, quarantineRepo, remoteFetch)
if err != nil {
return status.Error(codes.Internal, err.Error())
}
committer := git2go.NewSignature(string(header.User.Name), string(header.User.Email), time.Now())
if header.Timestamp != nil {
committer.When = header.Timestamp.AsTime()
}
newrev, err := s.git2goExecutor.Rebase(ctx, quarantineRepo, git2go.RebaseCommand{
Repository: repoPath,
Committer: committer,
CommitID: oldrev,
UpstreamCommitID: startRevision,
SkipEmptyCommits: true,
})
if err != nil {
var conflictErr git2go.ConflictingFilesError
if errors.As(err, &conflictErr) {
conflictingFiles := make([][]byte, 0, len(conflictErr.ConflictingFiles))
for _, conflictingFile := range conflictErr.ConflictingFiles {
conflictingFiles = append(conflictingFiles, []byte(conflictingFile))
}
detailedErr, err := helper.ErrWithDetails(
helper.ErrFailedPreconditionf("rebasing commits: %w", err),
&gitalypb.UserRebaseConfirmableError{
Error: &gitalypb.UserRebaseConfirmableError_RebaseConflict{
RebaseConflict: &gitalypb.MergeConflictError{
ConflictingFiles: conflictingFiles,
ConflictingCommitIds: []string{
startRevision.String(),
oldrev.String(),
},
},
},
},
)
if err != nil {
return helper.ErrInternalf("error details: %w", err)
}
return detailedErr
}
return helper.ErrInternalf("rebasing commits: %w", err)
}
if err := stream.Send(&gitalypb.UserRebaseConfirmableResponse{
UserRebaseConfirmableResponsePayload: &gitalypb.UserRebaseConfirmableResponse_RebaseSha{
RebaseSha: newrev.String(),
},
}); err != nil {
return fmt.Errorf("send rebase sha: %w", err)
}
secondRequest, err := stream.Recv()
if err != nil {
return helper.ErrInternalf("recv: %w", err)
}
if !secondRequest.GetApply() {
return helper.ErrFailedPreconditionf("rebase aborted by client")
}
if err := s.updateReferenceWithHooks(
ctx,
header.GetRepository(),
header.User,
quarantineDir,
branch,
newrev,
oldrev,
header.GitPushOptions...,
); err != nil {
var customHookErr updateref.CustomHookError
switch {
case errors.As(err, &customHookErr):
detailedErr, err := helper.ErrWithDetails(
helper.ErrPermissionDeniedf("access check: %q", err),
&gitalypb.UserRebaseConfirmableError{
Error: &gitalypb.UserRebaseConfirmableError_AccessCheck{
AccessCheck: &gitalypb.AccessCheckError{
ErrorMessage: customHookErr.Error(),
},
},
},
)
if err != nil {
return helper.ErrInternalf("error details: %w", err)
}
return detailedErr
case errors.Is(err, git2go.ErrInvalidArgument):
return fmt.Errorf("update ref: %w", err)
}
return err
}
return stream.Send(&gitalypb.UserRebaseConfirmableResponse{
UserRebaseConfirmableResponsePayload: &gitalypb.UserRebaseConfirmableResponse_RebaseApplied{
RebaseApplied: true,
},
})
}
// ErrInvalidBranch indicates a branch name is invalid
var ErrInvalidBranch = errors.New("invalid branch name")
func validateUserRebaseConfirmableHeader(header *gitalypb.UserRebaseConfirmableRequest_Header) error {
if header.GetRepository() == nil {
return errors.New("empty Repository")
}
if header.GetUser() == nil {
return errors.New("empty User")
}
if header.GetBranch() == nil {
return errors.New("empty Branch")
}
if header.GetBranchSha() == "" {
return errors.New("empty BranchSha")
}
if header.GetRemoteRepository() == nil {
return errors.New("empty RemoteRepository")
}
if header.GetRemoteBranch() == nil {
return errors.New("empty RemoteBranch")
}
if err := git.ValidateRevision(header.GetRemoteBranch()); err != nil {
return ErrInvalidBranch
}
return nil
}
// rebaseRemoteFetch is an intermediate type that implements the
// `requestFetchingStartRevision` interface. This allows us to use
// `fetchStartRevision` to get the revision to rebase onto.
type rebaseRemoteFetch struct {
header *gitalypb.UserRebaseConfirmableRequest_Header
}
func (r rebaseRemoteFetch) GetRepository() *gitalypb.Repository {
return r.header.GetRepository()
}
func (r rebaseRemoteFetch) GetBranchName() []byte {
return r.header.GetBranch()
}
func (r rebaseRemoteFetch) GetStartRepository() *gitalypb.Repository {
return r.header.GetRemoteRepository()
}
func (r rebaseRemoteFetch) GetStartBranchName() []byte {
return r.header.GetRemoteBranch()
}
|
