Merge pull request #182 from sbs2001/rm_performant_oval_parser

Update lib_oval.py and remove PerformantOvalDocument from oval_parser.py

Author: sbs2001

vulnerabilities/scraper/lib_oval.py

@@ -8,7 +8,6 @@
 # * Neither the name of the Center for Internet Security, Inc. (CIS) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER, CIS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER, CIS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 """Library to simplify working with the OVAL XML structure
 
 
@@ -160,8 +159,14 @@ def __init__(self, tree):
             gen.setSchemaVersion("5.10.1")
             root.append(gen.get_element())
             return        
-        
+
         self.tree = tree
+        self.id_to_definition = { el.getId(): el for el in self.getDefinitions()} if self.getDefinitions() else {}
+        self.id_to_test = {el.getId(): el for el in self.getTests()} if self.getTests() else {}
+        self.id_to_object = {el.getId(): el for el in self.getObjects()} if self.getObjects() else {}
+        self.id_to_state = {el.getId(): el for el in self.getStates()} if self.getStates() else {}
+        self.id_to_variable = {el.getId(): el for el in self.getVariables()} if self.getVariables() else {}
+
 
 
     def parseFromFile(self, filename):
@@ -438,28 +443,17 @@ def getElementByID(self, ovalid):
             return None
 
         if oval_type == OvalDefinition.DEFINITION:
-            elist = self.getDefinitions()
+            return self.id_to_definition[ovalid]
         elif oval_type == OvalDefinition.TEST:
-            elist = self.getTests()
+            return self.id_to_test[ovalid]
         elif oval_type == OvalDefinition.OBJECT:
-            elist = self.getObjects()
+            return self.id_to_object[ovalid]
         elif oval_type == OvalDefinition.STATE:
-            elist = self.getStates()
+            return self.id_to_state[ovalid]
         elif oval_type == OvalDefinition.VARIABLE:
-            elist = self.getVariables()
+            return self.id_to_variable[ovalid]
         else:
             return None
-            
-        if not elist:
-            return None
-        
-        for element in elist:
-            defid = element.getId()
-            if defid and defid == ovalid:
-                return element
-            
-                    
-        
 
     def addElement(self, element, replace=True):
         """
@@ -512,6 +506,7 @@ def addElement(self, element, replace=True):
                 root.append(parent)
 
             parent.append(element.getElement())
+            self.id_to_definition[ovalid] = element
             return True
 
         elif oval_type == OvalDefinition.TEST:
@@ -521,6 +516,7 @@ def addElement(self, element, replace=True):
                 root.append(parent)
 
             parent.append(element.getElement())
+            self.id_to_test[ovalid] = element
             return True
 
         elif oval_type == OvalDefinition.OBJECT:
@@ -530,6 +526,7 @@ def addElement(self, element, replace=True):
                 root.append(parent)
 
             parent.append(element.getElement())
+            self.id_to_object[ovalid] = element
             return True
 
         elif oval_type == OvalDefinition.STATE:
@@ -539,14 +536,16 @@ def addElement(self, element, replace=True):
                 root.append(parent)
 
             parent.append(element.getElement())
+            self.id_to_state[ovalid] = element
             return True
 
         elif oval_type == OvalDefinition.VARIABLE:
             parent = root.find("def:variables", OvalDocument.NS_DEFAULT)
             if parent is None:
                 parent = Element("{" + OvalDocument.NS_DEFAULT.get("def") + "}variables")
                 root.append(parent)
-                
+            
+            self.id_to_variable[ovalid] = element
             parent.append(element.getElement())
             return True
 
@@ -1383,4 +1382,4 @@ def __init__(self, element):
 
 
     def getType(self):
-        return OvalElement.VARIABLE
+        return OvalElement.VARIABLE

vulnerabilities/scraper/oval_parser.py

@@ -11,49 +11,12 @@
     OvalDefinition, OvalDocument, OvalTest, OvalObject, OvalState, OvalElement)
 
 
-class PerformantOvalDocument(OvalDocument):
-
-    def __init__(self, tree):
-        super().__init__(tree)
-        self.id_to_definition = {
-            el.getId(): el for el in self.getDefinitions()}
-        self.id_to_test = {el.getId(): el for el in self.getTests()}
-        self.id_to_object = {el.getId(): el for el in self.getObjects()}
-        self.id_to_state = {el.getId(): el for el in self.getStates()}
-        self.id_to_variable = {el.getId(): el for el in self.getVariables()}
-
-    def getElementByID(self, oval_id: str) -> Optional[OvalElement]:
-        if not oval_id:
-            return None
-
-        root = self.getDocumentRoot()
-        if not root:
-            return None
-        try:
-            oval_type = OvalElement.getElementTypeFromOvalID(oval_id)
-        except Exception:
-            return None
-
-        if oval_type == OvalDefinition.DEFINITION:
-            return self.id_to_definition[oval_id]
-        elif oval_type == OvalDefinition.TEST:
-            return self.id_to_test[oval_id]
-        elif oval_type == OvalDefinition.OBJECT:
-            return self.id_to_object[oval_id]
-        elif oval_type == OvalDefinition.STATE:
-            return self.id_to_state[oval_id]
-        elif oval_type == OvalDefinition.VARIABLE:
-            return self.id_to_variable[oval_id]
-        else:
-            return None
-
-
 class OvalExtractor:
 
     def __init__(self, translations: Dict, oval_document: ET.ElementTree):
 
         self.translations = translations
-        self.oval_document = PerformantOvalDocument(oval_document)
+        self.oval_document = OvalDocument(oval_document)
         self.all_definitions = self.oval_document.getDefinitions()
         self.all_tests = self.oval_document.getTests()