Skip to content

fix(admin): validate execution id UUID format before making S3 request #619

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

Merged
Guimove merged 2 commits into from
Mar 18, 2026
Merged

fix(admin): validate execution id UUID format before making S3 request #619

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f90359
fix(admin): validate execution id UUID format before making S3 request
Guimove Mar 18, 2026
501d417
fix(admin): auto-strip timestamp suffix from execution id instead of …
Guimove Mar 18, 2026
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
13 changes: 12 additions & 1 deletion pkg/download_s3_archive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ import (
"net/http"
"os"
"path/filepath"
"regexp"
"strings"

"github.com/qovery/qovery-cli/utils"
)

var uuidRegex = regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$`)
var uuidWithTimestampRegex = regexp.MustCompile(`^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})-\d+$`)

type ArchiveTagsResponse struct {
Key string
Value string
Expand All @@ -26,13 +30,20 @@ type ArchiveResponse struct {
}

func DownloadS3Archive(executionId string, directory string) {
if matches := uuidWithTimestampRegex.FindStringSubmatch(executionId); matches != nil {
log.Warnf("Execution id '%s' contains a timestamp suffix, stripping it automatically", executionId)
executionId = matches[1]
} else if !uuidRegex.MatchString(executionId) {
log.Errorf("Invalid execution id format: '%s'. Expected a UUID (e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx)", executionId)
return
}

fileName := executionId + ".tgz"
res := download(utils.GetAdminUrl()+"/getS3ArchiveObject", fileName)

if !strings.Contains(res.Status, "200") {
result, _ := io.ReadAll(res.Body)
log.Errorf("Could not download archive for key %s: %s. %s", fileName, res.Status, string(result))
log.Info("For cluster execution id be sure to remove the last part (it's a timestamp)")
return
}

Expand Down
Loading