From 3fe44b87627612705413e80abbe8af55fae36666 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Fri, 22 Dec 2023 23:32:22 +0800
Subject: [PATCH] Fix `status_check_contexts` matching bug (#28582) (#28589)
Backport #28582 by @Zettat123
Fix #28570
Follow #24633
---
Copied from
https://github.com/go-gitea/gitea/issues/28570#issuecomment-1867327999
The feature introduced in #24633 should be compatible with
`status_check_contexts`. However, if one or more of
`status_check_contexts` is not a legal glob expressions, `glob.Compile`
will fail and the contexts cannot match.
https://github.com/go-gitea/gitea/blob/21229ed2c8ed00f57100adf9ebc5f4a08da9a66e/routers/web/repo/pull.go#L653-L663
Co-authored-by: Zettat123 <zettat123@gmail.com>
(cherry picked from commit 6a559ad6348b95aa1cbb275003699d709af00bfc)
---
routers/web/repo/pull.go | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 3b40571c97..852b24c52d 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -637,7 +637,15 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
if pb != nil && pb.EnableStatusCheck {
ctx.Data["is_context_required"] = func(context string) bool {
for _, c := range pb.StatusCheckContexts {
- if gp, err := glob.Compile(c); err == nil && gp.Match(context) {
+ if c == context {
+ return true
+ }
+ if gp, err := glob.Compile(c); err != nil {
+ // All newly created status_check_contexts are checked to ensure they are valid glob expressions before being stored in the database.
+ // But some old status_check_context created before glob was introduced may be invalid glob expressions.
+ // So log the error here for debugging.
+ log.Error("compile glob %q: %v", c, err)
+ } else if gp.Match(context) {
return true
}
}