
Go 1.15.7 contained a security fix for CVE-2021-3115, which allowed arbitrary code to be executed at build time when using cgo on Windows. This issue also affects Unix users who have “.” listed explicitly in their PATH and are running “go get” outside of a module or with module mode disabled. This issue is not limited to the go command itself, and can also affect binaries that use `os.Command`, `os.LookPath`, etc. From the related blogpost (ttps://blog.golang.org/path-security): > Are your own programs affected? > > If you use exec.LookPath or exec.Command in your own programs, you only need to > be concerned if you (or your users) run your program in a directory with untrusted > contents. If so, then a subprocess could be started using an executable from dot > instead of from a system directory. (Again, using an executable from dot happens > always on Windows and only with uncommon PATH settings on Unix.) > > If you are concerned, then we’ve published the more restricted variant of os/exec > as golang.org/x/sys/execabs. You can use it in your program by simply replacing This patch replaces all uses of `os/exec` with `golang.org/x/sys/execabs`. While some uses of `os/exec` should not be problematic (e.g. part of tests), it is probably good to be consistent, in case code gets moved around. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
165 lines
3.4 KiB
Go
165 lines
3.4 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package diff
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
|
|
winio "github.com/Microsoft/go-winio"
|
|
"github.com/gogo/protobuf/proto"
|
|
"github.com/gogo/protobuf/types"
|
|
"github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
exec "golang.org/x/sys/execabs"
|
|
)
|
|
|
|
const processorPipe = "STREAM_PROCESSOR_PIPE"
|
|
|
|
// NewBinaryProcessor returns a binary processor for use with processing content streams
|
|
func NewBinaryProcessor(ctx context.Context, imt, rmt string, stream StreamProcessor, name string, args, env []string, payload *types.Any) (StreamProcessor, error) {
|
|
cmd := exec.CommandContext(ctx, name, args...)
|
|
cmd.Env = os.Environ()
|
|
cmd.Env = append(cmd.Env, env...)
|
|
|
|
if payload != nil {
|
|
data, err := proto.Marshal(payload)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
up, err := getUiqPath()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
path := fmt.Sprintf("\\\\.\\pipe\\containerd-processor-%s-pipe", up)
|
|
l, err := winio.ListenPipe(path, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
go func() {
|
|
defer l.Close()
|
|
conn, err := l.Accept()
|
|
if err != nil {
|
|
logrus.WithError(err).Error("accept npipe connection")
|
|
return
|
|
}
|
|
io.Copy(conn, bytes.NewReader(data))
|
|
conn.Close()
|
|
}()
|
|
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", processorPipe, path))
|
|
}
|
|
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", mediaTypeEnvVar, imt))
|
|
var (
|
|
stdin io.Reader
|
|
closer func() error
|
|
err error
|
|
)
|
|
if f, ok := stream.(RawProcessor); ok {
|
|
stdin = f.File()
|
|
closer = f.File().Close
|
|
} else {
|
|
stdin = stream
|
|
}
|
|
cmd.Stdin = stdin
|
|
r, w, err := os.Pipe()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cmd.Stdout = w
|
|
stderr := bytes.NewBuffer(nil)
|
|
cmd.Stderr = stderr
|
|
|
|
if err := cmd.Start(); err != nil {
|
|
return nil, err
|
|
}
|
|
p := &binaryProcessor{
|
|
cmd: cmd,
|
|
r: r,
|
|
mt: rmt,
|
|
stderr: stderr,
|
|
}
|
|
go p.wait()
|
|
|
|
// close after start and dup
|
|
w.Close()
|
|
if closer != nil {
|
|
closer()
|
|
}
|
|
return p, nil
|
|
}
|
|
|
|
type binaryProcessor struct {
|
|
cmd *exec.Cmd
|
|
r *os.File
|
|
mt string
|
|
stderr *bytes.Buffer
|
|
|
|
mu sync.Mutex
|
|
err error
|
|
}
|
|
|
|
func (c *binaryProcessor) Err() error {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
return c.err
|
|
}
|
|
|
|
func (c *binaryProcessor) wait() {
|
|
if err := c.cmd.Wait(); err != nil {
|
|
if _, ok := err.(*exec.ExitError); ok {
|
|
c.mu.Lock()
|
|
c.err = errors.New(c.stderr.String())
|
|
c.mu.Unlock()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *binaryProcessor) File() *os.File {
|
|
return c.r
|
|
}
|
|
|
|
func (c *binaryProcessor) MediaType() string {
|
|
return c.mt
|
|
}
|
|
|
|
func (c *binaryProcessor) Read(p []byte) (int, error) {
|
|
return c.r.Read(p)
|
|
}
|
|
|
|
func (c *binaryProcessor) Close() error {
|
|
err := c.r.Close()
|
|
if kerr := c.cmd.Process.Kill(); err == nil {
|
|
err = kerr
|
|
}
|
|
return err
|
|
}
|
|
|
|
func getUiqPath() (string, error) {
|
|
dir, err := ioutil.TempDir("", "")
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
os.Remove(dir)
|
|
return filepath.Base(dir), nil
|
|
}
|