pillar: make URL joins use url.JoinPath

To prevent issues with missing or extra slashes when constructing URLs,
replace string concatenation with url.JoinPath where applicable.

Signed-off-by: Paul Gaiduk <paulg@zededa.com>

Author: europaul

pkg/edgeview/src/network.go

@@ -1075,7 +1075,12 @@ func getPeerCerts(subStr string) {
 		if basics.server != "" {
 			subStr = basics.server
 			if basics.proxy != "" {
-				subStr = subStr + "/" + basics.proxy
+				var err error
+				subStr, err = url.JoinPath(subStr, basics.proxy)
+				if err != nil {
+					fmt.Printf("error joining URL path: %v\n", err)
+					return
+				}
 			}
 		}
 		if subStr == "" {

pkg/pillar/cmd/downloader/syncop.go

@@ -381,15 +381,22 @@ func handleSyncOpResponse(ctx *downloaderContext, config types.DownloaderConfig,
 
 // cloud storage interface functions/APIs
 func constructDatastoreContext(ctx *downloaderContext, configName string, NameIsURL bool, dst types.DatastoreConfig) (*types.DatastoreContext, error) {
+	var err error
 	dpath := dst.Dpath
 	downloadURL := configName
 	if !NameIsURL {
 		downloadURL = dst.Fqdn
 		if len(dpath) > 0 {
-			downloadURL = downloadURL + "/" + dpath
+			downloadURL, err = url.JoinPath(downloadURL, dpath)
+			if err != nil {
+				return nil, err
+			}
 		}
 		if len(configName) > 0 {
-			downloadURL = downloadURL + "/" + configName
+			downloadURL, err = url.JoinPath(downloadURL, configName)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 

pkg/pillar/go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.5.0
 	github.com/lf-edge/edge-containers v0.0.0-20251107072102-46bed3192170
 	github.com/lf-edge/eve-api/go v0.0.0-20260114160322-5feda2767927
-	github.com/lf-edge/eve-libs v0.0.0-20251217132956-95b6654d8655
+	github.com/lf-edge/eve-libs v0.0.0-20260131092350-2a40e827255e
 	github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d
 	github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56
 	github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20240507172735-6d37353ca1ee

pkg/pillar/go.sum

@@ -586,8 +586,8 @@ github.com/lf-edge/edge-containers v0.0.0-20251107072102-46bed3192170 h1:bzTmpY7
 github.com/lf-edge/edge-containers v0.0.0-20251107072102-46bed3192170/go.mod h1:ta4JI0ank21dn8T1GFZDRLmxVZ6kWVe32cnhKkqMJJQ=
 github.com/lf-edge/eve-api/go v0.0.0-20260114160322-5feda2767927 h1:X+FcGf7U22d4SkCdb3kSwslaM4EENNMNFmlUZiBZSjE=
 github.com/lf-edge/eve-api/go v0.0.0-20260114160322-5feda2767927/go.mod h1:6HxNA/qKJVEqwpuOFkcQ0h3QyotvAs/cjHLC961FPOY=
-github.com/lf-edge/eve-libs v0.0.0-20251217132956-95b6654d8655 h1:3XWIDdz3uCUuDxrpHPlroWJVMI6Dbs17Wn+Bbi64TUs=
-github.com/lf-edge/eve-libs v0.0.0-20251217132956-95b6654d8655/go.mod h1:ltvACFoIkGSeuuK+4Gl5+or3dbIxG2np6K0PQYkk6hU=
+github.com/lf-edge/eve-libs v0.0.0-20260131092350-2a40e827255e h1:i0ic9x/u9PsdVvXvBCGUOJ9LXyw66zfJL9vy54di+UM=
+github.com/lf-edge/eve-libs v0.0.0-20260131092350-2a40e827255e/go.mod h1:ltvACFoIkGSeuuK+4Gl5+or3dbIxG2np6K0PQYkk6hU=
 github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d h1:tUBb9M6u42LXwHAYHyh22wJeUUQlTpDkXwRXalpRqbo=
 github.com/lf-edge/eve/pkg/kube/cnirpc v0.0.0-20240315102754-0f6d1f182e0d/go.mod h1:Nn3juMJJ1G8dyHOebdZyS4jOB/fuxAd5fIajBaWjHr8=
 github.com/lf-edge/go-qemu v0.0.0-20231121152149-4c467eda0c56 h1:LmFp0jbNSwPLuxJA+nQ+mMQrQ53ESkvHP4CVMqR0zrY=

pkg/pillar/vendor/github.com/lf-edge/eve-libs/zedUpload/awsutil/s3sync.go

@@ -898,7 +898,7 @@ github.com/lf-edge/eve-api/go/metrics
 github.com/lf-edge/eve-api/go/nestedappinstancemetrics
 github.com/lf-edge/eve-api/go/profile
 github.com/lf-edge/eve-api/go/register
-# github.com/lf-edge/eve-libs v0.0.0-20251217132956-95b6654d8655
+# github.com/lf-edge/eve-libs v0.0.0-20260131092350-2a40e827255e
 ## explicit; go 1.24.0
 github.com/lf-edge/eve-libs/depgraph
 github.com/lf-edge/eve-libs/nettrace