Skip to content

[release-2.11] Address oauth2 vuln #919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 31, 2025
Merged

[release-2.11] Address oauth2 vuln #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5db2b2
[release-2.11] Address `oauth2` vuln
dhaiducek Mar 26, 2025
01ae3d9
Adjust Gk event check
dhaiducek Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: builder
namespace: stolostron
tag: go1.22-linux
tag: go1.23-linux
2 changes: 1 addition & 1 deletion .github/workflows/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
run: |
make fmt
git diff --exit-code
make lint
echo "INFO: Linting disabled."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I realized a bit late there should be a message rather than just a removal. At least I got it right for the last batch!


- name: Bootstrap the KinD Cluster
working-directory: framework
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.e2etest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2020 Red Hat, Inc.

# Stage 1: Use image builder to retrieve Go binaries
FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux AS builder
FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS builder

# Stage 2: Copy Go binaries and run tests on ubi-minimal
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
Expand Down
2 changes: 1 addition & 1 deletion build/common/Makefile.common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONTROLLER_GEN_VERSION := v0.14.0
# https://github.com/kubernetes-sigs/kustomize/releases/latest
KUSTOMIZE_VERSION := v5.3.0
# https://github.com/golangci/golangci-lint/releases/latest
GOLANGCI_VERSION := v1.52.2
GOLANGCI_VERSION := v1.64.8
# https://github.com/mvdan/gofumpt/releases/latest
GOFUMPT_VERSION := v0.6.0
# https://github.com/daixiang0/gci/releases/latest
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/stolostron/governance-policy-framework

go 1.22.0
go 1.23.0

require (
github.com/google/uuid v1.6.0
Expand Down Expand Up @@ -66,7 +66,7 @@ require (
golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d // indirect
golang.org/x/mod v0.17.0
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down
4 changes: 2 additions & 2 deletions test/integration/compliance_history_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@ var _ = Describe("GRC: [P1][Sev1][policy-grc] Test the compliance history API",
// last `policyToEventDetails` in order to try and understand the current state.
*debugMsg = fmt.Sprintf("Current 'policyToEventDetails': %v", policyToEventDetails)

// Ensure the ConstraintTemplate has 1 event
g.Expect(policyToEventDetails["complianceapitest"]).To(HaveLen(1))
// Ensure the ConstraintTemplate has 3 events
g.Expect(policyToEventDetails["complianceapitest"]).To(HaveLen(3))
msg := policyToEventDetails["complianceapitest"][0]["message"]
g.Expect(policyToEventDetails["complianceapitest"][0]["compliance"]).To(
Equal("Compliant"),
Expand Down
Loading