diff options
| author | Jason Song <i@wolfogre.com> | 2022-12-28 18:03:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 11:03:21 +0100 |
| commit | e9bc2c77c35d078c5ba5e6107c3551f31410c936 (patch) | |
| tree | 8c0b771a9efe60101fd5520db7403ed9c59e2f31 /models | |
| parent | 9b4da56963692819d236b07504e565d4b4fb4021 (diff) | |
| download | gitea-e9bc2c77c35d078c5ba5e6107c3551f31410c936.tar.gz gitea-e9bc2c77c35d078c5ba5e6107c3551f31410c936.zip | |
Use complete SHA to create and query commit status (#22244) (#22257)
Backport #22244.
Fix #13485.
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/activities/action.go | 2 | ||||
| -rw-r--r-- | models/git/commit_status.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/models/activities/action.go b/models/activities/action.go index 147511edec..5ff0079a6b 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -272,7 +272,7 @@ func (a *Action) GetRefLink() string { return a.GetRepoLink() + "/src/branch/" + util.PathEscapeSegments(strings.TrimPrefix(a.RefName, git.BranchPrefix)) case strings.HasPrefix(a.RefName, git.TagPrefix): return a.GetRepoLink() + "/src/tag/" + util.PathEscapeSegments(strings.TrimPrefix(a.RefName, git.TagPrefix)) - case len(a.RefName) == 40 && git.IsValidSHAPattern(a.RefName): + case len(a.RefName) == git.SHAFullLength && git.IsValidSHAPattern(a.RefName): return a.GetRepoLink() + "/src/commit/" + a.RefName default: // FIXME: we will just assume it's a branch - this was the old way - at some point we may want to enforce that there is always a ref here. diff --git a/models/git/commit_status.go b/models/git/commit_status.go index 53c5458040..9e7fb5f805 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -281,6 +281,10 @@ func NewCommitStatus(opts NewCommitStatusOptions) error { return fmt.Errorf("NewCommitStatus[%s, %s]: no user specified", repoPath, opts.SHA) } + if _, err := git.NewIDFromString(opts.SHA); err != nil { + return fmt.Errorf("NewCommitStatus[%s, %s]: invalid sha: %w", repoPath, opts.SHA, err) + } + ctx, committer, err := db.TxContext() if err != nil { return fmt.Errorf("NewCommitStatus[repo_id: %d, user_id: %d, sha: %s]: %w", opts.Repo.ID, opts.Creator.ID, opts.SHA, err) |