Moved artifact checksum validation into artifactvalidator.

Validating attestations and checksums should probably be in the same area.

Author: mitchell-as

pkg/platform/runtime/artifactvalidator/validator.go

@@ -128,3 +128,25 @@ func addIntermediatesToPool(cert *x509.Certificate, pool *x509.CertPool) {
 		}
 	}
 }
+
+func ValidateChecksum(archivePath string, expectedChecksum string) error {
+	if expectedChecksum != "" {
+		logging.Debug("Validating checksum for %s", archivePath)
+	} else {
+		logging.Debug("Skipping checksum validation for %s because the Platform did not provide a checksum to validate against.")
+		return nil
+	}
+
+	checksum, err := fileutils.Sha256Hash(archivePath)
+	if err != nil {
+		return errs.Wrap(err, "Failed to compute checksum for "+archivePath)
+	}
+
+	if checksum != expectedChecksum {
+		logging.Debug("Checksum validation failed. Expected '%s', but was '%s'", expectedChecksum, checksum)
+		// Note: the artifact name will be reported higher up the chain
+		return locale.WrapError(err, "artifact_checksum_failed", "Checksum validation failed")
+	}
+
+	return nil
+}

pkg/platform/runtime/setup/setup.go

@@ -31,6 +31,7 @@ import (
 	apimodel "github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/platform/runtime/artifact"
 	"github.com/ActiveState/cli/pkg/platform/runtime/artifactcache"
+	"github.com/ActiveState/cli/pkg/platform/runtime/artifactvalidator"
 	"github.com/ActiveState/cli/pkg/platform/runtime/envdef"
 	"github.com/ActiveState/cli/pkg/platform/runtime/executor"
 	"github.com/ActiveState/cli/pkg/platform/runtime/model"
@@ -587,25 +588,7 @@ func (s *Setup) downloadArtifactWithProgress(unsignedURI string, targetFile stri
 // verifyArtifact verifies the checksum of the downloaded artifact matches the checksum given by the
 // platform, and returns an error if the verification fails.
 func (s *Setup) verifyArtifact(archivePath string, a artifact.ArtifactDownload) error {
-	if a.Checksum != "" {
-		logging.Debug("Validating checksum for %s", archivePath)
-	} else {
-		logging.Debug("Skipping checksum validation for %s because the Platform did not provide a checksum to validate against.")
-		return nil
-	}
-
-	checksum, err := fileutils.Sha256Hash(archivePath)
-	if err != nil {
-		return errs.Wrap(err, "Failed to compute checksum for "+a.ArtifactID.String())
-	}
-
-	if checksum != a.Checksum {
-		logging.Debug("Checksum validation failed. Expected '%s', but was '%s'", a.Checksum, checksum)
-		// Note: the artifact name will be reported higher up the chain
-		return locale.WrapError(err, "artifact_checksum_failed", "Checksum validation failed")
-	}
-
-	return nil
+  return artifactvalidator.ValidateChecksum(archivePath, a.Checksum)
 }
 
 // downloadArtifact downloads an artifact and returns the local path to that artifact's archive.