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

Fix vendored packages and update gopkg.in/yaml.v2 to v2.2.7 (CVE-2019-11253) #29

Merged
merged 2 commits into from Nov 28, 2019

Conversation

thaJeztah
Copy link

commits f7fe884 (#16) and d52f528 () enabled go modules and vendored dependencies, but did not include go-spew as a dependency. This was later on addressed by 3f088a4 (#25), but did not update the vendored files. The first commit is the result of re-running go mod vendor to vendor go-spew.

The second commit updates gopkg.in/yaml.v2 to v2.2.7, which includes a fix for CVE-2019-11253

full diff: go-yaml/yaml@v2.2.2...v2.2.7

includes:

commits f7fe884 and d52f528
enabled go modules and vendored dependencies, but did not include go-spew as a dependency.

This was later on addressed by 3f088a4, but did not update
the vendored files.

This patch is the result of re-running `go mod vendor` to vendor go-spew.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: go-yaml/yaml@v2.2.2...v2.2.7

includes:

- go-yaml/yaml@caeefd8
  addresses CVE-2019-11253 JSON/YAML parsing vulnerable to resource exhaustion attack
- go-yaml/yaml#171 Tighten restrictions on float decoding
- go-yaml/yaml#515 Add large document benchmarks, tune alias heuristic, add max depth limits
- go-yaml/yaml@f90ceb4
  fixes go-yaml/yaml#529 yaml.Unmarshal crashes on "assignment to entry in nil map"
- go-yaml/yaml#543 Port stale simple_keys fix to v2
- go-yaml/yaml@1f64d61
  fixes go-yaml/yaml#548 Invalid simple_keys now cause panics later in decode

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 28, 2019
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Nov 28, 2019
@thaJeztah
Copy link
Author

/assign @dims

@dims
Copy link
Member

dims commented Nov 28, 2019

/approve
/lgtm

thanks @thaJeztah

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2019
@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, thaJeztah

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 28, 2019
@dims
Copy link
Member

dims commented Nov 28, 2019

/hold

let's cross check the license

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2019
@thaJeztah
Copy link
Author

let's cross check the license

Good point; thx! Description from GitHub is;

ISC License
A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause and MIT licenses, removing some language that is no longer necessary.

But not a lawyer, so don't know if it's problematic; looks like kubernetes itself does vendor it; https://github.com/kubernetes/kubernetes/tree/master/vendor/github.com/davecgh/go-spew

@dims
Copy link
Member

dims commented Nov 28, 2019

perfect! if we are already do it in k/k :)

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2019
@k8s-ci-robot k8s-ci-robot merged commit 745ef44 into kubernetes-sigs:master Nov 28, 2019
@dims
Copy link
Member

dims commented Nov 28, 2019

@thaJeztah thaJeztah deleted the bump_yaml branch November 28, 2019 16:12
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
3 participants