2af6db672e
This is effectively a revert of 2ac9968401, which
switched from os/exec to the golang.org/x/sys/execabs package to mitigate
security issues (mainly on Windows) with lookups resolving to binaries in the
current directory.
from the go1.19 release notes https://go.dev/doc/go1.19#os-exec-path
> ## PATH lookups
>
> Command and LookPath no longer allow results from a PATH search to be found
> relative to the current directory. This removes a common source of security
> problems but may also break existing programs that depend on using, say,
> exec.Command("prog") to run a binary named prog (or, on Windows, prog.exe) in
> the current directory. See the os/exec package documentation for information
> about how best to update such programs.
>
> On Windows, Command and LookPath now respect the NoDefaultCurrentDirectoryInExePath
> environment variable, making it possible to disable the default implicit search
> of “.” in PATH lookups on Windows systems.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
54 lines
1.4 KiB
Go
54 lines
1.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 process
|
|
|
|
import (
|
|
"net/url"
|
|
"os"
|
|
"os/exec"
|
|
)
|
|
|
|
// NewBinaryCmd returns a Cmd to be used to start a logging binary.
|
|
// The Cmd is generated from the provided uri, and the container ID and
|
|
// namespace are appended to the Cmd environment.
|
|
func NewBinaryCmd(binaryURI *url.URL, id, ns string) *exec.Cmd {
|
|
var args []string
|
|
for k, vs := range binaryURI.Query() {
|
|
args = append(args, k)
|
|
if len(vs) > 0 {
|
|
args = append(args, vs[0])
|
|
}
|
|
}
|
|
|
|
cmd := exec.Command(binaryURI.Path, args...)
|
|
|
|
cmd.Env = append(cmd.Env,
|
|
"CONTAINER_ID="+id,
|
|
"CONTAINER_NAMESPACE="+ns,
|
|
)
|
|
|
|
return cmd
|
|
}
|
|
|
|
// CloseFiles closes any files passed in.
|
|
// It it used for cleanup in the event of unexpected errors.
|
|
func CloseFiles(files ...*os.File) {
|
|
for _, file := range files {
|
|
file.Close()
|
|
}
|
|
}
|