Fix: Model Gallery Downloads (#835)

mudler · Jul 30, 2023 · 5ce0f21 · 5ce0f21
1 parent 688f150
commit 5ce0f21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/utils/path.go b/pkg/utils/path.go
@@ -18,5 +18,5 @@ func inTrustedRoot(path string, trustedRoot string) error {
 // VerifyPath verifies that path is based in basePath.
 func VerifyPath(path, basePath string) error {
 	c := filepath.Clean(filepath.Join(basePath, path))
-	return inTrustedRoot(c, basePath)
+	return inTrustedRoot(c, filepath.Clean(basePath))
 }
diff --git a/pkg/utils/uri.go b/pkg/utils/uri.go
@@ -2,8 +2,9 @@ package utils
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"strings"
 )
 
@@ -32,7 +33,7 @@ func GetURI(url string, f func(url string, i []byte) error) error {
 	if strings.HasPrefix(url, "file://") {
 		rawURL := strings.TrimPrefix(url, "file://")
 		// Read the response body
-		body, err := ioutil.ReadFile(rawURL)
+		body, err := os.ReadFile(rawURL)
 		if err != nil {
 			return err
 		}
@@ -49,7 +50,7 @@ func GetURI(url string, f func(url string, i []byte) error) error {
 	defer response.Body.Close()
 
 	// Read the response body
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return err
 	}