feat: add ability to skip sha1 verification in download macos cmd a…

…s well as only download InstallAssistant.pkg with `--assistant` flag
blacktop · Feb 23, 2022 · c42bd57 · c42bd57
1 parent a6dec39
commit c42bd57
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 15 deletions.
diff --git a/cmd/ipsw/cmd/download_git.go b/cmd/ipsw/cmd/download_git.go
@@ -402,7 +402,7 @@ var gitCmd = &cobra.Command{
 					"file": destName,
 				}).Info("Downloading")
 				// download file
-				downloader := download.NewDownload(proxy, insecure, false, false, false, false)
+				downloader := download.NewDownload(proxy, insecure, false, false, false, false, false)
 				downloader.URL = tarURL
 				downloader.DestName = destName
 

diff --git a/cmd/ipsw/cmd/download_ipsw.go b/cmd/ipsw/cmd/download_ipsw.go
@@ -319,7 +319,7 @@ var ipswCmd = &cobra.Command{
 							"signed":  i.Signed,
 						}).Info("Getting IPSW")
 
-						downloader := download.NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, Verbose)
+						downloader := download.NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, false, Verbose)
 						downloader.URL = i.URL
 						downloader.Sha1 = i.SHA1
 						downloader.DestName = destName

diff --git a/cmd/ipsw/cmd/download_macos.go b/cmd/ipsw/cmd/download_macos.go
@@ -38,9 +38,13 @@ func init() {
 
 	macosCmd.Flags().BoolP("list", "l", false, "Show latest macOS installers")
 	macosCmd.Flags().StringP("work-dir", "w", "", "macOS installer creator working directory")
+	macosCmd.Flags().Bool("ignore", false, "Do NOT verify pkg digests")
+	macosCmd.Flags().BoolP("assistant", "a", false, "Only download the InstallAssistant.pkg")
 	// macosCmd.Flags().BoolP("kernel", "k", false, "Extract kernelcache from remote installer")
 	viper.BindPFlag("download.macos.list", macosCmd.Flags().Lookup("list"))
 	viper.BindPFlag("download.macos.work-dir", macosCmd.Flags().Lookup("work-dir"))
+	viper.BindPFlag("download.macos.ignore", macosCmd.Flags().Lookup("ignore"))
+	viper.BindPFlag("download.macos.assistant", macosCmd.Flags().Lookup("assistant"))
 	// viper.BindPFlag("download.macos.kernel", macosCmd.Flags().Lookup("kernel"))
 }
 
@@ -85,6 +89,8 @@ var macosCmd = &cobra.Command{
 		// flags
 		showInstallers := viper.GetBool("download.macos.list")
 		workDir := viper.GetString("download.macos.work-dir")
+		ignoreSha1 := viper.GetBool("download.macos.ignore")
+		assistantOnly := viper.GetBool("download.macos.assistant")
 		// remoteKernel := viper.GetString("download.macos.kernel")
 
 		// verify args
@@ -153,7 +159,7 @@ var macosCmd = &cobra.Command{
 			}
 		}
 		if cont {
-			if err := prod.DownloadInstaller(workDir, proxy, insecure, skipAll, resumeAll, restartAll); err != nil {
+			if err := prod.DownloadInstaller(workDir, proxy, insecure, skipAll, resumeAll, restartAll, ignoreSha1, assistantOnly); err != nil {
 				return err
 			}
 		}

diff --git a/cmd/ipsw/cmd/download_ota.go b/cmd/ipsw/cmd/download_ota.go
@@ -264,7 +264,7 @@ var otaDLCmd = &cobra.Command{
 					}
 				}
 			} else {
-				downloader := download.NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, Verbose)
+				downloader := download.NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, false, Verbose)
 				for _, o := range otas {
 					folder := filepath.Join(destPath, fmt.Sprintf("%s%s_OTAs", o.ProductSystemName, strings.TrimPrefix(o.OSVersion, "9.9.")))
 					os.MkdirAll(folder, os.ModePerm)

diff --git a/cmd/ipsw/cmd/download_wiki.go b/cmd/ipsw/cmd/download_wiki.go
@@ -104,7 +104,7 @@ var wikiCmd = &cobra.Command{
 		}
 
 		if cont {
-			downloader := download.NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, Verbose)
+			downloader := download.NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, false, Verbose)
 			for _, url := range filteredURLS {
 				destName := getDestName(url, removeCommas)
 				if _, err := os.Stat(destName); os.IsNotExist(err) {

diff --git a/cmd/ipsw/cmd/update.go b/cmd/ipsw/cmd/update.go
@@ -246,7 +246,7 @@ var updateCmd = &cobra.Command{
 			}
 		}
 
-		downloader := download.NewDownload(proxy, insecure, false, false, false, Verbose)
+		downloader := download.NewDownload(proxy, insecure, false, false, false, false, Verbose)
 		fname := strings.Replace(path.Base(asset.DownloadURL), ",", "_", -1)
 		fname = filepath.Join(destPath, fname)
 		if _, err := os.Stat(fname); os.IsNotExist(err) {

diff --git a/internal/download/dev_portal.go b/internal/download/dev_portal.go
@@ -770,6 +770,7 @@ func (app *App) Download(url string) error {
 		app.config.SkipAll,
 		app.config.ResumeAll,
 		app.config.RestartAll,
+		false,
 		app.config.Verbose,
 	)
 	// use authenticated client

diff --git a/internal/download/downloader.go b/internal/download/downloader.go
@@ -39,6 +39,7 @@ type Download struct {
 	skipAll      bool
 	resumeAll    bool
 	restartAll   bool
+	ignoreSha1   bool
 	verbose      bool
 
 	client *http.Client
@@ -62,14 +63,15 @@ type geoQuery struct {
 }
 
 // NewDownload creates a new downloader
-func NewDownload(proxy string, insecure, skipAll, resumeAll, restartAll, verbose bool) *Download {
+func NewDownload(proxy string, insecure, skipAll, resumeAll, restartAll, ignoreSha1, verbose bool) *Download {
 	return &Download{
 		// URL:     url,
 		// Sha1:    sha1,
 		resume:     false,
 		skipAll:    skipAll,
 		resumeAll:  resumeAll,
 		restartAll: restartAll,
+		ignoreSha1: ignoreSha1,
 		verbose:    verbose,
 		client: &http.Client{
 			Transport: &http.Transport{
@@ -296,7 +298,7 @@ func (d *Download) Do() error {
 		dest.Sync()
 		dest.Close()
 
-		if len(d.Sha1) > 0 {
+		if len(d.Sha1) > 0 && !d.ignoreSha1 {
 			utils.Indent(log.Info, 2)("verifying sha1sum...")
 			if ok, _ := utils.Verify(d.Sha1, d.DestName+".download"); !ok {
 				// fileLock.Unlock()
@@ -321,7 +323,7 @@ func (d *Download) Do() error {
 		dest.Sync()
 		dest.Close()
 
-		if len(d.Sha1) > 0 {
+		if len(d.Sha1) > 0 && !d.ignoreSha1 {
 			utils.Indent(log.Info, 2)("verifying sha1sum...")
 			checksum, _ := hex.DecodeString(d.Sha1)
 

diff --git a/internal/download/macos.go b/internal/download/macos.go
@@ -30,8 +30,8 @@ const (
 	sucatalogs17      = "https://swscan.apple.com/content/catalogs/others/index-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
 	sucatalogs18      = "https://swscan.apple.com/content/catalogs/others/index-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
 	sucatalogs19      = "https://swscan.apple.com/content/catalogs/others/index-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
-	sucatalogs20      = "https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
-	sucatalogs21      = "https://swscan.apple.com/content/catalogs/others/index-12seed-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
+	sucatalogs20      = "https://swscan.apple.com/content/catalogs/others/index-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
+	sucatalogs21      = "https://swscan.apple.com/content/catalogs/others/index-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
 )
 
 type seedCatalog struct {
@@ -309,17 +309,20 @@ func GetProductInfo() (ProductInfos, error) {
 	return prods, nil
 }
 
-func (i *ProductInfo) DownloadInstaller(workDir, proxy string, insecure, skipAll, resumeAll, restartAll bool) error {
+func (i *ProductInfo) DownloadInstaller(workDir, proxy string, insecure, skipAll, resumeAll, restartAll, ignoreSha1, assistantOnly bool) error {
 
-	downloader := NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, true)
+	downloader := NewDownload(proxy, insecure, skipAll, resumeAll, restartAll, ignoreSha1, true)
 
-	folder := filepath.Join(workDir, i.Title)
+	folder := filepath.Join(workDir, fmt.Sprintf("%s_%s_%s", i.ProductID, i.Version, i.Build))
 
 	os.MkdirAll(folder, os.ModePerm)
 
 	log.Info("Downloading packages")
 	for _, pkg := range i.Product.Packages {
 		if len(pkg.URL) > 0 {
+			if assistantOnly && !strings.HasSuffix(pkg.URL, "InstallAssistant.pkg") {
+				continue
+			}
 			destName := getDestName(pkg.URL, false)
 			if _, err := os.Stat(filepath.Join(folder, destName)); os.IsNotExist(err) {
 				log.WithFields(log.Fields{
@@ -340,6 +343,9 @@ func (i *ProductInfo) DownloadInstaller(workDir, proxy string, insecure, skipAll
 			}
 
 		} else if len(pkg.MetadataURL) > 0 {
+			if assistantOnly && !strings.HasSuffix(pkg.MetadataURL, "InstallAssistant.pkg") {
+				continue
+			}
 			destName := getDestName(pkg.MetadataURL, false)
 			if _, err := os.Stat(filepath.Join(folder, destName)); os.IsNotExist(err) {
 				log.WithFields(log.Fields{
@@ -362,6 +368,10 @@ func (i *ProductInfo) DownloadInstaller(workDir, proxy string, insecure, skipAll
 		}
 	}
 
+	if assistantOnly {
+		return nil
+	}
+
 	volumeName := fmt.Sprintf("Install_macOS_%s-%s", i.Version, i.Build)
 	sparseDiskimagePath := filepath.Join(folder, volumeName+".sparseimage")
 

diff --git a/internal/download/oss.go b/internal/download/oss.go
@@ -34,7 +34,7 @@ type Oss struct {
 func (p *project) Download() error {
 
 	// proxy, insecure are null because we override the client below
-	downloader := NewDownload("", false, false, false, false, false)
+	downloader := NewDownload("", false, false, false, false, false, false)
 
 	destName := getDestName(p.URL, false)
 	if _, err := os.Stat(destName); os.IsNotExist(err) {