pyrox.dev
pomerium: 0.28.0 -> 0.29.2 (#397260)
authored by Luke Granger-Brown and committed by GitHub 6259cdcf 697cf894
+25
-22
pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch
+25
-22
pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch
···
1
-
From 54e426127a35ea6c88bf0ba882f97f0712533ef5 Mon Sep 17 00:00:00 2001
1
+
From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001
2
2
From: Morgan Helton <mhelton@gmail.com>
3
3
Date: Sun, 26 May 2024 12:17:01 -0500
4
4
Subject: [PATCH] envoy: allow specification of external binary
5
5
6
6
---
7
-
pkg/envoy/envoy.go | 17 ++++++++++-------
8
-
1 file changed, 10 insertions(+), 7 deletions(-)
7
+
pkg/envoy/envoy.go | 20 ++++++++++++++++----
8
+
1 file changed, 16 insertions(+), 4 deletions(-)
9
9
10
10
diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go
11
-
index 66cf71ae..8d81090e 100644
11
+
index 8224f364..bb8b6506 100644
12
12
--- a/pkg/envoy/envoy.go
13
13
+++ b/pkg/envoy/envoy.go
14
14
@@ -8,9 +8,9 @@ import (
···
22
22
"path/filepath"
23
23
"regexp"
24
24
"strconv"
25
-
@@ -34,8 +34,12 @@ import (
25
+
@@ -35,8 +35,17 @@ import (
26
26
27
27
const (
28
28
configFileName = "envoy-config.yaml"
···
32
32
33
33
+var OverrideEnvoyPath = ""
34
34
+
35
-
type serverOptions struct {
36
-
services string
37
-
logLevel config.LogLevel
38
-
@@ -59,17 +63,16 @@ type Server struct {
35
+
+type serverOptions struct {
36
+
+ services string
37
+
+ logLevel config.LogLevel
38
+
+}
39
+
+
40
+
// A Server is a pomerium proxy implemented via envoy.
41
+
type Server struct {
42
+
ServerOptions
43
+
@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil
44
+
log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
45
+
}
39
46
40
-
// NewServer creates a new server with traffic routed by envoy.
41
-
func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) {
42
-
- if err := preserveRlimitNofile(); err != nil {
43
-
- log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
44
-
- }
47
+
- envoyPath, err := Extract()
45
48
+ envoyPath := OverrideEnvoyPath
46
49
+ wd := filepath.Join(os.TempDir(), workingDirectoryName)
47
-
48
-
- envoyPath, err := Extract()
50
+
+
49
51
+ err := os.MkdirAll(wd, embeddedEnvoyPermissions)
50
52
if err != nil {
51
53
- return nil, fmt.Errorf("extracting envoy: %w", err)
···
53
55
}
54
56
55
57
srv := &Server{
56
-
- wd: path.Dir(envoyPath),
57
-
+ wd: wd,
58
-
builder: builder,
59
-
grpcPort: src.GetConfig().GRPCPort,
60
-
httpPort: src.GetConfig().HTTPPort,
58
+
ServerOptions: options,
59
+
- wd: path.Dir(envoyPath),
60
+
+ wd: wd,
61
+
builder: builder,
62
+
grpcPort: src.GetConfig().GRPCPort,
63
+
httpPort: src.GetConfig().HTTPPort,
61
64
--
62
-
2.47.0
65
+
2.48.1
63
66
+1
-1
pkgs/by-name/po/pomerium/package.json
+1
-1
pkgs/by-name/po/pomerium/package.json
···
43
43
"@types/react-dom": "^17.0.11",
44
44
"@typescript-eslint/eslint-plugin": "^5.10.2",
45
45
"@typescript-eslint/parser": "^5.59.11",
46
-
"esbuild": "^0.21.1",
46
+
"esbuild": "^0.25.0",
47
47
"eslint": "7.32.0",
48
48
"eslint-config-prettier": "^8.3.0",
49
49
"eslint-plugin-react": "^7.28.0",
+3
-3
pkgs/by-name/po/pomerium/package.nix
+3
-3
pkgs/by-name/po/pomerium/package.nix
···
19
19
in
20
20
buildGo123Module rec {
21
21
pname = "pomerium";
22
-
version = "0.28.0";
22
+
version = "0.29.2";
23
23
src = fetchFromGitHub {
24
24
owner = "pomerium";
25
25
repo = "pomerium";
26
26
rev = "v${version}";
27
-
hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s=";
27
+
hash = "sha256-FortINGa0JNUxVeGiJ6i+cbmapMZeCXPY9hWox+Y49o=";
28
28
};
29
29
30
-
vendorHash = "sha256-s6EZUZoGNBpy5RaLAPiCCCVFli+YzZ0PHJ/aH3s4APA=";
30
+
vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q=";
31
31
32
32
ui = mkYarnPackage {
33
33
inherit version;