oval: add additional test types

Red Hat recently started using additional test types in their oval
database. These changes allow the new database to be walked again.

Author: hdonnay

oval/rpminfo.go

@@ -15,6 +15,17 @@ type RPMInfoTest struct {
 	StateRefs  []StateRef  `xml:"state"`
 }
 
+// RPMVerifyFileTest : >tests>rpmverifyfile_test
+type RPMVerifyFileTest struct {
+	XMLName    xml.Name    `xml:"rpmverifyfile_test"`
+	ID         string      `xml:"id,attr"`
+	Comment    string      `xml:"comment,attr"`
+	Check      string      `xml:"check,attr"`
+	Version    int         `xml:"version,attr"`
+	ObjectRefs []ObjectRef `xml:"object"`
+	StateRefs  []StateRef  `xml:"state"`
+}
+
 // RPMInfoObject : >objects>RPMInfo_object
 type RPMInfoObject struct {
 	XMLName xml.Name `xml:"rpminfo_object"`

oval/rpminfo_test.go

@@ -36,3 +36,49 @@ func TestLookupRPMIntoObject(t *testing.T) {
 		}
 	}
 }
+
+func TestLookupRPMTest(t *testing.T) {
+	var tt = []struct{ Kind, Ref, Name string }{
+		{"rpmverifyfile_test", "oval:com.redhat.rhsa:tst:20190966006", "Red Hat Enterprise Linux must be installed"},
+		{"uname_test", "oval:com.redhat.rhsa:tst:20191167051", "kernel earlier than 0:4.18.0-80.1.2.el8_0 is currently running"},
+		{"textfilecontent54_test", "oval:com.redhat.rhsa:tst:20191167052", "kernel earlier than 0:4.18.0-80.1.2.el8_0 is set to boot up on next boot"},
+	}
+	f, err := os.Open("../testdata/com.redhat.rhsa-RHEL8.xml")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+	var root Root
+	if err := xml.NewDecoder(f).Decode(&root); err != nil {
+		t.Fatal(err)
+	}
+	for _, tc := range tt {
+		kind, i, err := root.Tests.Lookup(tc.Ref)
+		if err != nil {
+			t.Error(err)
+		}
+		if got, want := kind, tc.Kind; got != want {
+			t.Errorf("got: %q, want %q", got, want)
+		}
+		var name string
+		switch kind {
+		case "rpmverifyfile_test":
+			obj := &root.Tests.RPMVerifyFileTests[i]
+			name = obj.Comment
+			t.Logf("%s: %s (%#+v)", tc.Ref, obj.Comment, obj)
+		case "uname_test":
+			obj := &root.Tests.UnameTests[i]
+			name = obj.Comment
+			t.Logf("%s: %s (%#+v)", tc.Ref, obj.Comment, obj)
+		case "textfilecontent54_test":
+			obj := &root.Tests.TextfileContent54Tests[i]
+			name = obj.Comment
+			t.Logf("%s: %s (%#+v)", tc.Ref, obj.Comment, obj)
+		default:
+			t.Fatalf("unknown test kind %q", kind)
+		}
+		if got, want := name, tc.Name; got != want {
+			t.Fatalf("got: %q, want: %q", got, want)
+		}
+	}
+}

oval/tests.go

