mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-24 21:53:39 +09:00
191287d8be
Since #39229 the commit page header dereferences `.Verification.CommittingUser` when the committer is not the author. `Verification` is `nil` for unsigned commits (see `repo.Diff`), so opening such a commit — a rebased or cherry-picked one, for example — logs a template error and the page comes out truncated: ``` Render failed: failed to render template: repo/commit_page, error: template error: builtin(bindata):repo/commit_page:138:22 : executing "repo/commit_page" at <.Verification.CommittingUser>: nil pointer evaluating interface {}.CommittingUser ``` This guards the access and adds an integration test that creates a commit with distinct author and committer identities and checks the page renders completely (the status stays 200 on a mid-render failure, so the test looks at the body). _The fix was worked out with help from an AI assistant; I reviewed and tested it myself._ --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
38 lines
1.0 KiB
Go
38 lines
1.0 KiB
Go
// Copyright 2015 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
//go:build !gogit
|
|
|
|
package git
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"gitea.dev/modules/util"
|
|
)
|
|
|
|
// Signature represents the Author, Committer or Tagger information.
|
|
type Signature struct {
|
|
Name string // the committer name, it can be anything
|
|
Email string // the committer email, it can be anything
|
|
When time.Time // the timestamp of the signature
|
|
}
|
|
|
|
func (s *Signature) String() string {
|
|
return fmt.Sprintf("%s <%s>", s.Name, s.Email)
|
|
}
|
|
|
|
// Encode writes the signature for git commit object (same as gogit's object.Signature Encode method)
|
|
func (s *Signature) Encode(w io.Writer) error {
|
|
_, err := fmt.Fprintf(w, "%s <%s> %d %s", s.Name, s.Email, max(0, s.When.Unix()), s.When.Format("-0700"))
|
|
return err
|
|
}
|
|
|
|
// Decode parses the signature for git commit object (same as gogit's object.Signature Decode method)
|
|
func (s *Signature) Decode(b []byte) {
|
|
*s = *parseSignatureFromCommitLine(util.UnsafeBytesToString(b))
|
|
}
|