Fix for CVE-2024-45338 and CVE-2024-45337

[joelsmith]

This is an downstream cherry-pick of part of kedacore#6434 and all of kedacore#6422

[maxcao13]

/lgtm

Thanks!

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelsmith, maxcao13

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [joelsmith,maxcao13]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 3e95299 and 2 for PR HEAD d5ab156 in total

[joelsmith]

It seems doubtful that the Prometheus metrics test would be affected by this change. I hate to think our tests have gotten flaky....

/retest

[joelsmith]

/retest

[prozehna]

AFAIK the test that failed was the OVN, not prometheus.
/retest-required

[maxcao13]

Maybe it's failing cause of some change in openshift 4.19? I also find it hard to believe that these changes would affect the keda tests.

https://prow.ci.openshift.org/job-history/gs/test-platform-results/pr-logs/directory/pull-ci-openshift-kedacore-keda-main-keda-e2e-aws-ovn
Doesn't seem like we've tested on 4.19 prior to this (other than your closed PR, but that had the same failure...), and I don't think we've had nightlies for a long time since we cut off cpaas.

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 3e95299 and 2 for PR HEAD d5ab156 in total

[joelsmith]

Maybe it's failing cause of some change in openshift 4.19? I also find it hard to believe that these changes would affect the keda tests.

I think you are probably correct. Across the 6 runs of keda-e2e-aws-ovn, I counted 3 failures in TestPrometheusMetrics, 2 failures in the Kafka tests (TestScaler) and 1 failure in the cache_metrics_scaler (TestScaler). Each run had only one failure. So it seems likely that some change in 4.19 is causing the cluster to be less responsive, or for the CI environment to be overloaded, or something similar which would cause flakiness without being related to our specific test cases.

/retest

[joelsmith]

The installer failed on the last one. Maybe we need to ask for a test bypass.

/retest

[openshift-ci]

@joelsmith: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/keda-e2e-aws-ovn	d5ab156	link	true	/test keda-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.