@@ -8,7 +8,7 @@ import (
 // Init sets up the memoization maps.
 func (t *Tests) init() {
 	var wg sync.WaitGroup
-	wg.Add(3)
+	wg.Add(6)
 
 	go func() {
 		defer wg.Done()
@@ -34,6 +34,30 @@ func (t *Tests) init() {
 		}
 	}()
 
+	go func() {
+		defer wg.Done()
+		t.rpmverifyfileMemo = make(map[string]int, len(t.RPMVerifyFileTests))
+		for i, v := range t.RPMVerifyFileTests {
+			t.rpmverifyfileMemo[v.ID] = i
+		}
+	}()
+
+	go func() {
+		defer wg.Done()
+		t.unameMemo = make(map[string]int, len(t.UnameTests))
+		for i, v := range t.UnameTests {
+			t.unameMemo[v.ID] = i
+		}
+	}()
+
+	go func() {
+		defer wg.Done()
+		t.textfilecontent54Memo = make(map[string]int, len(t.TextfileContent54Tests))
+		for i, v := range t.TextfileContent54Tests {
+			t.textfilecontent54Memo[v.ID] = i
+		}
+	}()
+
 	wg.Wait()
 }
 
@@ -52,6 +76,15 @@ func (t *Tests) Lookup(ref string) (kind string, index int, err error) {
 	if i, ok := t.rpminfoMemo[ref]; ok {
 		return t.RPMInfoTests[i].XMLName.Local, i, nil
 	}
+	if i, ok := t.rpmverifyfileMemo[ref]; ok {
+		return t.RPMVerifyFileTests[i].XMLName.Local, i, nil
+	}
+	if i, ok := t.unameMemo[ref]; ok {
+		return t.UnameTests[i].XMLName.Local, i, nil
+	}
+	if i, ok := t.textfilecontent54Memo[ref]; ok {
+		return t.TextfileContent54Tests[i].XMLName.Local, i, nil
+	}
 
 	// We didn't find it, maybe we can say why.
 	id, err := ParseID(ref)

oval/textfilecontent54.go

@@ -0,0 +1,13 @@
+package oval
+
+import "encoding/xml"
+
+// TextfileContent54Test : >tests>textfilecontent54_test
+type TextfileContent54Test struct {
+	XMLName       xml.Name    `xml:"textfilecontent54_test"`
+	ID            string      `xml:"id,attr"`
+	StateOperator string      `xml:"state_operator,attr"`
+	ObjectRefs    []ObjectRef `xml:"object"`
+	StateRefs     []StateRef  `xml:"state"`
+	Comment       string      `xml:"comment,attr"`
+}

oval/types.go

@@ -147,14 +147,20 @@ type Debian struct {
 
 // Tests : >tests
 type Tests struct {
-	once           sync.Once
-	XMLName        xml.Name        `xml:"tests"`
-	LineTests      []LineTest      `xml:"line_test"`
-	Version55Tests []Version55Test `xml:"version55_test"`
-	RPMInfoTests   []RPMInfoTest   `xml:"rpminfo_test"`
-	lineMemo       map[string]int
-	version55Memo  map[string]int
-	rpminfoMemo    map[string]int
+	once                   sync.Once
+	XMLName                xml.Name                `xml:"tests"`
+	LineTests              []LineTest              `xml:"line_test"`
+	Version55Tests         []Version55Test         `xml:"version55_test"`
+	RPMInfoTests           []RPMInfoTest           `xml:"rpminfo_test"`
+	RPMVerifyFileTests     []RPMVerifyFileTest     `xml:"rpmverifyfile_test"`
+	UnameTests             []UnameTest             `xml:"uname_test"`
+	TextfileContent54Tests []TextfileContent54Test `xml:"textfilecontent54_test"`
+	lineMemo               map[string]int
+	version55Memo          map[string]int
+	rpminfoMemo            map[string]int
+	rpmverifyfileMemo      map[string]int
+	unameMemo              map[string]int
+	textfilecontent54Memo  map[string]int
 }
 
 // ObjectRef : >tests>line_test>object-object_ref

oval/uname.go

@@ -0,0 +1,14 @@
+package oval
+
+import "encoding/xml"
+
+// UnameTest : >tests>uname_test
+type UnameTest struct {
+	XMLName    xml.Name    `xml:"uname_test"`
+	ID         string      `xml:"id,attr"`
+	Comment    string      `xml:"comment,attr"`
+	Check      string      `xml:"check,attr"`
+	Version    int         `xml:"version,attr"`
+	ObjectRefs []ObjectRef `xml:"object"`
+	StateRefs  []StateRef  `xml:"state"`
+}