From ed15d98e5a9077757625f17a5a5b8377b5e07fc9 Mon Sep 17 00:00:00 2001
From: Luke Kingland <luke@lukekingland.com>
Date: Wed, 14 Feb 2024 13:22:20 +0900
Subject: [PATCH] add back in correct path support for windows

---
 pkg/oci/containerize.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkg/oci/containerize.go b/pkg/oci/containerize.go
index 21e73528b..0d812c42e 100644
--- a/pkg/oci/containerize.go
+++ b/pkg/oci/containerize.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	slashpath "path"
 	"path/filepath"
 	"strings"
 
@@ -136,13 +137,12 @@ func newDataTarball(source, target string, ignored []string, verbose bool) error
 	tw := tar.NewWriter(gw)
 	defer tw.Close()
 
-	baseDir := "/func"
-
 	return filepath.Walk(source, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 
+		// Skip files explicitly ignored
 		for _, v := range ignored {
 			if info.Name() == v {
 				if info.IsDir() {
@@ -152,9 +152,10 @@ func newDataTarball(source, target string, ignored []string, verbose bool) error
 			}
 		}
 
-		var link string
+		// Error if links exist which reach outside of the function root
 		if info.Mode()&os.ModeSymlink == os.ModeSymlink {
-			if link, err = os.Readlink(path); err != nil {
+			link, err := os.Readlink(path)
+			if err != nil {
 				return err
 			}
 			ok, err := isWithin(source, link)
@@ -165,13 +166,17 @@ func newDataTarball(source, target string, ignored []string, verbose bool) error
 			}
 		}
 
-		header, err := tar.FileInfoHeader(info, link)
+		header, err := tar.FileInfoHeader(info, info.Name())
 		if err != nil {
 			return err
 		}
 
-		header.Name = filepath.Join(baseDir, strings.TrimPrefix(path, source))
-		if err = tw.WriteHeader(header); err != nil {
+		relPath, err := filepath.Rel(source, path)
+		if err != nil {
+			return err
+		}
+		header.Name = slashpath.Join("/func", filepath.ToSlash(relPath))
+		if err := tw.WriteHeader(header); err != nil {
 			return err
 		}
 		if verbose {