Skip to content

Backport of Easy go-jose updates (the codeless[ish] ones) into release/1.17.x#28146

Closed
hc-github-team-secure-vault-core wants to merge 3 commits into
release/1.17.xfrom
backport/VAULT-28868/codeless-changes/kindly-ace-crab
Closed

Backport of Easy go-jose updates (the codeless[ish] ones) into release/1.17.x#28146
hc-github-team-secure-vault-core wants to merge 3 commits into
release/1.17.xfrom
backport/VAULT-28868/codeless-changes/kindly-ace-crab

Conversation

@hc-github-team-secure-vault-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #28140 to be assessed for backporting due to the inclusion of the label backport/1.17.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@kpcraig
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


These are the (mostly) codeless changes required to remove our dependency on vulnerable versions of go-jose (before v2.6.3, v3.0.3, or v4.0.1)

There is one transitive hashicorp-controlled dependency on an old go-jose, at hashicorp/vault-testing-stepwise. A PR for this has been merged, but updating here is waiting on a docker issue, since vault-testing-stepwise updated docker in v.0.2.0.

The most invasive change included here is on google/tink-go, which went through a few 'organizational' changes since we updated it. To get to a non-vulnerable version, I had to move us to the new import path tink-crypto/tink-go. This isn't the latest path, but rather the nearest equivalent to what we were using that didn't depend on a "bad" go-jose.


Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app Bot commented Aug 21, 2024

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • kpcraig
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@github-actions github-actions Bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Aug 21, 2024
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Aug 21, 2024

CI Results:
All Go tests succeeded! ✅

@kpcraig kpcraig added this to the 1.17.4 milestone Aug 21, 2024
@kpcraig kpcraig marked this pull request as ready for review August 21, 2024 19:33
@kpcraig kpcraig requested a review from a team as a code owner August 21, 2024 19:33
@github-actions
Copy link
Copy Markdown

Build Results:
All builds succeeded! ✅

@kpcraig
Copy link
Copy Markdown
Contributor

kpcraig commented Aug 22, 2024

In addition to the Okta issue, there are two remaining dependencies on old jose that are "stuck" - vault -> docker 25.0.6 -> containerd 1.7.12 -> jose 2.5.1, and vault -> vault-testing-stepwise -> docker 25.0.6 (see hashicorp/go-secure-stdlib#132)

Due to the linked issue, these are left for a future update (possibly along with the aforementioned Okta?)

@kpcraig
Copy link
Copy Markdown
Contributor

kpcraig commented Aug 22, 2024

The fixed version of this backport has merged: #28152, so I'm closing this.

@kpcraig kpcraig closed this Aug 22, 2024
@kpcraig kpcraig deleted the backport/VAULT-28868/codeless-changes/kindly-ace-crab branch August 22, 2024 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants