Skip to content

Commit c0b267d

Browse files
feat(oval/oracle): ignore fips patched version for non fips package versions (#2047)
* ignore fips patched version for non fips package versions like the ksplice and TDC in SUSE, we need not to report fips patched versions for non fips packages * add testcase --------- Co-authored-by: MaineK00n <[email protected]>
1 parent d78018b commit c0b267d

File tree

2 files changed

+67
-0
lines changed

2 files changed

+67
-0
lines changed

oval/util.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,9 @@ func isOvalDefAffected(def ovalmodels.Definition, req request, family, release s
415415
if extractOracleKsplice(ovalPack.Version) != extractOracleKsplice(req.versionRelease) {
416416
continue
417417
}
418+
if strings.HasSuffix(ovalPack.Version, "_fips") != strings.HasSuffix(req.versionRelease, "_fips") {
419+
continue
420+
}
418421
case constant.SUSEEnterpriseServer:
419422
if strings.Contains(ovalPack.Version, ".TDC.") != strings.Contains(req.versionRelease, ".TDC.") {
420423
continue

oval/util_test.go

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,6 +1929,70 @@ func TestIsOvalDefAffected(t *testing.T) {
19291929
},
19301930
affected: false,
19311931
},
1932+
// in: _fips , req: not fips
1933+
{
1934+
in: in{
1935+
family: constant.Oracle,
1936+
def: ovalmodels.Definition{
1937+
AffectedPacks: []ovalmodels.Package{
1938+
{
1939+
Name: "gnutls",
1940+
Version: "10:3.6.16-4.0.1.el8_fips",
1941+
Arch: "x86_64",
1942+
},
1943+
},
1944+
},
1945+
req: request{
1946+
packName: "gnutls",
1947+
versionRelease: "3.6.16-4.el8",
1948+
arch: "x86_64",
1949+
},
1950+
},
1951+
affected: false,
1952+
},
1953+
// in: _fips , req: _fips
1954+
{
1955+
in: in{
1956+
family: constant.Oracle,
1957+
def: ovalmodels.Definition{
1958+
AffectedPacks: []ovalmodels.Package{
1959+
{
1960+
Name: "gnutls",
1961+
Version: "10:3.6.16-8.el8_9.3_fips",
1962+
Arch: "x86_64",
1963+
},
1964+
},
1965+
},
1966+
req: request{
1967+
packName: "gnutls",
1968+
versionRelease: "10:3.6.16-4.0.1.el8_fips",
1969+
arch: "x86_64",
1970+
},
1971+
},
1972+
affected: true,
1973+
fixedIn: "10:3.6.16-8.el8_9.3_fips",
1974+
},
1975+
// in: non fips (upstream?), req: _fips
1976+
{
1977+
in: in{
1978+
family: constant.Oracle,
1979+
def: ovalmodels.Definition{
1980+
AffectedPacks: []ovalmodels.Package{
1981+
{
1982+
Name: "gnutls",
1983+
Version: "0:3.6.16-5.el8_6",
1984+
Arch: "x86_64",
1985+
},
1986+
},
1987+
},
1988+
req: request{
1989+
packName: "gnutls",
1990+
versionRelease: "10:3.6.16-4.0.1.el8_fips",
1991+
arch: "x86_64",
1992+
},
1993+
},
1994+
affected: false,
1995+
},
19321996
// same arch
19331997
{
19341998
in: in{

0 commit comments

Comments
 (0)