oval: add textfilecontent54 objects

Claircore has need to interrogate the corresponding textfilecontent54
tests, so implement the referenced objects to make the lookup heuristics
easier.

Signed-off-by: Hank Donnay <[email protected]>

Author: hdonnay

oval/objects.go

@@ -7,7 +7,7 @@ import (
 
 func (o *Objects) init() {
 	var wg sync.WaitGroup
-	wg.Add(5)
+	wg.Add(6)
 
 	go func() {
 		defer wg.Done()
@@ -25,6 +25,14 @@ func (o *Objects) init() {
 		}
 	}()
 
+	go func() {
+		defer wg.Done()
+		o.textfilecontent54Memo = make(map[string]int, len(o.TextfileContent54Objects))
+		for i, v := range o.TextfileContent54Objects {
+			o.textfilecontent54Memo[v.ID] = i
+		}
+	}()
+
 	go func() {
 		defer wg.Done()
 		o.rpminfoMemo = make(map[string]int, len(o.RPMInfoObjects))
@@ -62,6 +70,9 @@ func (o *Objects) Lookup(ref string) (kind string, index int, err error) {
 	if i, ok := o.version55Memo[ref]; ok {
 		return o.Version55Objects[i].XMLName.Local, i, nil
 	}
+	if i, ok := o.textfilecontent54Memo[ref]; ok {
+		return o.TextfileContent54Objects[i].XMLName.Local, i, nil
+	}
 	if i, ok := o.rpminfoMemo[ref]; ok {
 		return o.RPMInfoObjects[i].XMLName.Local, i, nil
 	}

oval/textfilecontent54.go

@@ -12,3 +12,19 @@ type TextfileContent54Test struct {
 }
 
 var _ Test = (*TextfileContent54Test)(nil)
+
+// TextfileContent54Object : >tests>textfilecontent54_object
+type TextfileContent54Object struct {
+	XMLName  xml.Name   `xml:"textfilecontent54_object"`
+	ID       string     `xml:"id,attr"`
+	Version  int        `xml:"version,attr"`
+	Filepath string     `xml:"filepath"`
+	Pattern  string     `xml:"pattern"`
+	Instance TCInstance `xml:"instance"`
+}
+
+type TCInstance struct {
+	XMLName  xml.Name `xml:"instance"`
+	Instance string   `xml:",chardata"`
+	Kind     string   `xml:"datatype,attr"`
+}

oval/types.go

@@ -260,18 +260,20 @@ type StateRef struct {
 
 // Objects : >objects
 type Objects struct {
-	once                 sync.Once
-	XMLName              xml.Name              `xml:"objects"`
-	LineObjects          []LineObject          `xml:"line_object"`
-	Version55Objects     []Version55Object     `xml:"version55_object"`
-	RPMInfoObjects       []RPMInfoObject       `xml:"rpminfo_object"`
-	RPMVerifyFileObjects []RPMVerifyFileObject `xml:"rpmverifyfile_object"`
-	DpkgInfoObjects      []DpkgInfoObject      `xml:"dpkginfo_object"`
-	lineMemo             map[string]int
-	version55Memo        map[string]int
-	rpminfoMemo          map[string]int
-	rpmverifyfileMemo    map[string]int
-	dpkginfoMemo         map[string]int
+	once                     sync.Once
+	XMLName                  xml.Name                  `xml:"objects"`
+	LineObjects              []LineObject              `xml:"line_object"`
+	Version55Objects         []Version55Object         `xml:"version55_object"`
+	TextfileContent54Objects []TextfileContent54Object `xml:"textfilecontent54_object"`
+	RPMInfoObjects           []RPMInfoObject           `xml:"rpminfo_object"`
+	RPMVerifyFileObjects     []RPMVerifyFileObject     `xml:"rpmverifyfile_object"`
+	DpkgInfoObjects          []DpkgInfoObject          `xml:"dpkginfo_object"`
+	lineMemo                 map[string]int
+	version55Memo            map[string]int
+	textfilecontent54Memo    map[string]int
+	rpminfoMemo              map[string]int
+	rpmverifyfileMemo        map[string]int
+	dpkginfoMemo             map[string]int
 }
 
 // States : >states