-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix Windows FIPS Build * create new file for windows arm * removed build tag * fix buidl tags * fix multiple go build
- Loading branch information
1 parent
34eb700
commit 2cc2c6b
Showing
2 changed files
with
85 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
//go:build fips | ||
// +build fips | ||
|
||
package envoy | ||
|
||
import ( | ||
"errors" | ||
"fmt" | ||
"os" | ||
"os/exec" | ||
"path/filepath" | ||
"time" | ||
) | ||
|
||
func makeBootstrapPipe(bootstrapJSON []byte) (string, error) { | ||
tempFile := filepath.Join(os.TempDir(), | ||
fmt.Sprintf("envoy-%x-bootstrap.json", time.Now().UnixNano()+int64(os.Getpid()))) | ||
|
||
f, err := os.Create(tempFile) | ||
if err != nil { | ||
return tempFile, err | ||
} | ||
|
||
defer f.Close() | ||
f.Write(bootstrapJSON) | ||
f.Sync() | ||
// We can't wait for the process since we need to exec into Envoy before it | ||
// will be able to complete so it will be remain as a zombie until Envoy is | ||
// killed then will be reaped by the init process (pid 0). This is all a bit | ||
// gross but the cleanest workaround I can think of for Envoy 1.10 not | ||
// supporting /dev/fd/<fd> config paths any more. So we are done and leaving | ||
// the child to run it's course without reaping it. | ||
return tempFile, nil | ||
} | ||
|
||
func startProc(binary string, args []string) (p *os.Process, err error) { | ||
if binary, err = exec.LookPath(binary); err == nil { | ||
var procAttr os.ProcAttr | ||
procAttr.Files = []*os.File{os.Stdin, | ||
os.Stdout, os.Stderr} | ||
p, err := os.StartProcess(binary, args, &procAttr) | ||
if err == nil { | ||
return p, nil | ||
} | ||
} | ||
return nil, err | ||
} | ||
|
||
func execEnvoy(binary string, prefixArgs, suffixArgs []string, bootstrapJSON []byte) error { | ||
tempFile, err := makeBootstrapPipe(bootstrapJSON) | ||
if err != nil { | ||
os.RemoveAll(tempFile) | ||
return err | ||
} | ||
// We don't defer a cleanup since we are about to Exec into Envoy which means | ||
// defer will never fire. The child process cleans up for us in the happy | ||
// path. | ||
|
||
// We default to disabling hot restart because it makes it easier to run | ||
// multiple envoys locally for testing without them trying to share memory and | ||
// unix sockets and complain about being different IDs. But if user is | ||
// actually configuring hot-restart explicitly with the --restart-epoch option | ||
// then don't disable it! | ||
disableHotRestart := !hasHotRestartOption(prefixArgs, suffixArgs) | ||
|
||
// First argument needs to be the executable name. | ||
envoyArgs := []string{} | ||
envoyArgs = append(envoyArgs, prefixArgs...) | ||
if disableHotRestart { | ||
envoyArgs = append(envoyArgs, "--disable-hot-restart") | ||
} | ||
envoyArgs = append(envoyArgs, suffixArgs...) | ||
envoyArgs = append(envoyArgs, "--config-path", tempFile) | ||
|
||
// Exec | ||
if proc, err := startProc(binary, envoyArgs); err == nil { | ||
proc.Wait() | ||
} else if err != nil { | ||
return errors.New("Failed to exec envoy: " + err.Error()) | ||
} | ||
|
||
return nil | ||
} |