重构仓库匹配逻辑,移除不必要的代码并添加验证功能
Some checks failed
release-nightly / release-image (push) Failing after 29s
checks / check and test (push) Has been cancelled

This commit is contained in:
2025-04-13 22:40:03 +08:00
parent 227eb3db0e
commit eceef92735
3 changed files with 36 additions and 35 deletions

View File

@ -7,7 +7,6 @@ import (
"context"
"errors"
"fmt"
"strings"
"sync"
"sync/atomic"
@ -148,12 +147,6 @@ func (p *Poller) runTaskWithRecover(ctx context.Context, task *runnerv1.Task) {
log.WithError(err).Error("panic in runTaskWithRecover")
}
}()
// verify owner and repo
fmt.Println("正在匹配仓库...", task.Context.Fields["repository"].GetStringValue(), p.cfg.Runner.AllowedRepos)
if matchAllowedRepo(task.Context.Fields["repository"].GetStringValue(), p.cfg.Runner.AllowedRepos) {
log.WithError(errors.New("allowed repos not match")).Error("allowed repos not match")
return
}
if err := p.runner.Run(ctx, task); err != nil {
log.WithError(err).Error("failed to run task")
@ -194,31 +187,3 @@ func (p *Poller) fetchTask(ctx context.Context) (*runnerv1.Task, bool) {
return resp.Msg.Task, true
}
func matchAllowedRepo(targetRepo string, allowedRepos []string) bool {
if len(allowedRepos) == 0 {
return true
}
parts := strings.Split(targetRepo, "/")
if len(parts) != 2 {
log.Errorf("Invalid repository format: %s", targetRepo)
return false
}
targetOwner, targetRepoName := parts[0], parts[1]
for _, allowedRepo := range allowedRepos {
parts := strings.Split(allowedRepo, "/")
if len(parts) != 2 {
log.Warnf("Invalid allowed repository format: %s", allowedRepo)
continue
}
allowedOwner, allowedRepoName := parts[0], parts[1]
if (allowedOwner == "*" || allowedOwner == targetOwner) &&
(allowedRepoName == "*" || allowedRepoName == targetRepoName) {
return true
}
}
return false
}