Close image rawSource when each loop ends

Previously close rawSouce in the middle makes future use of rawSource invalid.
Move the rawSource.Close() to the end of each loop.

Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
Qi Wang
2020-12-04 11:00:02 -05:00
parent ec0411aecd
commit d2f6f153ea

View File

@ -714,25 +714,27 @@ func (ir *ImageEngine) Sign(ctx context.Context, names []string, options entitie
} }
for _, signimage := range names { for _, signimage := range names {
err = func() error {
srcRef, err := alltransports.ParseImageName(signimage) srcRef, err := alltransports.ParseImageName(signimage)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error parsing image name") return errors.Wrapf(err, "error parsing image name")
} }
rawSource, err := srcRef.NewImageSource(ctx, sc) rawSource, err := srcRef.NewImageSource(ctx, sc)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error getting image source") return errors.Wrapf(err, "error getting image source")
} }
err = rawSource.Close() defer func() {
if err != nil { if err = rawSource.Close(); err != nil {
logrus.Errorf("unable to close new image source %q", err) logrus.Errorf("unable to close %s image source %q", srcRef.DockerReference().Name(), err)
} }
}()
getManifest, _, err := rawSource.GetManifest(ctx, nil) getManifest, _, err := rawSource.GetManifest(ctx, nil)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error getting getManifest") return errors.Wrapf(err, "error getting getManifest")
} }
dockerReference := rawSource.Reference().DockerReference() dockerReference := rawSource.Reference().DockerReference()
if dockerReference == nil { if dockerReference == nil {
return nil, errors.Errorf("cannot determine canonical Docker reference for destination %s", transports.ImageName(rawSource.Reference())) return errors.Errorf("cannot determine canonical Docker reference for destination %s", transports.ImageName(rawSource.Reference()))
} }
var sigStoreDir string var sigStoreDir string
if options.Directory != "" { if options.Directory != "" {
@ -750,28 +752,28 @@ func (ir *ImageEngine) Sign(ctx context.Context, names []string, options entitie
} }
} }
if sigStoreURI == "" { if sigStoreURI == "" {
return nil, errors.Errorf("no signature storage configuration found for %s", rawSource.Reference().DockerReference().String()) return errors.Errorf("no signature storage configuration found for %s", rawSource.Reference().DockerReference().String())
} }
sigStoreDir, err = localPathFromURI(sigStoreURI) sigStoreDir, err = localPathFromURI(sigStoreURI)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "invalid signature storage %s", sigStoreURI) return errors.Wrapf(err, "invalid signature storage %s", sigStoreURI)
} }
} }
} }
manifestDigest, err := manifest.Digest(getManifest) manifestDigest, err := manifest.Digest(getManifest)
if err != nil { if err != nil {
return nil, err return err
} }
repo := reference.Path(dockerReference) repo := reference.Path(dockerReference)
if path.Clean(repo) != repo { // Coverage: This should not be reachable because /./ and /../ components are not valid in docker references if path.Clean(repo) != repo { // Coverage: This should not be reachable because /./ and /../ components are not valid in docker references
return nil, errors.Errorf("Unexpected path elements in Docker reference %s for signature storage", dockerReference.String()) return errors.Errorf("Unexpected path elements in Docker reference %s for signature storage", dockerReference.String())
} }
// create signature // create signature
newSig, err := signature.SignDockerManifest(getManifest, dockerReference.String(), mech, options.SignBy) newSig, err := signature.SignDockerManifest(getManifest, dockerReference.String(), mech, options.SignBy)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error creating new signature") return errors.Wrapf(err, "error creating new signature")
} }
// create the signstore file // create the signstore file
signatureDir := fmt.Sprintf("%s@%s=%s", filepath.Join(sigStoreDir, repo), manifestDigest.Algorithm(), manifestDigest.Hex()) signatureDir := fmt.Sprintf("%s@%s=%s", filepath.Join(sigStoreDir, repo), manifestDigest.Algorithm(), manifestDigest.Hex())
@ -779,18 +781,23 @@ func (ir *ImageEngine) Sign(ctx context.Context, names []string, options entitie
// The directory is allowed to exist // The directory is allowed to exist
if !os.IsExist(err) { if !os.IsExist(err) {
logrus.Error(err) logrus.Error(err)
continue return nil
} }
} }
sigFilename, err := getSigFilename(signatureDir) sigFilename, err := getSigFilename(signatureDir)
if err != nil { if err != nil {
logrus.Errorf("error creating sigstore file: %v", err) logrus.Errorf("error creating sigstore file: %v", err)
continue return nil
} }
err = ioutil.WriteFile(filepath.Join(signatureDir, sigFilename), newSig, 0644) err = ioutil.WriteFile(filepath.Join(signatureDir, sigFilename), newSig, 0644)
if err != nil { if err != nil {
logrus.Errorf("error storing signature for %s", rawSource.Reference().DockerReference().String()) logrus.Errorf("error storing signature for %s", rawSource.Reference().DockerReference().String())
continue return nil
}
return nil
}()
if err != nil {
return nil, err
} }
} }
return nil, nil return nil, nil