Skip to content

Commit 398312e

Browse files
ci: update core to latest commit in main (#1249)
This PR updates the Pomerium Core to the latest commit in main --------- Co-authored-by: GitHub Actions <apparitor@users.noreply.github.com> Co-authored-by: Caleb Doxsey <caleb@doxsey.net>
1 parent 628aa42 commit 398312e

8 files changed

Lines changed: 4 additions & 51 deletions

File tree

apis/ingress/v1/pomerium_types.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,6 @@ type Authenticate struct {
154154
// +kubebuilder:validation:Format=uri
155155
// +kubebuilder:validation:Pattern=`^https://`
156156
URL string `json:"url"`
157-
// CallbackPath sets the path at which the authenticate service receives callback responses
158-
// from your identity provider. The value must exactly match one of the authorized redirect URIs for the OAuth 2.0 client.
159-
//
160-
// <p>This value is referred to as the redirect_url in the OpenIDConnect and OAuth2 specs.</p>
161-
// <p>Defaults to <code>/oauth2/callback</code></p>
162-
//
163-
// +optional
164-
CallbackPath *string `json:"callbackPath,omitempty"`
165157
}
166158

167159
// Cookie customizes HTTP cookie set by Pomerium.

apis/ingress/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/ingress.pomerium.io_pomerium.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ spec:
5252
Authenticate sets authenticate service parameters.
5353
If not specified, a Pomerium-hosted authenticate service would be used.
5454
properties:
55-
callbackPath:
56-
description: |-
57-
CallbackPath sets the path at which the authenticate service receives callback responses
58-
from your identity provider. The value must exactly match one of the authorized redirect URIs for the OAuth 2.0 client.
59-
60-
<p>This value is referred to as the redirect_url in the OpenIDConnect and OAuth2 specs.</p>
61-
<p>Defaults to <code>/oauth2/callback</code></p>
62-
type: string
6355
url:
6456
description: "AuthenticateURL is a dedicated domain URL\nthe non-authenticated
6557
persons would be referred to.\n\n<p><ul>\n <li>You do not need

deployment.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,6 @@ spec:
194194
Authenticate sets authenticate service parameters.
195195
If not specified, a Pomerium-hosted authenticate service would be used.
196196
properties:
197-
callbackPath:
198-
description: |-
199-
CallbackPath sets the path at which the authenticate service receives callback responses
200-
from your identity provider. The value must exactly match one of the authorized redirect URIs for the OAuth 2.0 client.
201-
202-
<p>This value is referred to as the redirect_url in the OpenIDConnect and OAuth2 specs.</p>
203-
<p>Defaults to <code>/oauth2/callback</code></p>
204-
type: string
205197
url:
206198
description: "AuthenticateURL is a dedicated domain URL\nthe non-authenticated
207199
persons would be referred to.\n\n<p><ul>\n <li>You do not need

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/iancoleman/strcase v0.3.0
1717
github.com/martinlindhe/base36 v1.1.1
1818
github.com/open-policy-agent/opa v1.9.0
19-
github.com/pomerium/pomerium v0.28.1-0.20251007155422-042219ff894b
19+
github.com/pomerium/pomerium v0.28.1-0.20251010012545-df8c257314b1
2020
github.com/rs/zerolog v1.34.0
2121
github.com/sergi/go-diff v1.4.0
2222
github.com/spf13/cobra v1.10.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,8 @@ github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 h1:3YQY1sb5
693693
github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524/go.mod h1:7fGbUYJnU8RcxZJvUvhukOIBv1G7LWDAHMfDxAf5+Y0=
694694
github.com/pomerium/envoy-custom v1.35.3-rc3 h1:9K4+Wc5bGbFfqTi+hB1zYj3fRUVokEXg8KjZWuUVtes=
695695
github.com/pomerium/envoy-custom v1.35.3-rc3/go.mod h1:+wpbZvum83bq/OD4cp9/8IZiMV6boBkwDhlFPLOoWoI=
696-
github.com/pomerium/pomerium v0.28.1-0.20251007155422-042219ff894b h1:9nOfbtaGvSLDsdmBQ0d2+cEgCaUcZ33oRmg2CXX2bI0=
697-
github.com/pomerium/pomerium v0.28.1-0.20251007155422-042219ff894b/go.mod h1:AWEpe+2WpneQDxxA84/Aw+v47bOJkZJjBFVJ4U/OQSU=
696+
github.com/pomerium/pomerium v0.28.1-0.20251010012545-df8c257314b1 h1:0PUGuqfN2EA054elebAchVVizySvlg4I8Ol792Ad4io=
697+
github.com/pomerium/pomerium v0.28.1-0.20251010012545-df8c257314b1/go.mod h1:AWEpe+2WpneQDxxA84/Aw+v47bOJkZJjBFVJ4U/OQSU=
698698
github.com/pomerium/protoutil v0.0.0-20240813175624-47b7ac43ff46 h1:NRTg8JOXCxcIA1lAgD74iYud0rbshbWOB3Ou4+Huil8=
699699
github.com/pomerium/protoutil v0.0.0-20240813175624-47b7ac43ff46/go.mod h1:QqZmx6ZgPxz18va7kqoT4t/0yJtP7YFIDiT/W2n2fZ4=
700700
github.com/pomerium/webauthn v0.0.0-20240603205124-0428df511172 h1:TqoPqRgXSHpn+tEJq6H72iCS5pv66j3rPprThUEZg0E=

pomerium/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ func applyCerts(_ context.Context, p *pb.Config, c *model.Config) error {
266266
func applyAuthenticate(_ context.Context, p *pb.Config, c *model.Config) error {
267267
if c.Spec.Authenticate == nil {
268268
p.Settings.AuthenticateServiceUrl = proto.String("https://authenticate.pomerium.app")
269-
p.Settings.AuthenticateCallbackPath = proto.String("/oauth2/callback")
270269
return nil
271270
}
272271

@@ -275,7 +274,6 @@ func applyAuthenticate(_ context.Context, p *pb.Config, c *model.Config) error {
275274
return fmt.Errorf("parsing %s: %w", c.Spec.Authenticate.URL, err)
276275
}
277276
p.Settings.AuthenticateServiceUrl = &c.Spec.Authenticate.URL
278-
p.Settings.AuthenticateCallbackPath = c.Spec.Authenticate.CallbackPath
279277

280278
return nil
281279
}

reference.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -454,22 +454,6 @@ Authenticate sets authenticate service parameters. If not specified, a Pomerium-
454454
</thead>
455455
<tbody>
456456

457-
<tr>
458-
<td>
459-
<p>
460-
<code>callbackPath</code>&#160;&#160;
461-
462-
<strong>string</strong>&#160;
463-
464-
</p>
465-
<p>
466-
467-
CallbackPath sets the path at which the authenticate service receives callback responses from your identity provider. The value must exactly match one of the authorized redirect URIs for the OAuth 2.0 client. <p>This value is referred to as the redirect_url in the OpenIDConnect and OAuth2 specs.</p> <p>Defaults to <code>/oauth2/callback</code></p>
468-
</p>
469-
470-
</td>
471-
</tr>
472-
473457
<tr>
474458
<td>
475459
<p>

0 commit comments

Comments
 (0)