Append a random suffix to written out plugins so multiple don't clash (#43)

jefferai · web-flow · commit 6d09aa97d90e · 2022-08-10T14:35:10.000-04:00
diff --git a/pluginutil/go.mod b/pluginutil/go.mod
@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	github.com/hashicorp/go-plugin v1.4.3
+	github.com/hashicorp/go-secure-stdlib/base62 v0.1.2
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 )
@@ -14,6 +15,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/hashicorp/go-hclog v1.1.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
diff --git a/pluginutil/go.sum b/pluginutil/go.sum
@@ -56,6 +56,10 @@ github.com/hashicorp/go-hclog v1.1.0 h1:QsGcniKx5/LuX2eYoeL+Np3UKYPNaN7YKpTh29h8
 github.com/hashicorp/go-hclog v1.1.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
 github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng=
+github.com/hashicorp/go-secure-stdlib/base62 v0.1.2/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
diff --git a/pluginutil/pluginutil.go b/pluginutil/pluginutil.go
@@ -15,6 +15,7 @@ import (
 	"strings"
 
 	gp "github.com/hashicorp/go-plugin"
+	"github.com/hashicorp/go-secure-stdlib/base62"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -236,6 +237,7 @@ func CreatePlugin(plugin *PluginInfo, opt ...Option) (interface{}, func() error,
 			return nil, nil, fmt.Errorf("error reading gzip compressed data from reader: %w", err)
 		}
 		buf = uncompBuf.Bytes()
+		name = strings.TrimSuffix(name, ".gz")
 	}
 
 	cleanup := func() error {
@@ -255,8 +257,13 @@ func CreatePlugin(plugin *PluginInfo, opt ...Option) (interface{}, func() error,
 		dir = tmpDir
 	}
 	pluginPath := filepath.Join(dir, name)
+	randSuffix, err := base62.Random(5)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error generating random suffix for plugin execution: %w", err)
+	}
+	pluginPath = fmt.Sprintf("%s-%s", pluginPath, randSuffix)
 	if runtime.GOOS == "windows" {
-		pluginPath += ".exe"
+		pluginPath = fmt.Sprintf("%s.exe", pluginPath)
 	}
 	if err := ioutil.WriteFile(pluginPath, buf, fs.FileMode(0o700)); err != nil {
 		return nil, cleanup, fmt.Errorf("error writing out plugin for execution: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"strings"`
`16`	`16`
`17`	`17`	`gp "github.com/hashicorp/go-plugin"`
	`18`	`+ "github.com/hashicorp/go-secure-stdlib/base62"`
`18`	`19`	`"golang.org/x/crypto/sha3"`
`19`	`20`	`)`
`20`	`21`
`@@ -236,6 +237,7 @@ func CreatePlugin(plugin *PluginInfo, opt ...Option) (interface{}, func() error,`
`236`	`237`	`return nil, nil, fmt.Errorf("error reading gzip compressed data from reader: %w", err)`
`237`	`238`	`}`
`238`	`239`	`buf = uncompBuf.Bytes()`
	`240`	`+ name = strings.TrimSuffix(name, ".gz")`
`239`	`241`	`}`
`240`	`242`
`241`	`243`	`cleanup := func() error {`
`@@ -255,8 +257,13 @@ func CreatePlugin(plugin *PluginInfo, opt ...Option) (interface{}, func() error,`
`255`	`257`	`dir = tmpDir`
`256`	`258`	`}`
`257`	`259`	`pluginPath := filepath.Join(dir, name)`
	`260`	`+ randSuffix, err := base62.Random(5)`
	`261`	`+ if err != nil {`
	`262`	`+ return nil, nil, fmt.Errorf("error generating random suffix for plugin execution: %w", err)`
	`263`	`+ }`
	`264`	`+ pluginPath = fmt.Sprintf("%s-%s", pluginPath, randSuffix)`
`258`	`265`	`if runtime.GOOS == "windows" {`
`259`		`- pluginPath += ".exe"`
	`266`	`+ pluginPath = fmt.Sprintf("%s.exe", pluginPath)`
`260`	`267`	`}`
`261`	`268`	`if err := ioutil.WriteFile(pluginPath, buf, fs.FileMode(0o700)); err != nil {`
`262`	`269`	`return nil, cleanup, fmt.Errorf("error writing out plugin for execution: %w", err)`