FAB-16110 sanitize pkgID for externalbuilder

replace non-alphanumerics with dash

Change-Id: I099c3dd1eb52091acaf69eb8930a1513aca22d1f
Signed-off-by: Jay Guo <guojiannan1101@gmail.com>

Author: guoger

core/container/externalbuilders/externalbuilders.go

@@ -15,7 +15,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
+	"regexp"
 
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
@@ -100,9 +100,10 @@ type BuildContext struct {
 	LaunchDir  string
 }
 
+var pkgIDreg = regexp.MustCompile("[^a-zA-Z0-9]+")
+
 func NewBuildContext(ccci *ccprovider.ChaincodeContainerInfo, codePackage io.Reader) (*BuildContext, error) {
-	// TODO, investigate if any other characters need sanitizing (we cannot have colons in the go path, for instance)
-	scratchDir, err := ioutil.TempDir("", "fabric-"+strings.ReplaceAll(string(ccci.PackageID), string(os.PathListSeparator), "-"))
+	scratchDir, err := ioutil.TempDir("", "fabric-"+pkgIDreg.ReplaceAllString(string(ccci.PackageID), "-"))
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not create temp dir")
 	}

core/container/externalbuilders/externalbuilders_test.go

@@ -60,17 +60,6 @@ var _ = Describe("Externalbuilders", func() {
 			Expect(err).NotTo(HaveOccurred())
 		})
 
-		Context("when the tmp dir cannot be created", func() {
-			BeforeEach(func() {
-				ccci.PackageID = "/"
-			})
-
-			It("returns an error", func() {
-				_, err := externalbuilders.NewBuildContext(ccci, codePackage)
-				Expect(err).To(MatchError(ContainSubstring("could not create temp dir")))
-			})
-		})
-
 		Context("when the archive cannot be extracted", func() {
 			BeforeEach(func() {
 				var err error
@@ -84,6 +73,16 @@ var _ = Describe("Externalbuilders", func() {
 				Expect(err).To(MatchError(ContainSubstring("could not untar source package")))
 			})
 		})
+
+		Context("when package id contains inappropriate chars", func() {
+			It("replaces them with dash", func() {
+				ccci.PackageID = "i&am/pkg:id"
+
+				buildContext, err := externalbuilders.NewBuildContext(ccci, codePackage)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(buildContext.ScratchDir).To(ContainSubstring("fabric-i-am-pkg-id"))
+			})
+		})
 	})
 
 	Describe("Detector", func() {
@@ -103,17 +102,6 @@ var _ = Describe("Externalbuilders", func() {
 				Expect(instance.(*externalbuilders.Instance).Builder).To(Equal(&externalbuilders.Builder{Location: "testdata"}))
 			})
 
-			Context("when the build context cannot be created", func() {
-				BeforeEach(func() {
-					ccci.PackageID = "/"
-				})
-
-				It("returns an error", func() {
-					_, err := detector.Build(ccci, codePackageBytes)
-					Expect(err).To(MatchError(ContainSubstring("could not create build context")))
-				})
-			})
-
 			Context("when no builder can be found", func() {
 				BeforeEach(func() {
 					detector.Builders = nil