[Uludag-commits] r11890 - trunk/plsa/plsa-admin/plsa

[svn-uludag at uludag.org.tr]

Author: cartman
Date: Fri Jan  5 16:43:15 2007
New Revision: 11890

Modified:
   trunk/plsa/plsa-admin/plsa/__init__.py
   trunk/plsa/plsa-admin/plsa/validator.py
Log:
Add a Type tag which can be Local/Remote


Modified: trunk/plsa/plsa-admin/plsa/__init__.py
=================================================================
--- trunk/plsa/plsa-admin/plsa/__init__.py	(original)
+++ trunk/plsa/plsa-admin/plsa/__init__.py	Fri Jan  5 16:43:15 2007
@@ -33,6 +33,7 @@
                 "email": ""
             },
             "severity": "",
+            "type": "",
             "title": "",
             "summary": "",
             "description": [],
@@ -81,6 +82,7 @@
         rev["email"] = node_rev.getTagData("Email")
 
         self.data["severity"]  = node_adv.getTagData("Severity")
+        self.data["type"]  = node_adv.getTagData("Type")
 
         self.data["title"]  = get_localized_data(node_adv, "Title", self.lang).strip()
         self.data["summary"]  = get_localized_data(node_adv, "Summary", self.lang).strip()
@@ -114,7 +116,8 @@
         headers = [
             (_("Date"), self.data["revision"]["date"]),
             (_("Revision"), self.data["revision"]["no"]),
-            (_("Severity"), self.data["severity"])
+            (_("Severity"), self.data["severity"]),
+            (_("Type"), self.data["type"])
         ]
 
         tpl = []

Modified: trunk/plsa/plsa-admin/plsa/validator.py
=================================================================
--- trunk/plsa/plsa-admin/plsa/validator.py	(original)
+++ trunk/plsa/plsa-admin/plsa/validator.py	Fri Jan  5 16:43:15 2007
@@ -94,6 +94,7 @@
                  "Summary": (self.one_or_more, self.validate_title),
                  "Description": (self.one_or_more, self.validate_description),
                  "Severity": (self.once, self.validate_severity),
+                 "Type": (self.once, self.validate_type),
                  "Packages": (self.once, self.validate_packages),
                  "References": (self.optional_once, self.validate_references)
             }
@@ -130,6 +131,13 @@
         if node.firstChild().type() == piksemel.DATA and not node.firstChild().data().isdigit():
             self.error(node, "wrong severity number")
 
+    def validate_type(self, node):
+        self.check(node, {})
+        self.check_attr(node, {})
+
+        if node.firstChild().type() == piksemel.DATA and not node.firstChild().data() in ["Local","Remote"]:
+            self.error(node, "Wrong vulnerability type")
+
     def validate_packages(self, node):
         self.check(
             node, {