Checkpoint

svn path=/scripts/xml-parse-test.py; revision=688

1 files changed, 110 insertions, 77 deletions

diff --git a/scripts/xml-parse-test.py b/scripts/xml-parse-test.py
index aac272f1..f7753ca7 100755
--- a/scripts/xml-parse-test.py
+++ b/scripts/xml-parse-test.py
@@ -1,8 +1,42 @@
 # $Id$
 
+# TODO:
+#
+# resource set stuff (resource_set_{as,ipv4,ipv6} needs its own classes
+# to handle parsing and XML mustering.
+
 import base64
 import xml.sax
 import glob
+import re
+
+class rpki_updown_as_set(object):
+
+  def __init__(self, s):
+    self.as_set = []
+    if s != "":
+      vec = s.split(",")
+      for elt in vec:
+        r = re.match("^[0-9]+$", elt)
+        if r:
+          self.as_set.append((int(elt), ))
+          continue
+        r = re.match("^([0-9]+)-([0-9]+)$", elt)
+        if r:
+          b, e = r.groups()
+          self.as_set.append((int(b), int(e)))
+          continue
+        raise RuntimeError
+      self.as_set.sort()
+
+  def __str__(self):
+    vec = []
+    for elt in self.as_set:
+      if len(elt) == 1:
+        vec.append(str(elt[0]))
+      else:
+        vec.append(str(elt[0]) + "-" + str(elt[1]))
+    return ",".join(vec)
 
 class rpki_updown_msg(object):
 
@@ -16,7 +50,7 @@ class rpki_updown_msg(object):
          msg_ref="%d"\n\
          type="%s">\n' \
             % (self.sender, self.recipient, self.msg_ref, self.type)
-            ) + self.innerToXML() + '</message>\n'
+            ) + self.innerToXML() + "</message>\n"
 
   def innerToXML(self):
     return ""
@@ -28,26 +62,26 @@ class rpki_updown_msg(object):
 class rpki_updown_cert(object):
 
   def __init__(self, attrs):
-    self.cert_url = attrs.getValue('cert_url')
-    self.cert_ski = attrs.getValue('cert_ski')
-    self.cert_aki = attrs.getValue('cert_aki')
-    self.cert_serial = attrs.getValue('cert_serial')
-    self.resource_set_as = attrs.getValue('resource_set_as')
-    self.resource_set_ipv4 = attrs.getValue('resource_set_ipv4')
-    self.resource_set_ipv6 = attrs.getValue('resource_set_ipv6')
+    self.cert_url = attrs.getValue("cert_url")
+    self.cert_ski = attrs.getValue("cert_ski")
+    self.cert_aki = attrs.getValue("cert_aki")
+    self.cert_serial = attrs.getValue("cert_serial")
+    self.resource_set_as = rpki_updown_as_set(attrs.getValue("resource_set_as"))
+    self.resource_set_ipv4 = attrs.getValue("resource_set_ipv4")
+    self.resource_set_ipv6 = attrs.getValue("resource_set_ipv6")
     try:
-      self.req_resource_set_as = attrs.getValue('req_resource_set_as')
+      self.req_resource_set_as = rpki_updown_as_set(attrs.getValue("req_resource_set_as"))
     except KeyError:
       self.req_resource_set_as = None
     try:
-      self.req_resource_set_ipv4 = attrs.getValue('req_resource_set_ipv4')
+      self.req_resource_set_ipv4 = attrs.getValue("req_resource_set_ipv4")
     except KeyError:
       self.req_resource_set_ipv4 = None
     try:
-      self.req_resource_set_ipv6 = attrs.getValue('req_resource_set_ipv6')
+      self.req_resource_set_ipv6 = attrs.getValue("req_resource_set_ipv6")
     except KeyError:
       self.req_resource_set_ipv6 = None
-    self.status = attrs.getValue('status')
+    self.status = attrs.getValue("status")
 
   def toXML(self):
     xml = ('\
@@ -60,26 +94,27 @@ class rpki_updown_cert(object):
                  resource_set_ipv6="%s"\n' \
            % (self.cert_url, self.cert_ski, self.cert_aki, self.cert_serial,
               self.resource_set_as, self.resource_set_ipv4, self.resource_set_ipv6))
-    if self.req_resource_set_as != None:
+    if self.req_resource_set_as:
       xml += ('                 req_resource_set_as="%s"\n' % self.req_resource_set_as)
-    if self.req_resource_set_ipv4 != None:
+    if self.req_resource_set_ipv4:
       xml += ('                 req_resource_set_ipv4="%s"\n' % self.req_resource_set_ipv4)
-    if self.req_resource_set_ipv6 != None:
+    if self.req_resource_set_ipv6:
       xml += ('                 req_resource_set_ipv6="%s"\n' % self.req_resource_set_ipv6)
-    xml += ('                 status="%s">\n' % self.status)
-    return xml + base64.b64encode(self.cert) + '</certificate>\n'
+    xml += ('                 status="%s">' % self.status)
+    xml += base64.b64encode(self.cert) + "</certificate>\n"
+    return xml
 
 class rpki_updown_class(object):
 
   def __init__(self, attrs):
-    self.class_name = attrs.getValue('class_name')
-    self.cert_url = attrs.getValue('cert_url')
-    self.cert_ski = attrs.getValue('cert_ski')
-    self.resource_set_as = attrs.getValue('resource_set_as')
-    self.resource_set_ipv4 = attrs.getValue('resource_set_ipv4')
-    self.resource_set_ipv6 = attrs.getValue('resource_set_ipv6')
+    self.class_name = attrs.getValue("class_name")
+    self.cert_url = attrs.getValue("cert_url")
+    self.cert_ski = attrs.getValue("cert_ski")
+    self.resource_set_as = rpki_updown_as_set(attrs.getValue("resource_set_as"))
+    self.resource_set_ipv4 = attrs.getValue("resource_set_ipv4")
+    self.resource_set_ipv6 = attrs.getValue("resource_set_ipv6")
     try:
-      self.suggested_sia_head = attrs.getValue('suggested_sia_head')
+      self.suggested_sia_head = attrs.getValue("suggested_sia_head")
     except KeyError:
       self.suggested_sia_head = None
     self.certs = []
@@ -94,17 +129,18 @@ class rpki_updown_class(object):
          resource_set_ipv6="%s"' \
            % (self.class_name, self.cert_url, self.cert_ski,
               self.resource_set_as, self.resource_set_ipv4, self.resource_set_ipv6))
-    if self.suggested_sia_head != None:
+    if self.suggested_sia_head:
       xml += ('\n         suggested_sia_head="%s"' % (self.suggested_sia_head))
-    xml += '>\n'
+    xml += ">\n"
     for cert in self.certs:
       xml += cert.toXML()
-    return xml + '<issuer>' + base64.b64encode(self.issuer) + '</issuer>\n</class>\n'
+    xml += "    <issuer>" + base64.b64encode(self.issuer) + "</issuer>\n  </class>\n"
+    return xml
 
 class rpki_updown_list(rpki_updown_msg):
 
   def __str__(self):
-    return 'RPKI list request'
+    return "RPKI list request"
 
 class rpki_updown_list_response(rpki_updown_msg):
 
@@ -112,19 +148,19 @@ class rpki_updown_list_response(rpki_updown_msg):
     self.resource_classes = []
 
   def startElement(self, name, attrs):
-    if name == 'class':
+    if name == "class":
       self.resource_classes.append(rpki_updown_class(attrs))
-    elif name == 'certificate':
+    elif name == "certificate":
       self.resource_classes[-1].certs.append(rpki_updown_cert(attrs))
 
   def endElement(self, name, text):
-    if name == 'certificate':
+    if name == "certificate":
       self.resource_classes[-1].certs[-1].cert = base64.b64decode(text)
-    elif name == 'issuer':
+    elif name == "issuer":
       self.resource_classes[-1].issuer = base64.b64decode(text)
 
   def innerToXML(self):
-    xml = ''
+    xml = ""
     for c in self.resource_classes:
       xml += c.toXML()
     return xml
@@ -132,40 +168,40 @@ class rpki_updown_list_response(rpki_updown_msg):
 class rpki_updown_issue(rpki_updown_msg):
 
   def startElement(self, name, attrs):
-    assert name == 'request'
-    self.class_name = attrs.getValue('class_name')
+    assert name == "request"
+    self.class_name = attrs.getValue("class_name")
     try:
-      self.req_resource_set_as = attrs.getValue('req_resource_set_as')
+      self.req_resource_set_as = rpki_updown_as_set(attrs.getValue("req_resource_set_as"))
     except KeyError:
       self.req_resource_set_as = None
     try:
-      self.req_resource_set_ipv4 = attrs.getValue('req_resource_set_ipv4')
+      self.req_resource_set_ipv4 = attrs.getValue("req_resource_set_ipv4")
     except KeyError:
       self.req_resource_set_ipv4 = None
     try:
-      self.req_resource_set_ipv6 = attrs.getValue('req_resource_set_ipv6')
+      self.req_resource_set_ipv6 = attrs.getValue("req_resource_set_ipv6")
     except KeyError:
       self.req_resource_set_ipv6 = None
 
   def endElement(self, name, text):
-    assert name == 'request'
+    assert name == "request"
     self.pkcs10 = base64.b64decode(text)
 
   def innerToXML(self):
     xml = ('  <request class_name="%s"' % self.class_name)
-    if self.req_resource_set_as != None:
-      xml += ('\n           req_resource_set_as="%s"' % self.req_resource_set_as.toXML())
-    if self.req_resource_set_ipv4 != None:
-      xml += ('\n           req_resource_set_ipv4="%s"' % self.req_resource_set_ipv4.toXML())
-    if self.req_resource_set_ipv6 != None:
-      xml += ('\n           req_resource_set_ipv6="%s"' % self.req_resource_set_ipv6.toXML())
-    return xml + base64.b64encode(self.pkcs10) + '  </request>\n'
+    if self.req_resource_set_as:
+      xml += ('\n           req_resource_set_as="%s"' % self.req_resource_set_as)
+    if self.req_resource_set_ipv4:
+      xml += ('\n           req_resource_set_ipv4="%s"' % self.req_resource_set_ipv4)
+    if self.req_resource_set_ipv6:
+      xml += ('\n           req_resource_set_ipv6="%s"' % self.req_resource_set_ipv6)
+    return xml + ">" + base64.b64encode(self.pkcs10) + "</request>\n"
 
 class rpki_updown_issue_response(rpki_updown_list_response):
 
   def innerToXML(self):
-    assert len(self.resource_classes) < 2
-    rpki_updown_list_response.innerToXML(self)
+    assert len(self.resource_classes) == 1
+    return rpki_updown_list_response.innerToXML(self)
 
 class rpki_updown_revoke(rpki_updown_msg):
 
@@ -173,8 +209,8 @@ class rpki_updown_revoke(rpki_updown_msg):
     return 'RPKI %s class_name %s ski %s' % (self.type, self.class_name, self.ski)
 
   def startElement(self, name, attrs):
-    self.class_name = attrs.getValue('class_name')
-    self.ski = attrs.getValue('ski')
+    self.class_name = attrs.getValue("class_name")
+    self.ski = attrs.getValue("ski")
 
   def innerToXML(self):
     return ('  <key class_name="%s" ski="%s" />\n' % (self.class_name, self.ski))
@@ -184,53 +220,50 @@ class rpki_updown_revoke_response(rpki_updown_revoke): pass
 class rpki_updown_error_response(rpki_updown_msg):
 
   def __str__(self):
-    return 'RPKI error %d' % (self.status)
+    return "RPKI error %d" % (self.status)
 
   def innerToXML(self):
-    return '<status>%d</status>\n' % self.status
+    return '  <status>%d</status>\n' % self.status
 
   def endElement(self, name, text):
-    if name == 'status':
+    if name == "status":
       self.status = int(text)
-    elif name == 'last_message_processed':
+    elif name == "last_message_processed":
       self.last_message_processed = text
-    elif name == 'description':
+    elif name == "description":
       self.description = text
 
 class rpki_updown_sax_handler(xml.sax.handler.ContentHandler):
 
   def __init__(self):
-    self.text = ''
+    self.text = ""
     self.obj = None
 
   def startElementNS(self, name, qname, attrs):
-#   print "startElementNS()"
     return self.startElement(name[1], attrs)
 
   def endElementNS(self, name, qname):
-#   print "endElementNS()"
     return self.endElement(name[1])
 
   def startElement(self, name, attrs):
-#   print "startElement(" + name + ")"
-    if name == 'message':
-      assert int(attrs.getValue('version')) == 1
-      type = attrs.getValue('type')
+    if name == "message":
+      assert int(attrs.getValue("version")) == 1
+      type = attrs.getValue("type")
       if self.obj == None:
         self.obj = {
-          'list'                  : rpki_updown_list(),
-          'list_response'         : rpki_updown_list_response(),
-          'issue'                 : rpki_updown_issue(),
-          'issue_response'        : rpki_updown_issue_response(),
-          'revoke'                : rpki_updown_revoke(),
-          'revoke_response'       : rpki_updown_revoke_response(),
-          'error_response'        : rpki_updown_error_response()
+          "list"                  : rpki_updown_list(),
+          "list_response"         : rpki_updown_list_response(),
+          "issue"                 : rpki_updown_issue(),
+          "issue_response"        : rpki_updown_issue_response(),
+          "revoke"                : rpki_updown_revoke(),
+          "revoke_response"       : rpki_updown_revoke_response(),
+          "error_response"        : rpki_updown_error_response()
         }[type]
       assert self.obj != None
       self.obj.type = type
-      self.obj.sender = attrs.getValue('sender')
-      self.obj.recipient = attrs.getValue('recipient')
-      self.obj.msg_ref = int(attrs.getValue('msg_ref'))
+      self.obj.sender = attrs.getValue("sender")
+      self.obj.recipient = attrs.getValue("recipient")
+      self.obj.msg_ref = int(attrs.getValue("msg_ref"))
     else:
       assert self.obj != None
       self.obj.startElement(name, attrs)
@@ -240,14 +273,14 @@ class rpki_updown_sax_handler(xml.sax.handler.ContentHandler):
 
   def endElement(self, name):
     assert self.obj != None
-    if name != 'message':
+    if name != "message":
       self.obj.endElement(name, self.text)
-    self.text = ''
+    self.text = ""
 
 files = glob.glob("up-down-protocol-samples/*.xml")
 files.sort()
 for f in files:
-  try:
+#  try:
     parser = xml.sax.make_parser()
     handler = rpki_updown_sax_handler()
     parser.setContentHandler(handler)
@@ -255,5 +288,5 @@ for f in files:
     obj = handler.obj
     print "-- " + str(obj) + "\n"
     print obj.toXML()
-  except Exception, err:
-    print "? " + str(err) + "\n"
+#  except Exception, err:
+#    print "? " + str(err) + "\n"