mirror of
https://git.sr.ht/~joren/streamrip-go
synced 2026-10-16 22:07:30 +02:00
fix: resource leaks, cancellation, races and path traversal
Six correctness bugs that the existing tests could not see. The suite passed and `go test -race` was clean throughout, because nothing exercised concurrent token refresh, shared-folder artwork, or hostile metadata. main(): extract run() int main() was a single 1196-line function that registered 20 `defer mainApp.Close()` handlers and then called os.Exit 150 times, so none of them ever ran. Close() is what closes the SQLite handle, flushes the progress bars and removes the artwork temp dirs, so every failed rip leaked temp directories. main() is now a wrapper around run() int and the command bodies return exit codes. Ctrl-C now stops a rip ctx was threaded everywhere but never checked: zero ctx.Err()/ctx.Done() in internal/app and internal/download. Cancellation left Rip() iterating the whole remaining queue, and the retry ladder retried on a dead context, so one Ctrl-C cost three doomed attempts per remaining track. Adds checks to the dispatch loops, the worker-spawn loops and the retry ladder, and routes the MarkFailed/MarkDownloaded bookkeeping through a detached context so the records survive cancellation. Convert and TagFLAC now take a ctx and use exec.CommandContext, so a stalled ffmpeg/ffprobe no longer outlives Ctrl-C. Config race Provider token refresh mutated the shared *config.Config and called SaveFile() from inside download workers with no lock, racing the struct fields and issuing concurrent os.WriteFile against one path. Adds a mutex to config.Config plus UpdateTokens(), and routes all five refresh sites through it. Each provider client gets an authMu guarding loggedIn and its login/refresh path; beatport needed it most, since ensureToken is reached from apiRequest. Artwork cover race artwork.Prepare was check-then-write on a path shared by every worker in a playlist rip. Two workers both saw a missing cover.jpg, both created it, and the loser's cleanup deleted the winner's finished file. Adds a per-folder lock and downloads via a unique temp file + rename. The regression test fails against the old code with 15 of 16 workers getting no cover. Path traversal from remote metadata naming.CleanName stripped <>:"/\|?* and control chars but not "." , so a title of ".." survived into filepath.Join and escaped the download root. SoundCloud and Tidal playlist names are user-generated. Now rejects "." and "..", trims trailing dots, handles Windows device names, adds DEL to the invalid set and caps components at 255 bytes without splitting a rune. app.go gains safeJoin as a second line of defence. Credentials no longer world-readable The config holds plaintext provider passwords, Deezer ARL cookies and OAuth tokens and was written 0o644. Now 0o600, with 0o700 directories, and an existing 0o644 file is tightened on write. Also: deletes the 9 duplicated *-rip-smoke dev commands (~300 lines fully subsumed by `rip id`) and the unreachable second dev-help arm; registers image/png so PNG covers are downscaled instead of being silently saved as cover.jpg containing PNG bytes; adds the missing .gitignore, which was keeping a 21MB build artifact one `git add -A` away from the repo. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
19 files changed
+915
-562
No files matched your search
+56
-13
@@ -6,10 +6,12 @@ import (
|
||||
"fmt"
|
||||
"image"
|
||||
"image/jpeg"
|
||||
_ "image/png"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
|
||||
"golang.org/x/image/draw"
|
||||
|
||||
@@ -31,6 +33,52 @@ var (
|
||||
tempDirs = map[string]struct{}{}
|
||||
)
|
||||
|
||||
var (
|
||||
folderLocksMu sync.Mutex
|
||||
folderLocks = map[string]*sync.Mutex{}
|
||||
)
|
||||
|
||||
// lockFolder serializes Prepare calls that target the same album folder and
|
||||
// returns the unlock function.
|
||||
//
|
||||
// ripTrack calls Prepare once per track with the same albumFolder for every
|
||||
// worker in a playlist rip, and the cover handling below is check-then-write.
|
||||
// Without this, two workers both saw a missing cover.jpg, both created it, and
|
||||
// the one that failed removed the file the other had just finished writing.
|
||||
func lockFolder(folder string) func() {
|
||||
folderLocksMu.Lock()
|
||||
mu, ok := folderLocks[folder]
|
||||
if !ok {
|
||||
mu = &sync.Mutex{}
|
||||
folderLocks[folder] = mu
|
||||
}
|
||||
folderLocksMu.Unlock()
|
||||
|
||||
mu.Lock()
|
||||
return mu.Unlock
|
||||
}
|
||||
|
||||
// fetchAtomic downloads sourceURL to destPath via a unique temp file in the
|
||||
// same directory, then renames it into place. Downloading straight to destPath
|
||||
// meant a failed attempt could delete a file another worker had completed.
|
||||
func fetchAtomic(ctx context.Context, dl Downloader, sourceURL, destPath string, maxWidth int) bool {
|
||||
tmpPath := fmt.Sprintf("%s.part-%d-%d", destPath, os.Getpid(), atomic.AddUint64(&tmpCounter, 1))
|
||||
if err := dl.FileNoProgress(ctx, sourceURL, tmpPath); err != nil {
|
||||
_ = os.Remove(tmpPath)
|
||||
return false
|
||||
}
|
||||
if maxWidth > 0 {
|
||||
_ = downscaleImage(tmpPath, maxWidth)
|
||||
}
|
||||
if err := os.Rename(tmpPath, destPath); err != nil {
|
||||
_ = os.Remove(tmpPath)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
var tmpCounter uint64
|
||||
|
||||
func Prepare(ctx context.Context, dl Downloader, folder string, albumMeta map[string]any, cfg config.ArtworkConfig, forPlaylist bool) (Result, error) {
|
||||
saveArtwork := cfg.SaveArtwork
|
||||
if forPlaylist {
|
||||
@@ -51,30 +99,25 @@ func Prepare(ctx context.Context, dl Downloader, folder string, albumMeta map[st
|
||||
embedURL = largestURL
|
||||
}
|
||||
|
||||
// Everything below is check-then-write against shared paths.
|
||||
unlock := lockFolder(folder)
|
||||
defer unlock()
|
||||
|
||||
result := Result{}
|
||||
if saveArtwork && largestURL != "" {
|
||||
savedPath := filepath.Join(folder, "cover.jpg")
|
||||
if fileExists(savedPath) {
|
||||
result.SavedPath = savedPath
|
||||
} else if err := dl.FileNoProgress(ctx, largestURL, savedPath); err == nil {
|
||||
if cfg.SavedMaxWidth > 0 {
|
||||
_ = downscaleImage(savedPath, cfg.SavedMaxWidth)
|
||||
}
|
||||
if fileExists(savedPath) || fetchAtomic(ctx, dl, largestURL, savedPath, cfg.SavedMaxWidth) {
|
||||
result.SavedPath = savedPath
|
||||
}
|
||||
}
|
||||
|
||||
if cfg.Embed && embedURL != "" {
|
||||
embedDir := sessionEmbedDir(folder)
|
||||
if err := os.MkdirAll(embedDir, 0o755); err == nil {
|
||||
// 0o700: predictable path under the shared system temp dir.
|
||||
if err := os.MkdirAll(embedDir, 0o700); err == nil {
|
||||
registerTempDir(embedDir)
|
||||
embedPath := filepath.Join(embedDir, embedFilename(embedURL))
|
||||
if fileExists(embedPath) {
|
||||
result.EmbedPath = embedPath
|
||||
} else if err := dl.FileNoProgress(ctx, embedURL, embedPath); err == nil {
|
||||
if cfg.EmbedMaxWidth > 0 {
|
||||
_ = downscaleImage(embedPath, cfg.EmbedMaxWidth)
|
||||
}
|
||||
if fileExists(embedPath) || fetchAtomic(ctx, dl, embedURL, embedPath, cfg.EmbedMaxWidth) {
|
||||
result.EmbedPath = embedPath
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user