fix(oracle): handle advisories contain ksplice versions #1209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improve a handling of advisories contain ksplice versions: * when one of them doesn't have ksplice, we'll also skip it * extract kspliceX and compare it with kspliceY in advisories * if kspliceX and kspliceY are different, we will skip the advisory. Fixes aquasecurity#1205
knqyf263
requested changes
Sep 2, 2021
pkg/detector/ospkg/oracle/oracle.go
Outdated
Comment on lines
47
to
58
| func extractKspliceNumber(v string) string { | ||
| subs := strings.Split(strings.ToLower(v), "ksplice") | ||
| if len(subs) != 2 { | ||
| return "" | ||
| } | ||
| ns := strings.Split(subs[1], ".") | ||
| if len(ns) == 0 { | ||
| return "" | ||
| } | ||
| return ns[0] | ||
| } | ||
|
|
There was a problem hiding this comment.
If we can assume ksplice is separated by dot, how about this?
Suggested change
| func extractKspliceNumber(v string) string { | |
| subs := strings.Split(strings.ToLower(v), "ksplice") | |
| if len(subs) != 2 { | |
| return "" | |
| } | |
| ns := strings.Split(subs[1], ".") | |
| if len(ns) == 0 { | |
| return "" | |
| } | |
| return ns[0] | |
| } | |
| func extractKspliceNumber(v string) string { | |
| subs := strings.Split(strings.ToLower(v), ".") | |
| for _, s := range subs { | |
| if strings.HasPrefix(v, "ksplice") { | |
| return s | |
| } | |
| } | |
| return "" | |
| } | |
pkg/detector/ospkg/oracle/oracle.go
Outdated
Comment on lines
83
to
90
| if isKSlice := strings.Contains(adv.FixedVersion, ".ksplice"); isKSlice != strings.Contains(pkg.Release, ".ksplice") { | ||
| continue | ||
| } else if isKSlice { | ||
| releaseV := extractKspliceNumber(adv.FixedVersion) | ||
| fixedV := extractKspliceNumber(pkg.Release) | ||
| if releaseV != fixedV { | ||
| continue | ||
| } |
There was a problem hiding this comment.
I think we can simplify it.
Suggested change
| if isKSlice := strings.Contains(adv.FixedVersion, ".ksplice"); isKSlice != strings.Contains(pkg.Release, ".ksplice") { | |
| continue | |
| } else if isKSlice { | |
| releaseV := extractKspliceNumber(adv.FixedVersion) | |
| fixedV := extractKspliceNumber(pkg.Release) | |
| if releaseV != fixedV { | |
| continue | |
| } | |
| if extractKspliceNumber(adv.FixedVersion) != extractKspliceNumber(pkg.Release) { | |
| continue | |
| } |
There was a problem hiding this comment.
sure, your was is better!
Comment on lines
154
to
199
| { | ||
| name: "the correct installed version without ksplice2", | ||
| fixtures: []string{"testdata/fixtures/oracle8.yaml"}, | ||
| args: args{ | ||
| osVer: "8", | ||
| pkgs: []ftypes.Package{ | ||
| { | ||
| Name: "glibc", | ||
| Version: "2.28", | ||
| Release: "151.0.1.el8", | ||
| Arch: "x86_64", | ||
| SrcName: "glibc", | ||
| SrcVersion: "2.28", | ||
| SrcRelease: "151.0.1.el8", | ||
| }, | ||
| }, | ||
| }, | ||
| want: nil, | ||
| }, | ||
| { | ||
| name: "the correct installed version with ksplice2", | ||
| fixtures: []string{"testdata/fixtures/oracle8.yaml"}, | ||
| args: args{ | ||
| osVer: "8", | ||
| pkgs: []ftypes.Package{ | ||
| { | ||
| Name: "glibc", | ||
| Epoch: 2, | ||
| Version: "2.28", | ||
| Release: "151.0.1.ksplice2.el8", | ||
| Arch: "x86_64", | ||
| SrcEpoch: 2, | ||
| SrcName: "glibc", | ||
| SrcVersion: "2.28", | ||
| SrcRelease: "151.0.1.ksplice2.el8", | ||
| }, | ||
| }, | ||
| }, | ||
| want: nil, | ||
| }, | ||
| { | ||
| name: "the installed version has ksplice1", | ||
| fixtures: []string{"testdata/fixtures/oracle8.yaml"}, | ||
| args: args{ | ||
| osVer: "8", | ||
| pkgs: []ftypes.Package{ |
There was a problem hiding this comment.
We already have the same test for ksplice1. These tests are duplicate. We should add only 1 test where the installed version has ksplice2.
Comment on lines
312
to
329
| func TestGetKspliceNumber(t *testing.T) { | ||
| tests := []struct { | ||
| in string | ||
| res string | ||
| }{ | ||
| {"", ""}, | ||
| {"2:2.17-157.el7_3.4", ""}, | ||
| {"2:2.17-157.ksplice1.el7_3.4", "1"}, | ||
| {"2:2.28-151.0.1.ksplice2.el8", "2"}, | ||
| {"2:2.28-151.0.1.ksplice2", "2"}, | ||
| {"2:2.28-151.0.1.KSplice2", "2"}, | ||
| } | ||
| for _, test := range tests { | ||
| if got := extractKspliceNumber(test.in); got != test.res { | ||
| t.Errorf("getKspliceNumber(%q) got %q, want %q", test.in, got, test.res) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
We can test this method through TestScanner_Detect
simplify code and remove duplicated tests Fixes aquasecurity#1205
knqyf263
approved these changes
Sep 5, 2021
liamg
pushed a commit
that referenced
this pull request
Jun 7, 2022
* fix(oracle): handle advisories contain ksplice versions Improve a handling of advisories contain ksplice versions: * when one of them doesn't have ksplice, we'll also skip it * extract kspliceX and compare it with kspliceY in advisories * if kspliceX and kspliceY are different, we will skip the advisory. Fixes #1205 * fix(oracle): handle advisories contain ksplice versions simplify code and remove duplicated tests Fixes #1205 * run go fmt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve a handling of advisories contain ksplice versions:
Fixes #1205