Fix CVE 22868 and 22869

[xuezhaojun]

Related Bug: https://issues.redhat.com/browse/ACM-19160

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xuezhaojun

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [xuezhaojun]

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

[xuezhaojun]

/cherry-pick backplane-2.7

[openshift-cherrypick-robot]

@xuezhaojun: #320 failed to apply on top of branch "backplane-2.7":

Applying: Shift service-proxy url from ExternalName to hostalais. (#317)
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/userserver/user_server.go
M	vendor/golang.org/x/oauth2/internal/client_appengine.go
M	vendor/golang.org/x/oauth2/oauth2.go
A	vendor/golang.org/x/oauth2/pkce.go
M	vendor/golang.org/x/oauth2/token.go
M	vendor/google.golang.org/appengine/internal/api.go
M	vendor/google.golang.org/appengine/internal/api_classic.go
M	vendor/google.golang.org/appengine/internal/api_common.go
M	vendor/google.golang.org/appengine/internal/identity.go
M	vendor/google.golang.org/appengine/internal/identity_classic.go
M	vendor/google.golang.org/appengine/internal/identity_flex.go
M	vendor/google.golang.org/appengine/internal/identity_vm.go
M	vendor/google.golang.org/appengine/internal/main.go
M	vendor/google.golang.org/appengine/internal/main_vm.go
M	vendor/google.golang.org/appengine/internal/transaction.go
M	vendor/google.golang.org/appengine/urlfetch/urlfetch.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
CONFLICT (modify/delete): vendor/google.golang.org/appengine/urlfetch/urlfetch.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/urlfetch/urlfetch.go left in tree.
Removing vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.proto
Removing vendor/google.golang.org/appengine/internal/urlfetch/urlfetch_service.pb.go
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/transaction.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/transaction.go left in tree.
Removing vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto
Removing vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go
Removing vendor/google.golang.org/appengine/internal/regen.sh
Removing vendor/google.golang.org/appengine/internal/net.go
Removing vendor/google.golang.org/appengine/internal/metadata.go
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/main_vm.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/main_vm.go left in tree.
Removing vendor/google.golang.org/appengine/internal/main_common.go
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/main.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/main.go left in tree.
Removing vendor/google.golang.org/appengine/internal/log/log_service.proto
Removing vendor/google.golang.org/appengine/internal/log/log_service.pb.go
Removing vendor/google.golang.org/appengine/internal/internal.go
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/identity_vm.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/identity_vm.go left in tree.
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/identity_flex.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/identity_flex.go left in tree.
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/identity_classic.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/identity_classic.go left in tree.
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/identity.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/identity.go left in tree.
Removing vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto
Removing vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go
Removing vendor/google.golang.org/appengine/internal/base/api_base.proto
Removing vendor/google.golang.org/appengine/internal/base/api_base.pb.go
Removing vendor/google.golang.org/appengine/internal/app_id.go
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/api_common.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/api_common.go left in tree.
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/api_classic.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/api_classic.go left in tree.
CONFLICT (modify/delete): vendor/google.golang.org/appengine/internal/api.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/google.golang.org/appengine/internal/api.go left in tree.
Removing vendor/google.golang.org/appengine/LICENSE
Auto-merging vendor/golang.org/x/oauth2/token.go
CONFLICT (modify/delete): vendor/golang.org/x/oauth2/pkce.go deleted in HEAD and modified in Shift service-proxy url from ExternalName to hostalais. (#317). Version Shift service-proxy url from ExternalName to hostalais. (#317) of vendor/golang.org/x/oauth2/pkce.go left in tree.
Auto-merging vendor/golang.org/x/oauth2/oauth2.go
CONFLICT (modify/delete): vendor/golang.org/x/oauth2/internal/client_appengine.go deleted in Shift service-proxy url from ExternalName to hostalais. (#317) and modified in HEAD. Version HEAD of vendor/golang.org/x/oauth2/internal/client_appengine.go left in tree.
Auto-merging pkg/userserver/user_server.go
CONFLICT (content): Merge conflict in pkg/userserver/user_server.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Shift service-proxy url from ExternalName to hostalais. (#317)

Details

In response to this:

/cherry-pick backplane-2.7

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.