3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-01 11:26:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

internal/envoy: always extract envoy (#2160)

Browse source
This commit is contained in:
Travis Groth 2021-04-30 15:30:40 -04:00 • committed by GitHub
parent d9cc26a2e0
commit dae1836dff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
internal/envoy/embed.go
View file

@ -1,6 +1,7 @@
package envoy package envoy
import ( import (
"context"
"fmt" "fmt"
"io/fs" "io/fs"
"os" "os"
@ -8,13 +9,16 @@ import (
"github.com/natefinch/atomic" "github.com/natefinch/atomic"
resources "gopkg.in/cookieo9/resources-go.v2" resources "gopkg.in/cookieo9/resources-go.v2"
"github.com/pomerium/pomerium/internal/log"
) )
const embeddedEnvoyPermissions fs.FileMode = 0o700 const embeddedEnvoyPermissions fs.FileMode = 0o700
const embeddedDirectoryPermissions fs.FileMode = 0o755
var embeddedFilesDirectory = filepath.Join(os.TempDir(), "pomerium-embedded-files") var embeddedFilesBaseDirectory = filepath.Join(os.TempDir(), "pomerium-embedded-files")
func extractEmbeddedEnvoy() (outPath string, err error) { func extractEmbeddedEnvoy(ctx context.Context) (outPath string, err error) {
exePath, err := resources.ExecutablePath() exePath, err := resources.ExecutablePath()
if err != nil { if err != nil {
return "", fmt.Errorf("error finding executable path: %w", err) return "", fmt.Errorf("error finding executable path: %w", err)
@ -31,24 +35,23 @@ func extractEmbeddedEnvoy() (outPath string, err error) {
} }
defer rc.Close() defer rc.Close()
err = os.MkdirAll(embeddedFilesDirectory, 0o755) // clean up our base directory before starting
err = os.RemoveAll(embeddedFilesBaseDirectory)
if err != nil { if err != nil {
return "", fmt.Errorf("error creating embedded file directory: (directory=%s): %w", embeddedFilesDirectory, err) return "", fmt.Errorf("error cleaning embedded file directory: (directory=%s): %w", embeddedFilesBaseDirectory, err)
} }
outPath = filepath.Join(embeddedFilesDirectory, "envoy") // create known directory base to clean at startup
err = os.MkdirAll(embeddedFilesBaseDirectory, embeddedDirectoryPermissions)
// skip extraction if we already have it if err != nil {
var zfi os.FileInfo return "", fmt.Errorf("error creating embedded file directory: (directory=%s): %w", embeddedFilesBaseDirectory, err)
if zf, ok := rc.(interface{ FileInfo() os.FileInfo }); ok {
zfi = zf.FileInfo()
if fi, e := os.Stat(outPath); e == nil {
if fi.Size() == zfi.Size() && fi.ModTime() == zfi.ModTime() && zfi.Mode().Perm() == embeddedEnvoyPermissions {
return outPath, nil
}
}
} }
// build a random temp directory inside our base directory to guarantee permissions
tmpDir, err := os.MkdirTemp(embeddedFilesBaseDirectory, "envoy-")
outPath = filepath.Join(tmpDir, "envoy")
log.Info(ctx).Str("path", outPath).Msg("extracting envoy binary")
err = atomic.WriteFile(outPath, rc) err = atomic.WriteFile(outPath, rc)
if err != nil { if err != nil {
return "", fmt.Errorf("error extracting embedded envoy binary to temporary directory (path=%s): %w", outPath, err) return "", fmt.Errorf("error extracting embedded envoy binary to temporary directory (path=%s): %w", outPath, err)
@ -59,9 +62,5 @@ func extractEmbeddedEnvoy() (outPath string, err error) {
return "", fmt.Errorf("error chmoding embedded envoy binary: %w", err) return "", fmt.Errorf("error chmoding embedded envoy binary: %w", err)
} }
if zfi != nil {
_ = os.Chtimes(outPath, zfi.ModTime(), zfi.ModTime())
}
return outPath, nil return outPath, nil
} }

2
internal/envoy/envoy.go
View file

@ -74,7 +74,7 @@ func NewServer(ctx context.Context, src config.Source, grpcPort, httpPort string
return nil, fmt.Errorf("error creating temporary working directory for envoy: %w", err) return nil, fmt.Errorf("error creating temporary working directory for envoy: %w", err)
} }
envoyPath, err := extractEmbeddedEnvoy() envoyPath, err := extractEmbeddedEnvoy(ctx)
if err != nil { if err != nil {
log.Warn(ctx).Err(err).Send() log.Warn(ctx).Err(err).Send()
envoyPath = "envoy" envoyPath = "envoy"