mirror of
https://github.com/golang/go
synced 2024-11-23 10:20:03 -07:00
syscall: do not change stdio handle inheritance
Before the CL 288297 all Go process handles had to be made non-inheritable - otherwise they would escape into the child process. But now this is not necessary. This CL stops changing inheritance flag of stdint, stdout and stderr handles. Fixes #44876 Change-Id: Ib8fcf8066c30282293d96c34486b01b4c04f7116 Reviewed-on: https://go-review.googlesource.com/c/go/+/316269 Trust: Alex Brainman <alex.brainman@gmail.com> Trust: Jason A. Donenfeld <Jason@zx2c4.com> Run-TryBot: Alex Brainman <alex.brainman@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
parent
9d0819b27c
commit
4c8f48ed4f
@ -472,7 +472,6 @@ var (
|
|||||||
|
|
||||||
func getStdHandle(h int) (fd Handle) {
|
func getStdHandle(h int) (fd Handle) {
|
||||||
r, _ := GetStdHandle(h)
|
r, _ := GetStdHandle(h)
|
||||||
CloseOnExec(r)
|
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,8 +5,12 @@
|
|||||||
package syscall_test
|
package syscall_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
|
"internal/testenv"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
@ -71,3 +75,64 @@ func TestTOKEN_ALL_ACCESS(t *testing.T) {
|
|||||||
t.Errorf("TOKEN_ALL_ACCESS = %x, want 0xF01FF", syscall.TOKEN_ALL_ACCESS)
|
t.Errorf("TOKEN_ALL_ACCESS = %x, want 0xF01FF", syscall.TOKEN_ALL_ACCESS)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStdioAreInheritable(t *testing.T) {
|
||||||
|
testenv.MustHaveGoBuild(t)
|
||||||
|
testenv.MustHaveExecPath(t, "gcc")
|
||||||
|
|
||||||
|
tmpdir := t.TempDir()
|
||||||
|
|
||||||
|
// build go dll
|
||||||
|
const dlltext = `
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "C"
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
//export HelloWorld
|
||||||
|
func HelloWorld() {
|
||||||
|
fmt.Println("Hello World")
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {}
|
||||||
|
`
|
||||||
|
dllsrc := filepath.Join(tmpdir, "helloworld.go")
|
||||||
|
err := os.WriteFile(dllsrc, []byte(dlltext), 0644)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
dll := filepath.Join(tmpdir, "helloworld.dll")
|
||||||
|
cmd := exec.Command(testenv.GoToolPath(t), "build", "-o", dll, "-buildmode", "c-shared", dllsrc)
|
||||||
|
out, err := testenv.CleanCmdEnv(cmd).CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to build go library: %s\n%s", err, out)
|
||||||
|
}
|
||||||
|
|
||||||
|
// run powershell script
|
||||||
|
psscript := fmt.Sprintf(`
|
||||||
|
hostname;
|
||||||
|
$signature = " [DllImport("%q")] public static extern void HelloWorld(); ";
|
||||||
|
Add-Type -MemberDefinition $signature -Name World -Namespace Hello;
|
||||||
|
[Hello.World]::HelloWorld();
|
||||||
|
hostname;
|
||||||
|
`, dll)
|
||||||
|
psscript = strings.ReplaceAll(psscript, "\n", "")
|
||||||
|
out, err = exec.Command("powershell", "-Command", psscript).CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Powershell command failed: %v: %v", err, string(out))
|
||||||
|
}
|
||||||
|
|
||||||
|
hostname, err := os.Hostname()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
have := strings.ReplaceAll(string(out), "\n", "")
|
||||||
|
have = strings.ReplaceAll(have, "\r", "")
|
||||||
|
want := fmt.Sprintf("%sHello World%s", hostname, hostname)
|
||||||
|
if have != want {
|
||||||
|
t.Fatalf("Powershell command output is wrong: got %q, want %q", have, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user