Merge pull request #101 from almaslennikov/validate-zips

fix: report an error fw zip archive doesn't contain fw binaries

Author: almaslennikov

pkg/firmware/provisioning.go

@@ -200,14 +200,22 @@ func (f firmwareProvisioner) DownloadAndUnzipFirmwareArchives(cacheName string,
 			return err
 		}
 
+		binFileFoundInArchive := false
 		for _, file := range files {
 			if !strings.EqualFold(filepath.Ext(file), consts.NicFirmwareBinaryFileExtension) {
 				continue
 			}
+			binFileFoundInArchive = true
 
 			urlsToFiles[url] = append(urlsToFiles[url], filepath.Base(file))
 		}
 
+		if !binFileFoundInArchive {
+			err := fmt.Errorf("requested FW zip archive %s doesn't contain FW binary files", url)
+			log.Log.Error(err, "failed to process zip archive", "cacheName", cacheName, "url", url)
+			return err
+		}
+
 		log.Log.V(2).Info("Unzipped files", "archive", archiveLocalPath, "files", files)
 
 		if cleanupArchives {

pkg/firmware/provisioning_test.go

@@ -209,6 +209,25 @@ var _ = Describe("FirmwareProvisioner", func() {
 			})
 		})
 
+		Context("when archive has no binary files", func() {
+			It("should return an error", func() {
+				cleanupArchives = true
+				fwUtilsMock.On("DownloadFile", downloadUrls[0], mock.AnythingOfType("string")).
+					Return(nil).Once()
+				fwUtilsMock.On("UnzipFiles", mock.AnythingOfType("string"), mock.AnythingOfType("string")).
+					Return([]string{"randomFile"}, nil).Once()
+
+				Expect(os.MkdirAll(cacheDir, 0755)).To(Succeed())
+				fileToBeDeleted := path.Join(cacheDir, "fwA.zip")
+				Expect(os.WriteFile(fileToBeDeleted, []byte("dummy content"), 0644)).To(Succeed())
+
+				err := fwProv.DownloadAndUnzipFirmwareArchives(cacheName, downloadUrls, cleanupArchives)
+				Expect(err.Error()).To(ContainSubstring("requested FW zip archive http://example.com/fwA.zip doesn't contain FW binary files"))
+				_, err = os.Stat(fileToBeDeleted)
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+
 		Context("when cleanupArchives is true", func() {
 			It("should remove the downloaded archive after unzipping", func() {
 				cleanupArchives = true