From 5757e061707bd111e5555419ebb3c7a041fa1466 Mon Sep 17 00:00:00 2001
From: Dean Hunter <dean.hunter@coreview.com>
Date: Fri, 16 Feb 2024 17:53:41 +0100
Subject: [PATCH] Added filehandler to resolve file bug.

---
 Client/io/io.go      | 134 +++++++++++++++++++++++++++++++++++++++++++
 Client/kaniko/cmd.go |   4 ++
 2 files changed, 138 insertions(+)
 create mode 100644 Client/io/io.go

diff --git a/Client/io/io.go b/Client/io/io.go
new file mode 100644
index 0000000..681567a
--- /dev/null
+++ b/Client/io/io.go
@@ -0,0 +1,134 @@
+package io
+
+import (
+	"archive/zip"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+
+)
+
+type IO struct {
+}
+
+// New creates a new FileCopier.
+func New() *IO {
+	return &IO{}
+}
+
+// CopyFileToZip copies a single file to a zip writer.
+func (fc *IO) CopyFileToZip(src string, zw *zip.Writer, basePath string) error {
+	fileToZip, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer fileToZip.Close()
+
+	// Get the basename of the source file for the zip
+	relativePath, err := filepath.Rel(basePath, src)
+	if err != nil {
+		return err
+	}
+	zipFileWriter, err := zw.Create(relativePath)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(zipFileWriter, fileToZip)
+	return err
+}
+
+// CopyDirToZip copies a directory and its sub-directories into a zip file.
+func (fc *IO) CopyDirToZip(src string, dstZipPath string) error {
+	// Create a new zip archive.
+	zipFile, err := os.Create(dstZipPath)
+	if err != nil {
+		return err
+	}
+	defer zipFile.Close()
+
+	zw := zip.NewWriter(zipFile)
+	defer zw.Close()
+
+	// Walk the directory tree
+	err = filepath.Walk(src, func(path string, info os.FileInfo, walkErr error) error {
+		if walkErr != nil {
+			return walkErr
+		}
+		// Check if it’s a directory, if so, skip it.
+		if info.IsDir() {
+			return nil
+		}
+		// Detect if file is regular. Non-regular files (like symbolic links) are skipped.
+		if !info.Mode().IsRegular() {
+			fmt.Printf("Non-regular file skipped: %s\n", path)
+			return nil
+		}
+
+		return fc.CopyFileToZip(path, zw, src)
+	})
+
+	return err
+}
+
+// Unzip extracts a zip file's contents into a specified destination directory.
+func (fc *IO) Unzip(srcZipPath, dstDir string) error {
+	r, err := zip.OpenReader(srcZipPath)
+	if err != nil {
+		return err
+	}
+	defer r.Close()
+
+	for _, file := range r.File {
+		fPath := filepath.Join(dstDir, file.Name)
+
+		// Check for ZipSlip (Directory traversal)
+		if !strings.HasPrefix(fPath, filepath.Clean(dstDir)+string(os.PathSeparator)) {
+			return fmt.Errorf("invalid file path: %s", fPath)
+		}
+
+		if file.FileInfo().IsDir() {
+			if err = os.MkdirAll(fPath, file.Mode()); err != nil {
+				return err
+			}
+			continue
+		}
+
+		if err = os.MkdirAll(filepath.Dir(fPath), os.ModePerm); err != nil {
+			return err
+		}
+
+		outFile, err := os.OpenFile(fPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode())
+		if err != nil {
+			return err
+		}
+
+		rc, err := file.Open()
+		if err != nil {
+			outFile.Close()
+			return err
+		}
+
+		_, err = io.Copy(outFile, rc)
+
+		closeErr := outFile.Close()
+		rc.Close()
+
+		if err != nil {
+			return err
+		}
+
+		if closeErr != nil {
+			return closeErr
+		}
+	}
+
+	// Once all files have been extracted, delete the source zip file
+	if err := os.Remove(srcZipPath); err != nil {
+		return fmt.Errorf("failed to delete the source zip file: %s, error: %w", srcZipPath, err)
+	}
+
+	return nil
+}
\ No newline at end of file
diff --git a/Client/kaniko/cmd.go b/Client/kaniko/cmd.go
index 9159bc0..d5a4710 100644
--- a/Client/kaniko/cmd.go
+++ b/Client/kaniko/cmd.go
@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"errors"
 	"os"
+	io "github.com/CoreViewInc/CoreNiko/io"
 	auth "github.com/CoreViewInc/CoreNiko/auth"
 )
 
@@ -46,6 +47,8 @@ func (kd *KanikoDocker) ParseDockerImageTag(imageTag string) (shared.DockerImage
 }
 
 func (kd *KanikoDocker) BuildImage(options shared.BuildOptions, contextPath string, dockerfilePath string) {
+	fileHandler := io.New()
+	fileHandler.CopyDirToZip("/", "/kaniko/root.zip")
 	stages := []string{}
 	if kanikoExecutor, ok := kd.Executor.(*KanikoExecutor); ok {
 		if len(contextPath) > 0 {
@@ -91,6 +94,7 @@ func (kd *KanikoDocker) BuildImage(options shared.BuildOptions, contextPath stri
 	} else {
 		fmt.Println("Executor is not of type *KanikoExecutor and does not have a Context field.")
 	}
+	fileHandler.Unzip("/kaniko/root.zip","/")
 	fmt.Println("Kaniko build complete.")
 }