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

Bug 1844990: Bump GoLang to 1.15 for improved TLS Security #2303

Merged
merged 3 commits into from Jan 4, 2021

Conversation

darkmuggle
Copy link
Contributor

@darkmuggle darkmuggle commented Dec 15, 2020

This change is needed in order to fix CVE-2016-2183.

With [1] TLS 1.3 is on-by-default which improves the security posture of
the MCO.

[1] golang/go#30055

Signed-off-by: Ben Howard ben.howard@redhat.com

@darkmuggle darkmuggle changed the title GoLang: Bump from 1.13 to 1.15 Disable insecure ciphers and bump Go to 1.15 Dec 15, 2020
@darkmuggle
Copy link
Contributor Author

/retest

@darkmuggle
Copy link
Contributor Author

/retest

Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

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

Do we have to change here too @sinnykumari :

BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang >= 1.13}

Admittedly, I'm not super knowledgeable about this go-bump... would probably perfer @runcom to take a look next week if there's time before the merge.

@@ -60,12 +60,23 @@ func NewAPIServer(a *APIHandler, p int, is bool, c, k string) *APIServer {

// Serve launches the API Server.
func (a *APIServer) Serve() {
Copy link
Contributor

Choose a reason for hiding this comment

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

can these code changes be broken out into a separate commit from the go upgrade?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I literally just pushed that commit :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated the machines-config-daemon.spec too -- it would be required.

Copy link
Member

Choose a reason for hiding this comment

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

That file is dead btw, the MCD isn't part of RHCOS anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought the spec file was dead, but wasn't 100% sure.

Copy link
Contributor

Choose a reason for hiding this comment

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

I literally just pushed that commit :)

great minds!

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah as Colin said we no longer need and build machine-config-daemon rpm package. Even if someone wants to build m-c-d rpm package it will build fine with 1.13 because the current 1.15 requirement is added mainly to MCS.

@darkmuggle
Copy link
Contributor Author

darkmuggle commented Dec 15, 2020

Admittedly, I'm not super knowledgeable about this go-bump... would probably perfer @runcom to take a look next week if there's time before the merge.

I spent the better part of an afternoon evaluating whether bumping the GoLang version was the better path to resolving the CVE. I concluded that moving to Go1.15 was better due to:

@yuqi-zhang
Copy link
Contributor

Should also do the equivalent of this: openshift/release#8148 I believe

@darkmuggle
Copy link
Contributor Author

openshift/release#14355 filed for the CI change.

@darkmuggle
Copy link
Contributor Author

/retest

1 similar comment
@darkmuggle
Copy link
Contributor Author

/retest

Ben Howard added 2 commits December 16, 2020 15:55
@darkmuggle darkmuggle changed the title Disable insecure ciphers and bump Go to 1.15 Bump GoLang to 1.15 for improved TLS Security Dec 16, 2020
@darkmuggle
Copy link
Contributor Author

I dropped the TLS config for now. Turns out there is no easy way to have HTTP/2 and provide a list of approved ciphers. However, since we are using TLS and HTTP/2 only approved ciphers are allowed so this will drop the SHA hashing and 3DES ciphers.

@darkmuggle
Copy link
Contributor Author

/retest

@openshift-merge-robot
Copy link
Contributor

@darkmuggle: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws 5aba0a9 link /test e2e-aws
ci/prow/okd-e2e-aws 5aba0a9 link /test okd-e2e-aws

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/test-infra repository. I understand the commands that are listed here.

@sinnykumari
Copy link
Contributor

sinnykumari commented Dec 17, 2020

Too get this into 4.7, we will need a bug for go 1.15 version bump.
LGTM.
/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 17, 2020
@darkmuggle
Copy link
Contributor Author

/retest

@darkmuggle darkmuggle changed the title Bump GoLang to 1.15 for improved TLS Security Bugzilla 1844990: Bump GoLang to 1.15 for improved TLS Security Dec 21, 2020
@sinnykumari
Copy link
Contributor

/retest

@darkmuggle
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@darkmuggle: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

/bugzilla refresh

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/test-infra repository.

@darkmuggle darkmuggle changed the title Bugzilla 1844990: Bump GoLang to 1.15 for improved TLS Security Bug 1844990: Bump GoLang to 1.15 for improved TLS Security Jan 4, 2021
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 4, 2021
@openshift-ci-robot
Copy link
Contributor

@darkmuggle: This pull request references Bugzilla bug 1844990, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1844990: Bump GoLang to 1.15 for improved TLS Security

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/test-infra repository.

@darkmuggle
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@darkmuggle: This pull request references Bugzilla bug 1844990, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

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/test-infra repository.

Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: darkmuggle, sinnykumari, yuqi-zhang

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 [sinnykumari,yuqi-zhang]

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

@openshift-merge-robot openshift-merge-robot merged commit d00d93c into openshift:master Jan 4, 2021
@openshift-ci-robot
Copy link
Contributor

@darkmuggle: All pull requests linked via external trackers have merged:

Bugzilla bug 1844990 has been moved to the MODIFIED state.

In response to this:

Bug 1844990: Bump GoLang to 1.15 for improved TLS Security

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants