Merge pull request #3596 from Xiol/issue-3555-cross-platform-paths

fix: Cross-platform path handling for OVF FileArchive uploads
vmware · Oct 21, 2024 · 15e0e96 · 15e0e96
2 parents c0321f8 + 36ee9a1
commit 15e0e96
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/ovf/importer/archive.go b/ovf/importer/archive.go
@@ -112,11 +112,8 @@ type FileArchive struct {
 
 func (t *FileArchive) Open(name string) (io.ReadCloser, int64, error) {
 	fpath := name
-	if name != t.Path {
-		index := strings.LastIndex(t.Path, "/")
-		if index != -1 {
-			fpath = t.Path[:index] + "/" + name
-		}
+	if name != t.Path && !filepath.IsAbs(name) {
+		fpath = filepath.Join(filepath.Dir(t.Path), name)
 	}
 
 	return t.OpenFile(fpath)