Skip to content
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.

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

1.9 CVE fix #6774

Merged
merged 11 commits into from
Jul 27, 2022
Merged

1.9 CVE fix #6774

merged 11 commits into from
Jul 27, 2022

Conversation

Bslabe123
Copy link
Contributor

@Bslabe123 Bslabe123 commented Jul 20, 2022

Description

Fixes for GHSA-3wx7-46ch-7rq2, GHSA-vc3p-29h2-gpcp and GHSA-3wx7-46ch-7rq2

Checklist:

  • I included a concise, user-facing changelog (for details, see https://github.com/solo-io/go-utils/tree/master/changelogutils) which references the issue that is resolved.
  • If I updated APIs (our protos) or helm values, I ran make -B install-go-tools generated-code to ensure there will be no code diff
  • I followed guidelines laid out in the Gloo Edge contribution guide
  • I opened a draft PR or added the work in progress label if my PR is not ready for review
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works

@Bslabe123 Bslabe123 changed the base branch from master to v1.9.x July 20, 2022 15:09
@ianmacclancy
Copy link
Contributor

Failure in Ci
https://storage.googleapis.com/solo-public-build-logs/logs.html?buildid=c7198ad5-3930-417d-87b6-89b770d592ac

This looks like a go version issue

Step #10 - "test": Failed to compile test: Step #10 - "test": Step #10 - "test": # golang.org/x/net/http2 Step #10 - "test": /go/pkg/mod/golang.org/x/net@v0.0.0-20211209124913-491a49abca63/http2/transport.go:417:45: undefined: os.ErrDeadlineExceeded Step #10 - "test": Step #10 - "test": Ginkgo ran 2 suites in 39.281033077s Step #10 - "test": Test Suite Failed Step #10 - "test": Step #10 - "test": �[38;5;228mGinkgo 2.0 is coming soon!�[0m

/kick

@inFocus7
Copy link
Contributor

inFocus7 commented Jul 26, 2022

/kick (A just-in-case, while looking into it some more.)


Agree(d) with Ian after I saw this post.

Although weirdly enough, it looks like gloo 1.10 did this net bump as well and passed. From what I saw, both use go1.16.3 (based on searching in their repos), so I'm confused on what the difference would be...

Update:

  • v1.10.x uses e2e-go-mod-ginkgo:0.4.15 which uses go1.16.3.
  • v1.9.x uses e2e-go-mod-ginkgo:0.2.1 which uses go1.13.4.

I'll check golang updates to see where os.ErrDeadlineExceeded was introduced and get the e2e-go-mod-ginkgo closest in versioning to the current one, but safest/easiest bet would be to use e2e-go-mod-ginkgo:0.4.15.

Update 2
Introduced in go1.15; yeah we should bump the e2e-go-mod-ginkgo.
golang/go@d422f54

Makefile Outdated Show resolved Hide resolved
Copy link
Contributor

@sam-heilbron sam-heilbron left a comment

Choose a reason for hiding this comment

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

Can we also bump go-utils to pull in the fix for the logging npe if it's affected (solo-io/go-utils#487)

In the original PR that bumped go-utils to pull in the logging handler npe fix (#6709), I added logic to one of our kube2e tests to hit the logging endpoint. The idea was that this test will only pass if the request can be made. Since it's recommended in our production docs I think it's valuable that we have automated testing to confirm that it works. Can we add the same check to this branch as well?

@Bslabe123 Bslabe123 marked this pull request as ready for review July 27, 2022 15:59
@Bslabe123 Bslabe123 requested a review from a team as a code owner July 27, 2022 15:59
Copy link
Contributor

@ianmacclancy ianmacclancy left a comment

Choose a reason for hiding this comment

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

LGTM

@soloio-bulldozer soloio-bulldozer bot merged commit d02592f into v1.9.x Jul 27, 2022
@soloio-bulldozer soloio-bulldozer bot deleted the cve-1.9 branch July 27, 2022 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants