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

Upgrade golang/x/net for CVE-2023-39325 and CVE-2023-44487 #12125

Open
wants to merge 6 commits into
base: fasttrack/3.0
Choose a base branch
from

Conversation

gjswalling
Copy link
Contributor

@gjswalling gjswalling commented Jan 29, 2025

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

Upgrade golang/x/net for CVE-2023-39325 and CVE-2023-44487

Change Log
  • Upgrade golang/x/net in vendor tarball
Does this affect the toolchain?

NO

Links to CVEs
Test Methodology
  • Pipeline build id: 722131

@osamaesmailmsft
Copy link
Contributor

I noticed that SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.signatures.json hasn't been updated.

@@ -20,12 +20,10 @@ Source0: https://github.com/Azure/application-gateway-kubernetes-ingress/
# --mtime="2021-04-26 00:00Z" \
# --owner=0 --group=0 --numeric-owner \
# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
# -cf %%{name}-%%{version}-vendor.tar.gz vendor
# -cf %%{name}-%%{version}-%%{release}-vendor.tar.gz vendor
#
Source1: %{name}-%{version}-vendor.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Source1: %{name}-%{version}-vendor.tar.gz
Source1: %{name}-%{version}-govendor-v1.tar.gz

This should be changed to match the new format of %{name}-%{version}-govendor-v1.tar.gz (or v2, v3, etc). Although this is an updated tarball for the same version, I'm inclined to go with v1 since we don't have a v1 right now, and it'll help keep things consistent for any future work.

@@ -20,12 +20,10 @@ Source0: https://github.com/Azure/application-gateway-kubernetes-ingress/
# --mtime="2021-04-26 00:00Z" \
# --owner=0 --group=0 --numeric-owner \
# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
# -cf %%{name}-%%{version}-vendor.tar.gz vendor
# -cf %%{name}-%%{version}-%%{release}-vendor.tar.gz vendor
Copy link
Contributor

Choose a reason for hiding this comment

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

With the script, this set of steps isn't necessary anymore. If you do wish to keep it, though, -cf should be -czf.

@gjswalling gjswalling marked this pull request as ready for review January 30, 2025 22:18
@gjswalling gjswalling requested a review from a team as a code owner January 30, 2025 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants