Convert some lingering *_elt references to lxml.etree.

svn path=/branches/tk705/; revision=6002

2 files changed, 40 insertions, 62 deletions

diff --git a/rpki/gui/app/check_expired.py b/rpki/gui/app/check_expired.py
index 2907f071..a34899f2 100644
--- a/rpki/gui/app/check_expired.py
+++ b/rpki/gui/app/check_expired.py
@@ -25,9 +25,9 @@ from rpki.gui.cacheview.models import Cert
 from rpki.gui.app.models import Conf, ResourceCert, Timestamp, Alert
 from rpki.gui.app.glue import list_received_resources
 from rpki.irdb import Zookeeper
-from rpki.left_right import report_error_elt, list_published_objects_elt
 from rpki.x509 import X509
 
+from lxml.etree import Element, SubElement
 from django.core.mail import send_mail
 
 logger = logging.getLogger(__name__)
@@ -105,27 +105,24 @@ def check_child_certs(conf, errs):
     """
 
     z = Zookeeper(handle=conf.handle)
-    req = list_published_objects_elt.make_pdu(action="list",
-                                              tag="list_published_objects",
-                                              self_handle=conf.handle)
+    req = Element(rpki.left_right.tag_msg, nsmap=rpki.left_right.nsmap,
+                  type="query", version=rpki.left_right.version)
+    SubElement(req, rpki.left_right.tag_list_published_objects,
+               tag="list_published_objects", self_handle=conf.handle)
     pdus = z.call_rpkid(req)
     for pdu in pdus:
-        if isinstance(pdu, report_error_elt):
-            logger.error("rpkid reported an error: %s", pdu.error_code)
-        elif isinstance(pdu, list_published_objects_elt):
-            if pdu.uri.endswith('.cer'):
-                cert = X509()
-                cert.set(Base64=pdu.obj)
-                t = cert.getNotAfter()
-                if t <= expire_time:
-                    e = 'expired' if t <= now else 'will expire'
-                    errs.write("%(handle)s's rescert for Child %(child)s %(expire)s on %(date)s uri=%(uri)s subject=%(subject)s\n" % {
-                        'handle': conf.handle,
-                        'child': pdu.child_handle,
-                        'uri': pdu.uri,
-                        'subject': cert.getSubject(),
-                        'expire': e,
-                        'date': t})
+        if pdu.get("uri").endswith('.cer'):
+            cert = X509(Base64=pdu.text)
+            t = cert.getNotAfter()
+            if t <= expire_time:
+                e = 'expired' if t <= now else 'will expire'
+                errs.write("%(handle)s's rescert for Child %(child)s %(expire)s on %(date)s uri=%(uri)s subject=%(subject)s\n" % {
+                    'handle': conf.handle,
+                    'child': pdu.get("child_handle"),
+                    'uri': pdu.get("uri"),
+                    'subject': cert.getSubject(),
+                    'expire': e,
+                    'date': t})
 
 
 class NetworkError(Exception):
diff --git a/rpki/gui/app/glue.py b/rpki/gui/app/glue.py
index f17ba5ac..f4267edc 100644
--- a/rpki/gui/app/glue.py
+++ b/rpki/gui/app/glue.py
@@ -66,18 +66,6 @@ def ghostbuster_to_vcard(gbr):
     return vcard.serialize()
 
 
-class LeftRightError(Exception):
-   """Class for wrapping report_error_elt errors from Zookeeper.call_rpkid().
-
-   It expects a single argument, which is the associated report_error_elt instance."""
-
-   def __str__(self):
-       return 'Error occurred while communicating with rpkid: handle=%s code=%s text=%s' % (
-           self.args[0].self_handle,
-           self.args[0].error_code,
-           self.args[0].error_text)
-
-
 @commit_on_success
 def list_received_resources(log, conf):
     """
@@ -98,34 +86,27 @@ def list_received_resources(log, conf):
     models.ResourceCert.objects.filter(conf=conf).delete()
 
     for pdu in pdus:
-        if isinstance(pdu, report_error_elt):
-            # this will cause the db to be rolled back so the above delete()
-            # won't clobber existing resources
-            raise LeftRightError(pdu)
-        elif isinstance(pdu, list_received_resources_elt):
-            if pdu.parent_handle != conf.handle:
-                parent = models.Parent.objects.get(issuer=conf,
-                                                   handle=pdu.parent_handle)
-            else:
-                # root cert, self-signed
-                parent = None
-
-            not_before = datetime.strptime(pdu.notBefore, "%Y-%m-%dT%H:%M:%SZ")
-            not_after = datetime.strptime(pdu.notAfter, "%Y-%m-%dT%H:%M:%SZ")
-
-            cert = models.ResourceCert.objects.create(
-                conf=conf, parent=parent, not_before=not_before,
-                not_after=not_after, uri=pdu.uri)
-
-            for asn in resource_set_as(pdu.asn):
-                cert.asn_ranges.create(min=asn.min, max=asn.max)
-
-            for rng in resource_set_ipv4(pdu.ipv4):
-                cert.address_ranges.create(prefix_min=rng.min,
-                                           prefix_max=rng.max)
-
-            for rng in resource_set_ipv6(pdu.ipv6):
-                cert.address_ranges_v6.create(prefix_min=rng.min,
-                                              prefix_max=rng.max)
+        if pdu.get("parent_handle") != conf.handle:
+            parent = models.Parent.objects.get(issuer=conf,
+                                               handle=pdu.get("parent_handle"))
         else:
-            print >>log, "error: unexpected pdu from rpkid type=%s" % type(pdu)
+            # root cert, self-signed
+            parent = None
+
+        not_before = datetime.strptime(pdu.get("notBefore"), "%Y-%m-%dT%H:%M:%SZ")
+        not_after = datetime.strptime(pdu.get("notAfter"), "%Y-%m-%dT%H:%M:%SZ")
+
+        cert = models.ResourceCert.objects.create(
+            conf=conf, parent=parent, not_before=not_before,
+            not_after=not_after, uri=pdu.get("uri"))
+
+        for asn in resource_set_as(pdu.get("asn")):
+            cert.asn_ranges.create(min=asn.min, max=asn.max)
+
+        for rng in resource_set_ipv4(pdu.get("ipv4")):
+            cert.address_ranges.create(prefix_min=rng.min,
+                                       prefix_max=rng.max)
+
+        for rng in resource_set_ipv6(pdu.get("ipv6")):
+            cert.address_ranges_v6.create(prefix_min=rng.min,
+                                          prefix_max=rng.max)