Skip to content

Ocpbugs 92691 CVE 2026 46597 4 13 #16977

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

Open
tonyxrmdavidson wants to merge 2 commits into
base: release-4.13
Choose a base branch
from
+32,301 −10,355
Open

Ocpbugs 92691 CVE 2026 46597 4 13 #16977

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
32763a4
OCPBUGS-92691: CVE-2026-46597 openshift4/ose-console: golang.org/x/cr…
tonyxrmdavidson Aug 13, 2026
33b85bb
OCPBUGS-92691: Fix CI test infrastructure for CVE-2026-46597 patch [o…
tonyxrmdavidson Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions frontend/i18n-scripts/build-i18n.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ set -exuo pipefail

FILE_PATTERN="{!(dist|node_modules)/**/*.{js,jsx,ts,tsx,json},*.{js,jsx,ts,tsx,json}}"

i18next "public/${FILE_PATTERN}" [-oc] -c "./i18next-parser.config.js" -o "public/locales/\$LOCALE/\$NAMESPACE.json"
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
I18NEXT="${SCRIPT_DIR}/../node_modules/.bin/i18next"

"$I18NEXT" "public/${FILE_PATTERN}" [-oc] -c "./i18next-parser.config.js" -o "public/locales/\$LOCALE/\$NAMESPACE.json"

cd packages
for d in */ ; do
i18next "${d}${FILE_PATTERN}" [-oc] -c "../i18next-parser.config.js" -o "${d}locales/\$LOCALE/\$NAMESPACE.json"
"$I18NEXT" "${d}${FILE_PATTERN}" [-oc] -c "../i18next-parser.config.js" -o "${d}locales/\$LOCALE/\$NAMESPACE.json"
done
18 changes: 10 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/rawagner/graphql-transport-ws v0.0.0-20200817140314-dcfbf0388067
github.com/redhat-certification/chart-verifier v0.0.0-20220927162416-f4f07c9860f7
github.com/stretchr/testify v1.8.1
golang.org/x/net v0.5.0
golang.org/x/net v0.25.0
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.11.1
Expand Down Expand Up @@ -88,7 +88,7 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand Down Expand Up @@ -169,12 +169,12 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
Expand Down Expand Up @@ -205,3 +205,5 @@ replace (
github.com/mikefarah/yq/v2 v2.4.1 => github.com/mikefarah/yq/v4 v4.13.2
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc8.0.20190926150303-84373aaa560b
)

replace golang.org/x/crypto => github.com/openshift-sustaining/crypto v0.24.0-sec.3
96 changes: 40 additions & 56 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test-backend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FORMATTABLE=(cmd pkg)
echo "Verifying go deps..."
go mod tidy
go mod vendor
CHANGES=$(git status --porcelain --ignored)
CHANGES=$(git status --porcelain vendor/ go.mod go.sum)
if [ -n "$CHANGES" ] ; then
echo "ERROR: detected vendor inconsistency after 'go mod tidy; go mod vendor':"
echo "$CHANGES"
Expand Down
38 changes: 20 additions & 18 deletions vendor/github.com/google/go-cmp/cmp/compare.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions ...ub.com/google/go-cmp/cmp/export_unsafe.go → ...or/github.com/google/go-cmp/cmp/export.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/google/go-cmp/cmp/export_panic.go
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...-cmp/cmp/internal/value/pointer_unsafe.go → ...ogle/go-cmp/cmp/internal/value/pointer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 0 additions & 34 deletions vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go
View file
Open in desktop

This file was deleted.

Loading