oval: add verifyfiles_object types

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(4)
+	wg.Add(5)
 
 	go func() {
 		defer wg.Done()
@@ -33,6 +33,14 @@ func (o *Objects) init() {
 		}
 	}()
 
+	go func() {
+		defer wg.Done()
+		o.rpmverifyfileMemo = make(map[string]int, len(o.RPMVerifyFileObjects))
+		for i, v := range o.RPMVerifyFileObjects {
+			o.rpmverifyfileMemo[v.ID] = i
+		}
+	}()
+
 	go func() {
 		defer wg.Done()
 		o.dpkginfoMemo = make(map[string]int, len(o.DpkgInfoObjects))
@@ -60,6 +68,9 @@ func (o *Objects) Lookup(ref string) (kind string, index int, err error) {
 	if i, ok := o.dpkginfoMemo[ref]; ok {
 		return o.DpkgInfoObjects[i].XMLName.Local, i, nil
 	}
+	if i, ok := o.rpmverifyfileMemo[ref]; ok {
+		return o.RPMVerifyFileObjects[i].XMLName.Local, i, nil
+	}
 
 	// We didn't find it, maybe we can say why.
 	id, err := ParseID(ref)

oval/rpminfo.go

@@ -36,6 +36,38 @@ type RPMInfoObject struct {
 	Name    string   `xml:"name"`
 }
 
+type RPMVerifyFileObject struct {
+	XMLName    xml.Name            `xml:"rpmverifyfile_object"`
+	ID         string              `xml:"id,attr"`
+	Version    int                 `xml:"version,attr"`
+	Behaviors  VerifyFileBehaviors `xml:"behaviors"`
+	Name       VerifyFileOp        `xml:"name"`
+	Epoch      VerifyFileOp        `xml:"epoch"`
+	Release    VerifyFileOp        `xml:"release"`
+	RPMVersion VerifyFileOp        `xml:"version"`
+	Arch       VerifyFileOp        `xml:"arch"`
+	Filepath   string              `xml:"filepath"`
+}
+
+type VerifyFileBehaviors struct {
+	XMLName       xml.Name `xml:"behaviors"`
+	NoConfigFiles bool     `xml:"noconfigfiles"`
+	NoGhostFiles  bool     `xml:"noghostfiles"`
+	NoGroup       bool     `xml:"nogroup"`
+	NoLinkTo      bool     `xml:"nolinkto"`
+	NoMD5         bool     `xml:"nomd5"`
+	NoMode        bool     `xml:"nomode"`
+	NoMTime       bool     `xml:"nomtime"`
+	NoRDev        bool     `xml:"nordev"`
+	NoSize        bool     `xml:"nosize"`
+	NoUser        bool     `xml:"nouser"`
+}
+
+type VerifyFileOp struct {
+	XMLName xml.Name
+	Op      string `xml:"operation,attr"`
+}
+
 // RPMInfoState : >states>rpminfo_state
 type RPMInfoState struct {
 	XMLName        xml.Name           `xml:"rpminfo_state"`

oval/types.go

@@ -260,16 +260,18 @@ 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"`
-	DpkgInfoObjects  []DpkgInfoObject  `xml:"dpkginfo_object"`
-	lineMemo         map[string]int
-	version55Memo    map[string]int
-	rpminfoMemo      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"`
+	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
 }
 
 // States : >states