Skip to content
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

Jump to bottom

fix: race condition for signed versioned artifacts #932

Merged
merged 2 commits into from
Sep 12, 2023
Merged

fix: race condition for signed versioned artifacts #932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
334d05b
fix: race condition for signed versioned artifacts
rdimitrov Sep 11, 2023
0b7e043
chore: apply review feedback
rdimitrov Sep 12, 2023
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
17 changes: 5 additions & 12 deletions pkg/controlplane/handlers_githubwebhooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ func (s *Server) HandleGitHubWebHook() http.HandlerFunc {
log.Printf("publishing of type: %s", m.Metadata["type"])

if err := s.parseGithubEventForProcessing(rawWBPayload, m); err != nil {
// We won't leak whether a repository is not found.
if errors.Is(err, ErrRepoNotFound) {
log.Printf("repository not found: %v", err)
// We won't leak when a repository or artifact is not found.
if errors.Is(err, ErrRepoNotFound) || errors.Is(err, ErrArtifactNotFound) {
log.Printf("repository or artifact not found: %v", err)
w.WriteHeader(http.StatusOK)
return
}
Expand Down Expand Up @@ -380,11 +380,6 @@ func (s *Server) parseArtifactPublishedEvent(
return fmt.Errorf("error gathering versioned artifact: %w", err)
}

if versionedArtifact == nil {
// no error, but the version was just the signature
return nil
}

dbArtifact, _, err := upsertVersionedArtifact(ctx, dbrepo.ID, versionedArtifact, s.store)
if err != nil {
return fmt.Errorf("error upserting artifact from payload: %w", err)
Expand Down Expand Up @@ -593,12 +588,10 @@ func gatherVersionedArtifact(
return nil, fmt.Errorf("error looking up version by signature tag: %w", lookupErr)
}
if storedVersion == nil {
// not much we can do about the version not being there, let's hope the signed container arrives later
// but don't return nil, there's no point in retrying either
return nil, nil
// return an error that would be caught by the webhook HTTP handler and not retried
return nil, ErrArtifactNotFound
}
// let's continue with the stored version

// now get information for signature and workflow
err = storeSignatureAndWorkflowInVersion(
ctx, cli, artifact.Owner, artifact.Name, transformTag(tagIsSigErr.signatureTag), storedVersion)
Expand Down