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

chore: update Kex-Algorithms #9561

Merged
merged 2 commits into from
Jun 5, 2022
Merged

Conversation

34fathombelow
Copy link
Member

Signed-off-by: douhunt douhunt@protonmail.com

Part 1 of 3 to upgrade base image to Ubuntu:22.04
This must be merged before #9551 and cherry-picked into 2.4

Upgraded golang.org/x/crypto libraries to support diffie-hellman-group14-sha256. I also removed two Kex-Algorithms which should no longer be used for security reasons. This may cause some breakage for a very very small group of users. I would also recommend removing diffie-hellman-group14-sha1 in the very near future (v2.5) and give users plenty of warning.
Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Signed-off-by: douhunt <douhunt@protonmail.com>
@codecov
Copy link

codecov bot commented Jun 1, 2022

Codecov Report

Merging #9561 (728a492) into master (5edaa6c) will decrease coverage by 0.07%.
The diff coverage is 40.38%.

@@            Coverage Diff             @@
##           master    #9561      +/-   ##
==========================================
- Coverage   45.86%   45.79%   -0.08%     
==========================================
  Files         221      222       +1     
  Lines       26309    26377      +68     
==========================================
+ Hits        12067    12079      +12     
- Misses      12586    12650      +64     
+ Partials     1656     1648       -8     
Impacted Files Coverage Δ
controller/appcontroller.go 52.07% <0.00%> (-0.21%) ⬇️
util/argo/managedfields/parser.go 100.00% <ø> (ø)
util/git/ssh.go 0.00% <ø> (ø)
util/app/discovery/discovery.go 40.27% <33.33%> (ø)
util/argo/managedfields/managed_fields.go 42.04% <36.61%> (-32.96%) ⬇️
cmpserver/plugin/plugin.go 49.28% <50.00%> (+1.80%) ⬆️
controller/state.go 73.64% <50.00%> (-0.26%) ⬇️
controller/sync.go 56.84% <50.00%> (-0.12%) ⬇️
util/argo/diff/diff.go 52.20% <60.00%> (-0.07%) ⬇️
reposerver/repository/repository.go 60.44% <66.66%> (-0.97%) ⬇️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 61f48d5...728a492. Read the comment docs.

@crenshaw-dev
Copy link
Collaborator

@34fathombelow thanks for this!

Just so we have a paper trail, did you use any particular source that we can cite as the reason for removing the no-longer-secure algorithms?

@34fathombelow
Copy link
Member Author

34fathombelow commented Jun 2, 2022

util/git/ssh.go Show resolved Hide resolved
Signed-off-by: Justin Marquis <34fathombelow@protonmail.com>
Copy link
Collaborator

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

LGTM! @jannfis can you take a look?

@crenshaw-dev crenshaw-dev requested a review from jannfis June 3, 2022 13:27
@crenshaw-dev crenshaw-dev added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label Jun 3, 2022
Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @34fathombelow !

@jannfis jannfis merged commit f6f578b into argoproj:master Jun 5, 2022
@34fathombelow 34fathombelow deleted the update-kex-algo branch June 5, 2022 17:22
crenshaw-dev pushed a commit that referenced this pull request Jun 6, 2022
* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: Justin Marquis <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>
@crenshaw-dev
Copy link
Collaborator

Cherry-picked onto 2.4.

crenshaw-dev pushed a commit to crenshaw-dev/argo-cd that referenced this pull request Jul 26, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore: update Kex-Algorithms (argoproj#9561)

* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore upgrade base image for test containers Ubuntu:22.04 (argoproj#9563)

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>
crenshaw-dev pushed a commit to crenshaw-dev/argo-cd that referenced this pull request Jul 26, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore: update Kex-Algorithms (argoproj#9561)

* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore upgrade base image for test containers Ubuntu:22.04 (argoproj#9563)

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>
crenshaw-dev added a commit that referenced this pull request Jul 26, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore: update Kex-Algorithms (#9561)

* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore upgrade base image for test containers Ubuntu:22.04 (#9563)

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: 34FathomBelow <34fathombelow@protonmail.com>
crenshaw-dev added a commit that referenced this pull request Jul 26, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore: update Kex-Algorithms (#9561)

* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore upgrade base image for test containers Ubuntu:22.04 (#9563)

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: 34FathomBelow <34fathombelow@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants