From a466bd815d82fb72db2bdd5000474017918125af Mon Sep 17 00:00:00 2001
From: Scott Brenner <scott@scottbrenner.me>
Date: Tue, 5 Sep 2023 19:44:22 -0700
Subject: [PATCH] Improve download function (#3)

---
 cmd/download.go | 59 ++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/cmd/download.go b/cmd/download.go
index 6bd1980..3933ccc 100644
--- a/cmd/download.go
+++ b/cmd/download.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 )
@@ -75,35 +76,37 @@ func unzipDownloadedPack() (err error) {
 	}
 	defer archive.Close()
 	for _, f := range archive.File {
-		filePath := filepath.Join(dst, f.Name)
-		fmt.Println("unzipping file ", filePath)
-
-		if f.FileInfo().IsDir() {
-			fmt.Println("creating song folder...")
-			os.MkdirAll(filePath, os.ModePerm)
-			continue
-		}
-
-		if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
-			panic(err)
-		}
-
-		dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-		if err != nil {
-			panic(err)
+		if !strings.Contains(f.Name, "..") {
+			filePath := filepath.Join(dst, f.Name)
+			fmt.Println("unzipping file ", filePath)
+
+			if f.FileInfo().IsDir() {
+				fmt.Println("creating song folder...")
+				os.MkdirAll(filePath, os.ModePerm)
+				continue
+			}
+
+			if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
+				panic(err)
+			}
+
+			dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
+			if err != nil {
+				panic(err)
+			}
+
+			fileInArchive, err := f.Open()
+			if err != nil {
+				panic(err)
+			}
+
+			if _, err := io.Copy(dstFile, fileInArchive); err != nil {
+				panic(err)
+			}
+
+			dstFile.Close()
+			fileInArchive.Close()
 		}
-
-		fileInArchive, err := f.Open()
-		if err != nil {
-			panic(err)
-		}
-
-		if _, err := io.Copy(dstFile, fileInArchive); err != nil {
-			panic(err)
-		}
-
-		dstFile.Close()
-		fileInArchive.Close()
 	}
 	return nil
 }