diff --git a/internal/app/archied/repository_access.go b/internal/app/archied/repository_access.go index 626947860..079c89569 100644 --- a/internal/app/archied/repository_access.go +++ b/internal/app/archied/repository_access.go @@ -3,6 +3,7 @@ package archied import ( "context" "encoding/json" + "errors" "fmt" "strings" @@ -101,27 +102,34 @@ func (b *boot) openRepositoryConnection(ctx context.Context, principal access.Pr if !strings.Contains(host, "://") { host = "https://" + host } + out.Forge = b.connectionForge(ctx, connection, principal.Org, token) + cfg := b.cfgHolder.Get() username := connection.Account + gitToken := token + var minted forge.GitCredential + if issuer, ok := out.Forge.(forge.GitCredentialIssuer); ok { + minted, err = issuer.GitCredential(ctx, repository.Owner, repository.Name) + switch { + case errors.Is(err, errors.ErrUnsupported): + case err != nil: + b.log.WarnContext(ctx, "git credential unavailable", "connection", connection.ID, "error", err) + return failure("credential_unavailable", fmt.Sprintf("%s could not issue a credential for %s/%s. Check the app is installed on it.", connection.Name, repository.Owner, repository.Name)) + default: + username, gitToken = minted.Username, minted.Token + } + } if username == "" && connection.Type == "gitea" { username, err = connectionAccount(ctx, connection.Type, host, token) if err != nil { return failure("account_unverified", "The forge account could not be verified. Check the credential and its permissions.") } } - cfg := b.cfgHolder.Get() - botUser, botEmail := commitIdentity(cfg, connection, username) - var signer git.Signer - if connection.SigningKey.Key != "" { - key, err := b.secrets.Resolve(connection.SigningKey) - if err != nil || key == "" { - return failure("signing_key_unavailable", fmt.Sprintf("The signing key for %s is unavailable. Check its secret reference.", connection.Name)) - } - if signer, err = worktree.NewSSHSigner([]byte(key)); err != nil { - return failure("signing_key_invalid", fmt.Sprintf("The signing key for %s is not an OpenSSH private key.", connection.Name)) - } + botUser, botEmail := commitIdentity(cfg, connection, minted, username) + signer, code, message := b.connectionSigner(connection) + if code != "" { + return failure(code, message) } - out.Trees = &worktree.Manager{WorkDir: worktree.OrgWorkDir(cfg.WorkDir, string(principal.Org)), Token: token, AuthUser: username, BaseURL: host, BotUser: botUser, BotEmail: botEmail, Signer: signer, Log: b.log} - out.Forge = b.connectionForge(ctx, connection, principal.Org, token) + out.Trees = &worktree.Manager{WorkDir: worktree.OrgWorkDir(cfg.WorkDir, string(principal.Org)), Token: gitToken, AuthUser: username, BaseURL: host, BotUser: botUser, BotEmail: botEmail, Signer: signer, Log: b.log} if operation == config.OperationPR { if _, disabled := out.Forge.(*forge.NoopForge); disabled { return failure("forge_unavailable", "Enable the forge extension for this connection.") @@ -131,11 +139,15 @@ func (b *boot) openRepositoryConnection(ctx context.Context, principal access.Pr } // commitIdentity is the author of commits made through a connection: its -// configured commit identity, else the root bot fields, else its account. -func commitIdentity(cfg config.Config, connection config.ForgeConnection, account string) (string, string) { +// configured commit identity, else the identity the forge minted with the +// credential, else the root bot fields, else its account. +func commitIdentity(cfg config.Config, connection config.ForgeConnection, minted forge.GitCredential, account string) (string, string) { if connection.CommitName != "" { return connection.CommitName, configuration.DefaultBotEmail(connection.Type, connection.CommitName, connection.CommitEmail) } + if minted.CommitName != "" { + return minted.CommitName, minted.CommitEmail + } if cfg.BotUser != "" { return cfg.BotUser, cfg.BotEmail } @@ -145,3 +157,20 @@ func commitIdentity(cfg config.Config, connection config.ForgeConnection, accoun } return user, configuration.DefaultBotEmail(connection.Type, user, connection.CommitEmail) } + +// connectionSigner resolves the connection's SSH signing key. It returns nil +// when none is configured, or a failure code and message. +func (b *boot) connectionSigner(connection config.ForgeConnection) (git.Signer, string, string) { + if connection.SigningKey.Key == "" { + return nil, "", "" + } + key, err := b.secrets.Resolve(connection.SigningKey) + if err != nil || key == "" { + return nil, "signing_key_unavailable", fmt.Sprintf("The signing key for %s is unavailable. Check its secret reference.", connection.Name) + } + signer, err := worktree.NewSSHSigner([]byte(key)) + if err != nil { + return nil, "signing_key_invalid", fmt.Sprintf("The signing key for %s is not an OpenSSH private key.", connection.Name) + } + return signer, "", "" +} diff --git a/internal/contracts/forge/v1/forge.pb.go b/internal/contracts/forge/v1/forge.pb.go index 5bcd67218..8a9d3c224 100644 --- a/internal/contracts/forge/v1/forge.pb.go +++ b/internal/contracts/forge/v1/forge.pb.go @@ -2588,6 +2588,126 @@ func (*VerifyPushResponse) Descriptor() ([]byte, []int) { return file_forge_v1_forge_proto_rawDescGZIP(), []int{48} } +type GitCredentialRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Repo *RepoRef `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GitCredentialRequest) Reset() { + *x = GitCredentialRequest{} + mi := &file_forge_v1_forge_proto_msgTypes[49] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GitCredentialRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GitCredentialRequest) ProtoMessage() {} + +func (x *GitCredentialRequest) ProtoReflect() protoreflect.Message { + mi := &file_forge_v1_forge_proto_msgTypes[49] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GitCredentialRequest.ProtoReflect.Descriptor instead. +func (*GitCredentialRequest) Descriptor() ([]byte, []int) { + return file_forge_v1_forge_proto_rawDescGZIP(), []int{49} +} + +func (x *GitCredentialRequest) GetRepo() *RepoRef { + if x != nil { + return x.Repo + } + return nil +} + +type GitCredentialResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Token string `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"` + ExpiresAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expires_at,json=expiresAt,proto3" json:"expires_at,omitempty"` + CommitName string `protobuf:"bytes,4,opt,name=commit_name,json=commitName,proto3" json:"commit_name,omitempty"` + CommitEmail string `protobuf:"bytes,5,opt,name=commit_email,json=commitEmail,proto3" json:"commit_email,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GitCredentialResponse) Reset() { + *x = GitCredentialResponse{} + mi := &file_forge_v1_forge_proto_msgTypes[50] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GitCredentialResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GitCredentialResponse) ProtoMessage() {} + +func (x *GitCredentialResponse) ProtoReflect() protoreflect.Message { + mi := &file_forge_v1_forge_proto_msgTypes[50] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GitCredentialResponse.ProtoReflect.Descriptor instead. +func (*GitCredentialResponse) Descriptor() ([]byte, []int) { + return file_forge_v1_forge_proto_rawDescGZIP(), []int{50} +} + +func (x *GitCredentialResponse) GetUsername() string { + if x != nil { + return x.Username + } + return "" +} + +func (x *GitCredentialResponse) GetToken() string { + if x != nil { + return x.Token + } + return "" +} + +func (x *GitCredentialResponse) GetExpiresAt() *timestamppb.Timestamp { + if x != nil { + return x.ExpiresAt + } + return nil +} + +func (x *GitCredentialResponse) GetCommitName() string { + if x != nil { + return x.CommitName + } + return "" +} + +func (x *GitCredentialResponse) GetCommitEmail() string { + if x != nil { + return x.CommitEmail + } + return "" +} + type GetRepoArchiveRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Repo *RepoRef `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"` @@ -2598,7 +2718,7 @@ type GetRepoArchiveRequest struct { func (x *GetRepoArchiveRequest) Reset() { *x = GetRepoArchiveRequest{} - mi := &file_forge_v1_forge_proto_msgTypes[49] + mi := &file_forge_v1_forge_proto_msgTypes[51] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2610,7 +2730,7 @@ func (x *GetRepoArchiveRequest) String() string { func (*GetRepoArchiveRequest) ProtoMessage() {} func (x *GetRepoArchiveRequest) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[49] + mi := &file_forge_v1_forge_proto_msgTypes[51] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2623,7 +2743,7 @@ func (x *GetRepoArchiveRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetRepoArchiveRequest.ProtoReflect.Descriptor instead. func (*GetRepoArchiveRequest) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{49} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{51} } func (x *GetRepoArchiveRequest) GetRepo() *RepoRef { @@ -2649,7 +2769,7 @@ type GetRepoArchiveResponse struct { func (x *GetRepoArchiveResponse) Reset() { *x = GetRepoArchiveResponse{} - mi := &file_forge_v1_forge_proto_msgTypes[50] + mi := &file_forge_v1_forge_proto_msgTypes[52] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2661,7 +2781,7 @@ func (x *GetRepoArchiveResponse) String() string { func (*GetRepoArchiveResponse) ProtoMessage() {} func (x *GetRepoArchiveResponse) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[50] + mi := &file_forge_v1_forge_proto_msgTypes[52] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2674,7 +2794,7 @@ func (x *GetRepoArchiveResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetRepoArchiveResponse.ProtoReflect.Descriptor instead. func (*GetRepoArchiveResponse) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{50} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{52} } func (x *GetRepoArchiveResponse) GetData() []byte { @@ -2694,7 +2814,7 @@ type ParseWebhookRequest struct { func (x *ParseWebhookRequest) Reset() { *x = ParseWebhookRequest{} - mi := &file_forge_v1_forge_proto_msgTypes[51] + mi := &file_forge_v1_forge_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2706,7 +2826,7 @@ func (x *ParseWebhookRequest) String() string { func (*ParseWebhookRequest) ProtoMessage() {} func (x *ParseWebhookRequest) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[51] + mi := &file_forge_v1_forge_proto_msgTypes[53] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2719,7 +2839,7 @@ func (x *ParseWebhookRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ParseWebhookRequest.ProtoReflect.Descriptor instead. func (*ParseWebhookRequest) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{51} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{53} } func (x *ParseWebhookRequest) GetHeaders() map[string]string { @@ -2750,7 +2870,7 @@ type ParseWebhookResponse struct { func (x *ParseWebhookResponse) Reset() { *x = ParseWebhookResponse{} - mi := &file_forge_v1_forge_proto_msgTypes[52] + mi := &file_forge_v1_forge_proto_msgTypes[54] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2762,7 +2882,7 @@ func (x *ParseWebhookResponse) String() string { func (*ParseWebhookResponse) ProtoMessage() {} func (x *ParseWebhookResponse) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[52] + mi := &file_forge_v1_forge_proto_msgTypes[54] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2775,7 +2895,7 @@ func (x *ParseWebhookResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ParseWebhookResponse.ProtoReflect.Descriptor instead. func (*ParseWebhookResponse) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{52} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{54} } func (x *ParseWebhookResponse) GetEvent() isParseWebhookResponse_Event { @@ -2851,7 +2971,7 @@ type IssueEvent struct { func (x *IssueEvent) Reset() { *x = IssueEvent{} - mi := &file_forge_v1_forge_proto_msgTypes[53] + mi := &file_forge_v1_forge_proto_msgTypes[55] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2863,7 +2983,7 @@ func (x *IssueEvent) String() string { func (*IssueEvent) ProtoMessage() {} func (x *IssueEvent) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[53] + mi := &file_forge_v1_forge_proto_msgTypes[55] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2876,7 +2996,7 @@ func (x *IssueEvent) ProtoReflect() protoreflect.Message { // Deprecated: Use IssueEvent.ProtoReflect.Descriptor instead. func (*IssueEvent) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{53} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{55} } func (x *IssueEvent) GetAction() string { @@ -2957,7 +3077,7 @@ type ReviewEvent struct { func (x *ReviewEvent) Reset() { *x = ReviewEvent{} - mi := &file_forge_v1_forge_proto_msgTypes[54] + mi := &file_forge_v1_forge_proto_msgTypes[56] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2969,7 +3089,7 @@ func (x *ReviewEvent) String() string { func (*ReviewEvent) ProtoMessage() {} func (x *ReviewEvent) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[54] + mi := &file_forge_v1_forge_proto_msgTypes[56] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2982,7 +3102,7 @@ func (x *ReviewEvent) ProtoReflect() protoreflect.Message { // Deprecated: Use ReviewEvent.ProtoReflect.Descriptor instead. func (*ReviewEvent) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{54} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{56} } func (x *ReviewEvent) GetAction() string { @@ -3051,7 +3171,7 @@ type ReviewCommentEvent struct { func (x *ReviewCommentEvent) Reset() { *x = ReviewCommentEvent{} - mi := &file_forge_v1_forge_proto_msgTypes[55] + mi := &file_forge_v1_forge_proto_msgTypes[57] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3063,7 +3183,7 @@ func (x *ReviewCommentEvent) String() string { func (*ReviewCommentEvent) ProtoMessage() {} func (x *ReviewCommentEvent) ProtoReflect() protoreflect.Message { - mi := &file_forge_v1_forge_proto_msgTypes[55] + mi := &file_forge_v1_forge_proto_msgTypes[57] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3076,7 +3196,7 @@ func (x *ReviewCommentEvent) ProtoReflect() protoreflect.Message { // Deprecated: Use ReviewCommentEvent.ProtoReflect.Descriptor instead. func (*ReviewCommentEvent) Descriptor() ([]byte, []int) { - return file_forge_v1_forge_proto_rawDescGZIP(), []int{55} + return file_forge_v1_forge_proto_rawDescGZIP(), []int{57} } func (x *ReviewCommentEvent) GetAction() string { @@ -3299,7 +3419,17 @@ const file_forge_v1_forge_proto_rawDesc = "" + "\x19AcceptInvitationsResponse\":\n" + "\x11VerifyPushRequest\x12%\n" + "\x04repo\x18\x01 \x01(\v2\x11.forge.v1.RepoRefR\x04repo\"\x14\n" + - "\x12VerifyPushResponse\"P\n" + + "\x12VerifyPushResponse\"=\n" + + "\x14GitCredentialRequest\x12%\n" + + "\x04repo\x18\x01 \x01(\v2\x11.forge.v1.RepoRefR\x04repo\"\xc8\x01\n" + + "\x15GitCredentialResponse\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\x14\n" + + "\x05token\x18\x02 \x01(\tR\x05token\x129\n" + + "\n" + + "expires_at\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\texpiresAt\x12\x1f\n" + + "\vcommit_name\x18\x04 \x01(\tR\n" + + "commitName\x12!\n" + + "\fcommit_email\x18\x05 \x01(\tR\vcommitEmail\"P\n" + "\x15GetRepoArchiveRequest\x12%\n" + "\x04repo\x18\x01 \x01(\v2\x11.forge.v1.RepoRefR\x04repo\x12\x10\n" + "\x03ref\x18\x02 \x01(\tR\x03ref\",\n" + @@ -3345,7 +3475,7 @@ const file_forge_v1_forge_proto_rawDesc = "" + "\x06author\x18\x06 \x01(\tR\x06author\x12\x12\n" + "\x04body\x18\a \x01(\tR\x04body\x12\x12\n" + "\x04path\x18\b \x01(\tR\x04path\x12\x12\n" + - "\x04line\x18\t \x01(\x05R\x04line2\x97\x0e\n" + + "\x04line\x18\t \x01(\x05R\x04line2\xe9\x0e\n" + "\fForgeService\x12D\n" + "\tConfigure\x12\x1a.forge.v1.ConfigureRequest\x1a\x1b.forge.v1.ConfigureResponse\x12S\n" + "\x0eAssignedIssues\x12\x1f.forge.v1.AssignedIssuesRequest\x1a .forge.v1.AssignedIssuesResponse\x12V\n" + @@ -3370,7 +3500,8 @@ const file_forge_v1_forge_proto_rawDesc = "" + "\n" + "VerifyPush\x12\x1b.forge.v1.VerifyPushRequest\x1a\x1c.forge.v1.VerifyPushResponse\x12G\n" + "\n" + - "LinkBranch\x12\x1b.forge.v1.LinkBranchRequest\x1a\x1c.forge.v1.LinkBranchResponse\x12M\n" + + "LinkBranch\x12\x1b.forge.v1.LinkBranchRequest\x1a\x1c.forge.v1.LinkBranchResponse\x12P\n" + + "\rGitCredential\x12\x1e.forge.v1.GitCredentialRequest\x1a\x1f.forge.v1.GitCredentialResponse\x12M\n" + "\fParseWebhook\x12\x1d.forge.v1.ParseWebhookRequest\x1a\x1e.forge.v1.ParseWebhookResponse\x12U\n" + "\x0eGetRepoArchive\x12\x1f.forge.v1.GetRepoArchiveRequest\x1a .forge.v1.GetRepoArchiveResponse0\x01B\xa4\x01\n" + "\fcom.forge.v1B\n" + @@ -3388,7 +3519,7 @@ func file_forge_v1_forge_proto_rawDescGZIP() []byte { return file_forge_v1_forge_proto_rawDescData } -var file_forge_v1_forge_proto_msgTypes = make([]protoimpl.MessageInfo, 58) +var file_forge_v1_forge_proto_msgTypes = make([]protoimpl.MessageInfo, 60) var file_forge_v1_forge_proto_goTypes = []any{ (*ConfigureRequest)(nil), // 0: forge.v1.ConfigureRequest (*ConfigureResponse)(nil), // 1: forge.v1.ConfigureResponse @@ -3439,19 +3570,21 @@ var file_forge_v1_forge_proto_goTypes = []any{ (*AcceptInvitationsResponse)(nil), // 46: forge.v1.AcceptInvitationsResponse (*VerifyPushRequest)(nil), // 47: forge.v1.VerifyPushRequest (*VerifyPushResponse)(nil), // 48: forge.v1.VerifyPushResponse - (*GetRepoArchiveRequest)(nil), // 49: forge.v1.GetRepoArchiveRequest - (*GetRepoArchiveResponse)(nil), // 50: forge.v1.GetRepoArchiveResponse - (*ParseWebhookRequest)(nil), // 51: forge.v1.ParseWebhookRequest - (*ParseWebhookResponse)(nil), // 52: forge.v1.ParseWebhookResponse - (*IssueEvent)(nil), // 53: forge.v1.IssueEvent - (*ReviewEvent)(nil), // 54: forge.v1.ReviewEvent - (*ReviewCommentEvent)(nil), // 55: forge.v1.ReviewCommentEvent - nil, // 56: forge.v1.ConfigureRequest.SettingsEntry - nil, // 57: forge.v1.ParseWebhookRequest.HeadersEntry - (*timestamppb.Timestamp)(nil), // 58: google.protobuf.Timestamp + (*GitCredentialRequest)(nil), // 49: forge.v1.GitCredentialRequest + (*GitCredentialResponse)(nil), // 50: forge.v1.GitCredentialResponse + (*GetRepoArchiveRequest)(nil), // 51: forge.v1.GetRepoArchiveRequest + (*GetRepoArchiveResponse)(nil), // 52: forge.v1.GetRepoArchiveResponse + (*ParseWebhookRequest)(nil), // 53: forge.v1.ParseWebhookRequest + (*ParseWebhookResponse)(nil), // 54: forge.v1.ParseWebhookResponse + (*IssueEvent)(nil), // 55: forge.v1.IssueEvent + (*ReviewEvent)(nil), // 56: forge.v1.ReviewEvent + (*ReviewCommentEvent)(nil), // 57: forge.v1.ReviewCommentEvent + nil, // 58: forge.v1.ConfigureRequest.SettingsEntry + nil, // 59: forge.v1.ParseWebhookRequest.HeadersEntry + (*timestamppb.Timestamp)(nil), // 60: google.protobuf.Timestamp } var file_forge_v1_forge_proto_depIdxs = []int32{ - 56, // 0: forge.v1.ConfigureRequest.settings:type_name -> forge.v1.ConfigureRequest.SettingsEntry + 58, // 0: forge.v1.ConfigureRequest.settings:type_name -> forge.v1.ConfigureRequest.SettingsEntry 2, // 1: forge.v1.PullRequestRef.repo:type_name -> forge.v1.RepoRef 4, // 2: forge.v1.AssignedIssuesResponse.issues:type_name -> forge.v1.Issue 4, // 3: forge.v1.IssuesWithLabelResponse.issues:type_name -> forge.v1.Issue @@ -3470,9 +3603,9 @@ var file_forge_v1_forge_proto_depIdxs = []int32{ 27, // 16: forge.v1.GetPullRequestResponse.pull_request:type_name -> forge.v1.PullRequest 2, // 17: forge.v1.GetPullRequestDiffRequest.repo:type_name -> forge.v1.RepoRef 3, // 18: forge.v1.ListReviewsRequest.pull_request:type_name -> forge.v1.PullRequestRef - 58, // 19: forge.v1.Review.submitted_at:type_name -> google.protobuf.Timestamp + 60, // 19: forge.v1.Review.submitted_at:type_name -> google.protobuf.Timestamp 33, // 20: forge.v1.ListReviewsResponse.reviews:type_name -> forge.v1.Review - 58, // 21: forge.v1.ReviewComment.created_at:type_name -> google.protobuf.Timestamp + 60, // 21: forge.v1.ReviewComment.created_at:type_name -> google.protobuf.Timestamp 3, // 22: forge.v1.ListReviewCommentsRequest.pull_request:type_name -> forge.v1.PullRequestRef 35, // 23: forge.v1.ListReviewCommentsResponse.comments:type_name -> forge.v1.ReviewComment 3, // 24: forge.v1.ReplyToReviewRequest.pull_request:type_name -> forge.v1.PullRequestRef @@ -3481,65 +3614,69 @@ var file_forge_v1_forge_proto_depIdxs = []int32{ 2, // 27: forge.v1.LinkBranchRequest.repo:type_name -> forge.v1.RepoRef 2, // 28: forge.v1.AcceptInvitationsRequest.repositories:type_name -> forge.v1.RepoRef 2, // 29: forge.v1.VerifyPushRequest.repo:type_name -> forge.v1.RepoRef - 2, // 30: forge.v1.GetRepoArchiveRequest.repo:type_name -> forge.v1.RepoRef - 57, // 31: forge.v1.ParseWebhookRequest.headers:type_name -> forge.v1.ParseWebhookRequest.HeadersEntry - 53, // 32: forge.v1.ParseWebhookResponse.issue:type_name -> forge.v1.IssueEvent - 54, // 33: forge.v1.ParseWebhookResponse.review:type_name -> forge.v1.ReviewEvent - 55, // 34: forge.v1.ParseWebhookResponse.review_comment:type_name -> forge.v1.ReviewCommentEvent - 2, // 35: forge.v1.IssueEvent.repo:type_name -> forge.v1.RepoRef - 2, // 36: forge.v1.ReviewEvent.repo:type_name -> forge.v1.RepoRef - 2, // 37: forge.v1.ReviewCommentEvent.repo:type_name -> forge.v1.RepoRef - 0, // 38: forge.v1.ForgeService.Configure:input_type -> forge.v1.ConfigureRequest - 7, // 39: forge.v1.ForgeService.AssignedIssues:input_type -> forge.v1.AssignedIssuesRequest - 8, // 40: forge.v1.ForgeService.IssuesWithLabel:input_type -> forge.v1.IssuesWithLabelRequest - 9, // 41: forge.v1.ForgeService.Comment:input_type -> forge.v1.CommentRequest - 11, // 42: forge.v1.ForgeService.CreateIssue:input_type -> forge.v1.CreateIssueRequest - 13, // 43: forge.v1.ForgeService.CloseIssue:input_type -> forge.v1.CloseIssueRequest - 19, // 44: forge.v1.ForgeService.React:input_type -> forge.v1.ReactRequest - 21, // 45: forge.v1.ForgeService.SetStateLabel:input_type -> forge.v1.SetStateLabelRequest - 23, // 46: forge.v1.ForgeService.CreatePR:input_type -> forge.v1.CreatePRRequest - 25, // 47: forge.v1.ForgeService.PRState:input_type -> forge.v1.PRStateRequest - 15, // 48: forge.v1.ForgeService.ClosePR:input_type -> forge.v1.ClosePRRequest - 17, // 49: forge.v1.ForgeService.MergePR:input_type -> forge.v1.MergePRRequest - 28, // 50: forge.v1.ForgeService.GetPullRequest:input_type -> forge.v1.GetPullRequestRequest - 30, // 51: forge.v1.ForgeService.GetPullRequestDiff:input_type -> forge.v1.GetPullRequestDiffRequest - 32, // 52: forge.v1.ForgeService.ListReviews:input_type -> forge.v1.ListReviewsRequest - 36, // 53: forge.v1.ForgeService.ListReviewComments:input_type -> forge.v1.ListReviewCommentsRequest - 38, // 54: forge.v1.ForgeService.ReplyToReview:input_type -> forge.v1.ReplyToReviewRequest - 41, // 55: forge.v1.ForgeService.CreateReviewComments:input_type -> forge.v1.CreateReviewCommentsRequest - 45, // 56: forge.v1.ForgeService.AcceptInvitations:input_type -> forge.v1.AcceptInvitationsRequest - 47, // 57: forge.v1.ForgeService.VerifyPush:input_type -> forge.v1.VerifyPushRequest - 43, // 58: forge.v1.ForgeService.LinkBranch:input_type -> forge.v1.LinkBranchRequest - 51, // 59: forge.v1.ForgeService.ParseWebhook:input_type -> forge.v1.ParseWebhookRequest - 49, // 60: forge.v1.ForgeService.GetRepoArchive:input_type -> forge.v1.GetRepoArchiveRequest - 1, // 61: forge.v1.ForgeService.Configure:output_type -> forge.v1.ConfigureResponse - 5, // 62: forge.v1.ForgeService.AssignedIssues:output_type -> forge.v1.AssignedIssuesResponse - 6, // 63: forge.v1.ForgeService.IssuesWithLabel:output_type -> forge.v1.IssuesWithLabelResponse - 10, // 64: forge.v1.ForgeService.Comment:output_type -> forge.v1.CommentResponse - 12, // 65: forge.v1.ForgeService.CreateIssue:output_type -> forge.v1.CreateIssueResponse - 14, // 66: forge.v1.ForgeService.CloseIssue:output_type -> forge.v1.CloseIssueResponse - 20, // 67: forge.v1.ForgeService.React:output_type -> forge.v1.ReactResponse - 22, // 68: forge.v1.ForgeService.SetStateLabel:output_type -> forge.v1.SetStateLabelResponse - 24, // 69: forge.v1.ForgeService.CreatePR:output_type -> forge.v1.CreatePRResponse - 26, // 70: forge.v1.ForgeService.PRState:output_type -> forge.v1.PRStateResponse - 16, // 71: forge.v1.ForgeService.ClosePR:output_type -> forge.v1.ClosePRResponse - 18, // 72: forge.v1.ForgeService.MergePR:output_type -> forge.v1.MergePRResponse - 29, // 73: forge.v1.ForgeService.GetPullRequest:output_type -> forge.v1.GetPullRequestResponse - 31, // 74: forge.v1.ForgeService.GetPullRequestDiff:output_type -> forge.v1.GetPullRequestDiffResponse - 34, // 75: forge.v1.ForgeService.ListReviews:output_type -> forge.v1.ListReviewsResponse - 37, // 76: forge.v1.ForgeService.ListReviewComments:output_type -> forge.v1.ListReviewCommentsResponse - 39, // 77: forge.v1.ForgeService.ReplyToReview:output_type -> forge.v1.ReplyToReviewResponse - 42, // 78: forge.v1.ForgeService.CreateReviewComments:output_type -> forge.v1.CreateReviewCommentsResponse - 46, // 79: forge.v1.ForgeService.AcceptInvitations:output_type -> forge.v1.AcceptInvitationsResponse - 48, // 80: forge.v1.ForgeService.VerifyPush:output_type -> forge.v1.VerifyPushResponse - 44, // 81: forge.v1.ForgeService.LinkBranch:output_type -> forge.v1.LinkBranchResponse - 52, // 82: forge.v1.ForgeService.ParseWebhook:output_type -> forge.v1.ParseWebhookResponse - 50, // 83: forge.v1.ForgeService.GetRepoArchive:output_type -> forge.v1.GetRepoArchiveResponse - 61, // [61:84] is the sub-list for method output_type - 38, // [38:61] is the sub-list for method input_type - 38, // [38:38] is the sub-list for extension type_name - 38, // [38:38] is the sub-list for extension extendee - 0, // [0:38] is the sub-list for field type_name + 2, // 30: forge.v1.GitCredentialRequest.repo:type_name -> forge.v1.RepoRef + 60, // 31: forge.v1.GitCredentialResponse.expires_at:type_name -> google.protobuf.Timestamp + 2, // 32: forge.v1.GetRepoArchiveRequest.repo:type_name -> forge.v1.RepoRef + 59, // 33: forge.v1.ParseWebhookRequest.headers:type_name -> forge.v1.ParseWebhookRequest.HeadersEntry + 55, // 34: forge.v1.ParseWebhookResponse.issue:type_name -> forge.v1.IssueEvent + 56, // 35: forge.v1.ParseWebhookResponse.review:type_name -> forge.v1.ReviewEvent + 57, // 36: forge.v1.ParseWebhookResponse.review_comment:type_name -> forge.v1.ReviewCommentEvent + 2, // 37: forge.v1.IssueEvent.repo:type_name -> forge.v1.RepoRef + 2, // 38: forge.v1.ReviewEvent.repo:type_name -> forge.v1.RepoRef + 2, // 39: forge.v1.ReviewCommentEvent.repo:type_name -> forge.v1.RepoRef + 0, // 40: forge.v1.ForgeService.Configure:input_type -> forge.v1.ConfigureRequest + 7, // 41: forge.v1.ForgeService.AssignedIssues:input_type -> forge.v1.AssignedIssuesRequest + 8, // 42: forge.v1.ForgeService.IssuesWithLabel:input_type -> forge.v1.IssuesWithLabelRequest + 9, // 43: forge.v1.ForgeService.Comment:input_type -> forge.v1.CommentRequest + 11, // 44: forge.v1.ForgeService.CreateIssue:input_type -> forge.v1.CreateIssueRequest + 13, // 45: forge.v1.ForgeService.CloseIssue:input_type -> forge.v1.CloseIssueRequest + 19, // 46: forge.v1.ForgeService.React:input_type -> forge.v1.ReactRequest + 21, // 47: forge.v1.ForgeService.SetStateLabel:input_type -> forge.v1.SetStateLabelRequest + 23, // 48: forge.v1.ForgeService.CreatePR:input_type -> forge.v1.CreatePRRequest + 25, // 49: forge.v1.ForgeService.PRState:input_type -> forge.v1.PRStateRequest + 15, // 50: forge.v1.ForgeService.ClosePR:input_type -> forge.v1.ClosePRRequest + 17, // 51: forge.v1.ForgeService.MergePR:input_type -> forge.v1.MergePRRequest + 28, // 52: forge.v1.ForgeService.GetPullRequest:input_type -> forge.v1.GetPullRequestRequest + 30, // 53: forge.v1.ForgeService.GetPullRequestDiff:input_type -> forge.v1.GetPullRequestDiffRequest + 32, // 54: forge.v1.ForgeService.ListReviews:input_type -> forge.v1.ListReviewsRequest + 36, // 55: forge.v1.ForgeService.ListReviewComments:input_type -> forge.v1.ListReviewCommentsRequest + 38, // 56: forge.v1.ForgeService.ReplyToReview:input_type -> forge.v1.ReplyToReviewRequest + 41, // 57: forge.v1.ForgeService.CreateReviewComments:input_type -> forge.v1.CreateReviewCommentsRequest + 45, // 58: forge.v1.ForgeService.AcceptInvitations:input_type -> forge.v1.AcceptInvitationsRequest + 47, // 59: forge.v1.ForgeService.VerifyPush:input_type -> forge.v1.VerifyPushRequest + 43, // 60: forge.v1.ForgeService.LinkBranch:input_type -> forge.v1.LinkBranchRequest + 49, // 61: forge.v1.ForgeService.GitCredential:input_type -> forge.v1.GitCredentialRequest + 53, // 62: forge.v1.ForgeService.ParseWebhook:input_type -> forge.v1.ParseWebhookRequest + 51, // 63: forge.v1.ForgeService.GetRepoArchive:input_type -> forge.v1.GetRepoArchiveRequest + 1, // 64: forge.v1.ForgeService.Configure:output_type -> forge.v1.ConfigureResponse + 5, // 65: forge.v1.ForgeService.AssignedIssues:output_type -> forge.v1.AssignedIssuesResponse + 6, // 66: forge.v1.ForgeService.IssuesWithLabel:output_type -> forge.v1.IssuesWithLabelResponse + 10, // 67: forge.v1.ForgeService.Comment:output_type -> forge.v1.CommentResponse + 12, // 68: forge.v1.ForgeService.CreateIssue:output_type -> forge.v1.CreateIssueResponse + 14, // 69: forge.v1.ForgeService.CloseIssue:output_type -> forge.v1.CloseIssueResponse + 20, // 70: forge.v1.ForgeService.React:output_type -> forge.v1.ReactResponse + 22, // 71: forge.v1.ForgeService.SetStateLabel:output_type -> forge.v1.SetStateLabelResponse + 24, // 72: forge.v1.ForgeService.CreatePR:output_type -> forge.v1.CreatePRResponse + 26, // 73: forge.v1.ForgeService.PRState:output_type -> forge.v1.PRStateResponse + 16, // 74: forge.v1.ForgeService.ClosePR:output_type -> forge.v1.ClosePRResponse + 18, // 75: forge.v1.ForgeService.MergePR:output_type -> forge.v1.MergePRResponse + 29, // 76: forge.v1.ForgeService.GetPullRequest:output_type -> forge.v1.GetPullRequestResponse + 31, // 77: forge.v1.ForgeService.GetPullRequestDiff:output_type -> forge.v1.GetPullRequestDiffResponse + 34, // 78: forge.v1.ForgeService.ListReviews:output_type -> forge.v1.ListReviewsResponse + 37, // 79: forge.v1.ForgeService.ListReviewComments:output_type -> forge.v1.ListReviewCommentsResponse + 39, // 80: forge.v1.ForgeService.ReplyToReview:output_type -> forge.v1.ReplyToReviewResponse + 42, // 81: forge.v1.ForgeService.CreateReviewComments:output_type -> forge.v1.CreateReviewCommentsResponse + 46, // 82: forge.v1.ForgeService.AcceptInvitations:output_type -> forge.v1.AcceptInvitationsResponse + 48, // 83: forge.v1.ForgeService.VerifyPush:output_type -> forge.v1.VerifyPushResponse + 44, // 84: forge.v1.ForgeService.LinkBranch:output_type -> forge.v1.LinkBranchResponse + 50, // 85: forge.v1.ForgeService.GitCredential:output_type -> forge.v1.GitCredentialResponse + 54, // 86: forge.v1.ForgeService.ParseWebhook:output_type -> forge.v1.ParseWebhookResponse + 52, // 87: forge.v1.ForgeService.GetRepoArchive:output_type -> forge.v1.GetRepoArchiveResponse + 64, // [64:88] is the sub-list for method output_type + 40, // [40:64] is the sub-list for method input_type + 40, // [40:40] is the sub-list for extension type_name + 40, // [40:40] is the sub-list for extension extendee + 0, // [0:40] is the sub-list for field type_name } func init() { file_forge_v1_forge_proto_init() } @@ -3547,7 +3684,7 @@ func file_forge_v1_forge_proto_init() { if File_forge_v1_forge_proto != nil { return } - file_forge_v1_forge_proto_msgTypes[52].OneofWrappers = []any{ + file_forge_v1_forge_proto_msgTypes[54].OneofWrappers = []any{ (*ParseWebhookResponse_Issue)(nil), (*ParseWebhookResponse_Review)(nil), (*ParseWebhookResponse_ReviewComment)(nil), @@ -3558,7 +3695,7 @@ func file_forge_v1_forge_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_forge_v1_forge_proto_rawDesc), len(file_forge_v1_forge_proto_rawDesc)), NumEnums: 0, - NumMessages: 58, + NumMessages: 60, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/contracts/forge/v1/forge_grpc.pb.go b/internal/contracts/forge/v1/forge_grpc.pb.go index 5f1937720..3530e1f67 100644 --- a/internal/contracts/forge/v1/forge_grpc.pb.go +++ b/internal/contracts/forge/v1/forge_grpc.pb.go @@ -40,6 +40,7 @@ const ( ForgeService_AcceptInvitations_FullMethodName = "/forge.v1.ForgeService/AcceptInvitations" ForgeService_VerifyPush_FullMethodName = "/forge.v1.ForgeService/VerifyPush" ForgeService_LinkBranch_FullMethodName = "/forge.v1.ForgeService/LinkBranch" + ForgeService_GitCredential_FullMethodName = "/forge.v1.ForgeService/GitCredential" ForgeService_ParseWebhook_FullMethodName = "/forge.v1.ForgeService/ParseWebhook" ForgeService_GetRepoArchive_FullMethodName = "/forge.v1.ForgeService/GetRepoArchive" ) @@ -78,6 +79,10 @@ type ForgeServiceClient interface { AcceptInvitations(ctx context.Context, in *AcceptInvitationsRequest, opts ...grpc.CallOption) (*AcceptInvitationsResponse, error) VerifyPush(ctx context.Context, in *VerifyPushRequest, opts ...grpc.CallOption) (*VerifyPushResponse, error) LinkBranch(ctx context.Context, in *LinkBranchRequest, opts ...grpc.CallOption) (*LinkBranchResponse, error) + // GitCredential returns a short-lived credential for cloning and pushing one + // repository, and the identity commits through it should carry. A forge that + // authenticates git with its configured token answers UNIMPLEMENTED. + GitCredential(ctx context.Context, in *GitCredentialRequest, opts ...grpc.CallOption) (*GitCredentialResponse, error) // ParseWebhook decodes one webhook delivery the host has already // authenticated. A delivery that is not an event the host acts on returns no // event; an undecodable body is INVALID_ARGUMENT. @@ -304,6 +309,16 @@ func (c *forgeServiceClient) LinkBranch(ctx context.Context, in *LinkBranchReque return out, nil } +func (c *forgeServiceClient) GitCredential(ctx context.Context, in *GitCredentialRequest, opts ...grpc.CallOption) (*GitCredentialResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(GitCredentialResponse) + err := c.cc.Invoke(ctx, ForgeService_GitCredential_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *forgeServiceClient) ParseWebhook(ctx context.Context, in *ParseWebhookRequest, opts ...grpc.CallOption) (*ParseWebhookResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ParseWebhookResponse) @@ -367,6 +382,10 @@ type ForgeServiceServer interface { AcceptInvitations(context.Context, *AcceptInvitationsRequest) (*AcceptInvitationsResponse, error) VerifyPush(context.Context, *VerifyPushRequest) (*VerifyPushResponse, error) LinkBranch(context.Context, *LinkBranchRequest) (*LinkBranchResponse, error) + // GitCredential returns a short-lived credential for cloning and pushing one + // repository, and the identity commits through it should carry. A forge that + // authenticates git with its configured token answers UNIMPLEMENTED. + GitCredential(context.Context, *GitCredentialRequest) (*GitCredentialResponse, error) // ParseWebhook decodes one webhook delivery the host has already // authenticated. A delivery that is not an event the host acts on returns no // event; an undecodable body is INVALID_ARGUMENT. @@ -446,6 +465,9 @@ func (UnimplementedForgeServiceServer) VerifyPush(context.Context, *VerifyPushRe func (UnimplementedForgeServiceServer) LinkBranch(context.Context, *LinkBranchRequest) (*LinkBranchResponse, error) { return nil, status.Error(codes.Unimplemented, "method LinkBranch not implemented") } +func (UnimplementedForgeServiceServer) GitCredential(context.Context, *GitCredentialRequest) (*GitCredentialResponse, error) { + return nil, status.Error(codes.Unimplemented, "method GitCredential not implemented") +} func (UnimplementedForgeServiceServer) ParseWebhook(context.Context, *ParseWebhookRequest) (*ParseWebhookResponse, error) { return nil, status.Error(codes.Unimplemented, "method ParseWebhook not implemented") } @@ -851,6 +873,24 @@ func _ForgeService_LinkBranch_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _ForgeService_GitCredential_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GitCredentialRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ForgeServiceServer).GitCredential(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ForgeService_GitCredential_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ForgeServiceServer).GitCredential(ctx, req.(*GitCredentialRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _ForgeService_ParseWebhook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ParseWebhookRequest) if err := dec(in); err != nil { @@ -971,6 +1011,10 @@ var ForgeService_ServiceDesc = grpc.ServiceDesc{ MethodName: "LinkBranch", Handler: _ForgeService_LinkBranch_Handler, }, + { + MethodName: "GitCredential", + Handler: _ForgeService_GitCredential_Handler, + }, { MethodName: "ParseWebhook", Handler: _ForgeService_ParseWebhook_Handler, diff --git a/internal/forge/forge.go b/internal/forge/forge.go index ada25e1c4..30511e3d1 100644 --- a/internal/forge/forge.go +++ b/internal/forge/forge.go @@ -250,3 +250,20 @@ var ErrBadWebhook = errors.New("undecodable webhook payload") type WebhookParser interface { ParseWebhook(ctx context.Context, headers map[string]string, body []byte) (WebhookEvent, error) } + +// GitCredential is a short-lived git credential for one repository and the +// identity commits through it carry. +type GitCredential struct { + Username string + Token string + ExpiresAt time.Time + CommitName string + CommitEmail string +} + +// GitCredentialIssuer is a forge that mints per-repository git credentials, +// such as an app installation token. It returns errors.ErrUnsupported when +// git should use the connection's stored token. +type GitCredentialIssuer interface { + GitCredential(ctx context.Context, owner, repo string) (GitCredential, error) +} diff --git a/internal/infrastructure/forgeext/forgeext.go b/internal/infrastructure/forgeext/forgeext.go index 540b49e75..8a060a29c 100644 --- a/internal/infrastructure/forgeext/forgeext.go +++ b/internal/infrastructure/forgeext/forgeext.go @@ -430,3 +430,25 @@ func (f *Forge) GetRepoArchive(ctx context.Context, owner, repo, ref string) (io }() return pr, nil } + +// GitCredential asks the extension for a per-repository git credential. An +// extension without one answers errors.ErrUnsupported. +func (f *Forge) GitCredential(ctx context.Context, owner, repo string) (forge.GitCredential, error) { + resp, err := call(ctx, f, "git credential", func(c forgev1.ForgeServiceClient) (*forgev1.GitCredentialResponse, error) { + resp, err := c.GitCredential(ctx, &forgev1.GitCredentialRequest{Repo: ref(owner, repo)}) + if status.Code(err) == codes.Unimplemented { + return nil, nil + } + return resp, err + }) + if err != nil { + return forge.GitCredential{}, err + } + if resp == nil { + return forge.GitCredential{}, errors.ErrUnsupported + } + return forge.GitCredential{ + Username: resp.GetUsername(), Token: resp.GetToken(), ExpiresAt: resp.GetExpiresAt().AsTime(), + CommitName: resp.GetCommitName(), CommitEmail: resp.GetCommitEmail(), + }, nil +} diff --git a/internal/worktree/attest.go b/internal/worktree/attest.go new file mode 100644 index 000000000..cb30857b0 --- /dev/null +++ b/internal/worktree/attest.go @@ -0,0 +1,149 @@ +package worktree + +import ( + "context" + "errors" + "fmt" + "io" + "slices" + "time" + + "github.com/go-git/go-git/v6" + "github.com/go-git/go-git/v6/plumbing" + "github.com/go-git/go-git/v6/plumbing/object" + "github.com/go-git/go-git/v6/plumbing/storer" +) + +// attest re-authors and signs the branch's unpublished commits as the bot +// before a push. Commits are made inside the task container, which holds +// neither the connection's identity nor its signing key, so the daemon applies +// both here. Only the first-parent chain back to the nearest published commit +// is rewritten; trees, messages and author times are kept. +func (m *Manager) attest(ctx context.Context, r *git.Repository, ref plumbing.ReferenceName) error { + tip, err := r.Reference(ref, true) + if err != nil { + return fmt.Errorf("read %s: %w", ref, err) + } + head, err := r.CommitObject(tip.Hash()) + if err != nil { + return fmt.Errorf("read %s: %w", ref, err) + } + published, err := publishedBoundary(r, head) + if err != nil || len(published) == 0 { + return err + } + var chain []*object.Commit + for c := head; !published[c.Hash]; { + chain = append(chain, c) + if c.NumParents() == 0 { + return nil + } + if c, err = c.Parent(0); err != nil { + return fmt.Errorf("walk %s: %w", ref, err) + } + } + if len(chain) == 0 || !m.needsAttest(chain) { + return nil + } + var rewritten plumbing.Hash + for _, c := range slices.Backward(chain) { + if err := ctx.Err(); err != nil { + return err + } + + parents := append([]plumbing.Hash(nil), c.ParentHashes...) + if !rewritten.IsZero() { + parents[0] = rewritten + } + if rewritten, err = m.recommit(ctx, r, c, parents); err != nil { + return err + } + } + if err := r.Storer.SetReference(plumbing.NewHashReference(ref, rewritten)); err != nil { + return fmt.Errorf("update %s: %w", ref, err) + } + return nil +} + +// needsAttest reports whether any commit lacks the bot identity or, with a +// signer configured, a signature. +func (m *Manager) needsAttest(chain []*object.Commit) bool { + for _, c := range chain { + if c.Author.Name != m.BotUser || c.Author.Email != m.BotEmail || c.Committer.Name != m.BotUser || c.Committer.Email != m.BotEmail { + return true + } + if m.Signer != nil && c.Signature == "" { + return true + } + } + return false +} + +func (m *Manager) recommit(ctx context.Context, r *git.Repository, c *object.Commit, parents []plumbing.Hash) (plumbing.Hash, error) { + next := &object.Commit{ + Author: object.Signature{Name: m.BotUser, Email: m.BotEmail, When: c.Author.When}, + Committer: object.Signature{Name: m.BotUser, Email: m.BotEmail, When: time.Now()}, + Message: c.Message, + TreeHash: c.TreeHash, + ParentHashes: parents, + Encoding: c.Encoding, + } + if m.Signer != nil { + unsigned := &plumbing.MemoryObject{} + if err := next.EncodeWithoutSignature(unsigned); err != nil { + return plumbing.ZeroHash, fmt.Errorf("encode commit: %w", err) + } + body, err := unsigned.Reader() + if err != nil { + return plumbing.ZeroHash, fmt.Errorf("encode commit: %w", err) + } + sig, err := m.Signer.Sign(ctx, body) + if err != nil { + return plumbing.ZeroHash, fmt.Errorf("sign commit: %w", err) + } + next.Signature = string(sig) + } + obj := r.Storer.NewEncodedObject() + if err := next.Encode(obj); err != nil { + return plumbing.ZeroHash, fmt.Errorf("encode commit: %w", err) + } + h, err := r.Storer.SetEncodedObject(obj) + if err != nil { + return plumbing.ZeroHash, fmt.Errorf("store commit: %w", err) + } + return h, nil +} + +// publishedBoundary is the set of commits where head meets any remote-tracking +// ref: everything at or behind them is already on the forge. +func publishedBoundary(r *git.Repository, head *object.Commit) (map[plumbing.Hash]bool, error) { + refs, err := r.References() + if err != nil { + return nil, fmt.Errorf("list refs: %w", err) + } + out := map[plumbing.Hash]bool{} + err = refs.ForEach(func(ref *plumbing.Reference) error { + if !ref.Name().IsRemote() || ref.Type() != plumbing.HashReference { + return nil + } + remote, err := r.CommitObject(ref.Hash()) + if errors.Is(err, plumbing.ErrObjectNotFound) { + return nil + } + if err != nil { + return err + } + bases, err := head.MergeBase(remote) + if err != nil { + return err + } + for _, b := range bases { + out[b.Hash] = true + } + return nil + }) + if err != nil && !errors.Is(err, storer.ErrStop) && !errors.Is(err, io.EOF) { + return nil, fmt.Errorf("find published commits: %w", err) + } + return out, nil +} diff --git a/internal/worktree/attest_test.go b/internal/worktree/attest_test.go new file mode 100644 index 000000000..93a756403 --- /dev/null +++ b/internal/worktree/attest_test.go @@ -0,0 +1,97 @@ +package worktree + +import ( + "context" + "crypto/ed25519" + "crypto/rand" + "encoding/pem" + "testing" + "time" + + "github.com/go-git/go-billy/v6/memfs" + "github.com/go-git/go-git/v6" + "github.com/go-git/go-git/v6/plumbing" + "github.com/go-git/go-git/v6/plumbing/object" + "github.com/go-git/go-git/v6/storage/memory" + "github.com/hiddeco/sshsig" + "golang.org/x/crypto/ssh" +) + +// Commits made in the task container carry no identity and no signature; the +// push must publish them as the connection's bot, signed, without touching +// what is already on the forge. +func TestAttestSignsOnlyUnpublishedCommits(t *testing.T) { + _, priv, err := ed25519.GenerateKey(rand.Reader) + if err != nil { + t.Fatal(err) + } + block, err := ssh.MarshalPrivateKey(priv, "") + if err != nil { + t.Fatal(err) + } + signer, err := NewSSHSigner(pem.EncodeToMemory(block)) + if err != nil { + t.Fatal(err) + } + pub, err := ssh.NewPublicKey(priv.Public()) + if err != nil { + t.Fatal(err) + } + + r, err := git.Init(memory.NewStorage(), git.WithWorkTree(memfs.New())) + if err != nil { + t.Fatal(err) + } + wt, _ := r.Worktree() + commit := func(name string) plumbing.Hash { + f, _ := wt.Filesystem().Create(name) + _, _ = f.Write([]byte(name)) + _ = f.Close() + _, _ = wt.Add(name) + // The explicit signer stands in for whatever the machine's git config asks for. + h, err := wt.Commit(name, &git.CommitOptions{Author: &object.Signature{Name: "someone", Email: "x@y", When: time.Now()}, Signer: signer}) + if err != nil { + t.Fatal(err) + } + return h + } + base := commit("base") + if err := r.Storer.SetReference(plumbing.NewHashReference(plumbing.NewRemoteReferenceName("origin", "main"), base)); err != nil { + t.Fatal(err) + } + commit("one") + commit("two") + head, _ := r.Head() + ref := head.Name() + + m := &Manager{BotUser: "archie", BotEmail: "archie@example.com", Signer: signer} + for range 2 { // a second attest must change nothing + if err := m.attest(context.Background(), r, ref); err != nil { + t.Fatal(err) + } + } + + tip, _ := r.Reference(ref, true) + c, _ := r.CommitObject(tip.Hash()) + for _, want := range []string{"two", "one"} { + if c.Message != want || c.Author.Name != "archie" || c.Committer.Email != "archie@example.com" { + t.Fatalf("commit %q: author %q committer %q", c.Message, c.Author.Name, c.Committer.Email) + } + unsigned := &plumbing.MemoryObject{} + _ = c.EncodeWithoutSignature(unsigned) + body, _ := unsigned.Reader() + sig, err := sshsig.Unarmor([]byte(c.Signature)) + if err != nil { + t.Fatalf("commit %q signature: %v", want, err) + } + if err := sshsig.Verify(body, sig, pub, sshsig.HashSHA512, "git"); err != nil { + t.Fatalf("commit %q does not verify: %v", want, err) + } + if c, err = c.Parent(0); err != nil { + t.Fatal(err) + } + } + if c.Hash != base || c.Author.Name != "someone" { + t.Fatalf("published commit was rewritten: %s by %s", c.Hash, c.Author.Name) + } +} diff --git a/internal/worktree/worktree.go b/internal/worktree/worktree.go index 3d064b99a..618042f15 100644 --- a/internal/worktree/worktree.go +++ b/internal/worktree/worktree.go @@ -656,6 +656,9 @@ func (m *Manager) push(ctx context.Context, dir, branch, remoteURL string) error "check the repository connection's credential", branch) } ref := plumbing.NewBranchReferenceName(branch) + if err := m.attest(ctx, r, ref); err != nil { + return fmt.Errorf("attest %s: %w", branch, err) + } spec := gitconfig.RefSpec(fmt.Sprintf("%s:%s", ref, ref)) if err := r.PushContext(ctx, &git.PushOptions{ RemoteName: git.DefaultRemoteName, @@ -665,6 +668,14 @@ func (m *Manager) push(ctx context.Context, dir, branch, remoteURL string) error }); err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) { return fmt.Errorf("push %s: %w", branch, err) } + // The tracking ref marks what is published, so the next attest leaves + // these commits alone. + if pushed, err := r.Reference(ref, true); err == nil { + tracking := plumbing.NewRemoteReferenceName(git.DefaultRemoteName, branch) + if err := r.Storer.SetReference(plumbing.NewHashReference(tracking, pushed.Hash())); err != nil { + m.logger().WarnContext(ctx, "record pushed branch", "branch", branch, "err", err) + } + } // Record the upstream so the branch tracks origin, matching what // `git push -u` left behind previously. A post-publication metadata // failure must not cause push to report an error. diff --git a/proto/forge/v1/forge.proto b/proto/forge/v1/forge.proto index bbc9bbbc3..72be697a9 100644 --- a/proto/forge/v1/forge.proto +++ b/proto/forge/v1/forge.proto @@ -37,6 +37,10 @@ service ForgeService { rpc AcceptInvitations(AcceptInvitationsRequest) returns (AcceptInvitationsResponse); rpc VerifyPush(VerifyPushRequest) returns (VerifyPushResponse); rpc LinkBranch(LinkBranchRequest) returns (LinkBranchResponse); + // GitCredential returns a short-lived credential for cloning and pushing one + // repository, and the identity commits through it should carry. A forge that + // authenticates git with its configured token answers UNIMPLEMENTED. + rpc GitCredential(GitCredentialRequest) returns (GitCredentialResponse); // ParseWebhook decodes one webhook delivery the host has already // authenticated. A delivery that is not an event the host acts on returns no // event; an undecodable body is INVALID_ARGUMENT. @@ -242,6 +246,15 @@ message AcceptInvitationsResponse {} message VerifyPushRequest { RepoRef repo = 1; } message VerifyPushResponse {} +message GitCredentialRequest { RepoRef repo = 1; } +message GitCredentialResponse { + string username = 1; + string token = 2; + google.protobuf.Timestamp expires_at = 3; + string commit_name = 4; + string commit_email = 5; +} + message GetRepoArchiveRequest { RepoRef repo = 1; string ref = 2;