Skip to content

fix: add mutex to LocalRepositoryCache to prevent concurrent map panic #6055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jun-mercury wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

fix: add mutex to LocalRepositoryCache to prevent concurrent map panic #6055

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkg/runner/local_repository_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"os"
"path/filepath"
"strings"
"sync"

"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/filecollector"
Expand All @@ -20,20 +21,25 @@ type LocalRepositoryCache struct {
Parent ActionCache
LocalRepositories map[string]string
CacheDirCache map[string]string
cacheDirMu sync.RWMutex
}

func (l *LocalRepositoryCache) Fetch(ctx context.Context, cacheDir, url, ref, token string) (string, error) {
logger := common.Logger(ctx)
logger.Debugf("LocalRepositoryCache fetch %s with ref %s", url, ref)
if dest, ok := l.LocalRepositories[fmt.Sprintf("%s@%s", url, ref)]; ok {
logger.Infof("LocalRepositoryCache matched %s with ref %s to %s", url, ref, dest)
l.cacheDirMu.Lock()
l.CacheDirCache[fmt.Sprintf("%s@%s", cacheDir, ref)] = dest
l.cacheDirMu.Unlock()
return ref, nil
}
if purl, err := goURL.Parse(url); err == nil {
if dest, ok := l.LocalRepositories[fmt.Sprintf("%s@%s", strings.TrimPrefix(purl.Path, "/"), ref)]; ok {
logger.Infof("LocalRepositoryCache matched %s with ref %s to %s", url, ref, dest)
l.cacheDirMu.Lock()
l.CacheDirCache[fmt.Sprintf("%s@%s", cacheDir, ref)] = dest
l.cacheDirMu.Unlock()
return ref, nil
}
}
Expand All @@ -44,7 +50,10 @@ func (l *LocalRepositoryCache) Fetch(ctx context.Context, cacheDir, url, ref, to
func (l *LocalRepositoryCache) GetTarArchive(ctx context.Context, cacheDir, sha, includePrefix string) (io.ReadCloser, error) {
logger := common.Logger(ctx)
// sha is mapped to ref in fetch if there is a local override
if dest, ok := l.CacheDirCache[fmt.Sprintf("%s@%s", cacheDir, sha)]; ok {
l.cacheDirMu.RLock()
dest, ok := l.CacheDirCache[fmt.Sprintf("%s@%s", cacheDir, sha)]
l.cacheDirMu.RUnlock()
if ok {
logger.Infof("LocalRepositoryCache read cachedir %s with ref %s and subpath '%s' from %s", cacheDir, sha, includePrefix, dest)
srcPath := filepath.Join(dest, includePrefix)
buf := &bytes.Buffer{}
Expand Down
Loading