Checkpoint

svn path=/scripts/rpki/resource_set.py; revision=1261

4 files changed, 65 insertions, 48 deletions

diff --git a/scripts/rpki/resource_set.py b/scripts/rpki/resource_set.py
index 940f537e..e5fe2a50 100644
--- a/scripts/rpki/resource_set.py
+++ b/scripts/rpki/resource_set.py
@@ -151,7 +151,7 @@ class resource_set(list):
     efficiently) as the basis for most set operations on resource
     sets.
     """
-    assert type(self) is type(other)
+    assert type(self) is type(other), "Type mismatch %s %s" % (repr(type(self)), repr(type(other)))
     set1 = self[:]
     set2 = other[:]
     only1, only2, both = [], [], []
diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py
index 4d29eb2b..c0c1b9e4 100644
--- a/scripts/rpki/up_down.py
+++ b/scripts/rpki/up_down.py
@@ -260,7 +260,7 @@ class issue_pdu(base_elt):
 
     # Check current cert, if any
     irdb_resources = rpki.left_right.irdb_query(gctx, child.self_id, child.child_id)
-    rc_as, rc_v4, rc_v6 = ca_detail.latest_ca_cert.get_3779resources(irdb_resources)
+    rc_as, rc_v4, rc_v6 = ca_detail.latest_ca_cert.get_3779resources(*irdb_resources)
     req_key = self.pkcs10.getPublicKey()
     req_sia = self.pkcs10.get_SIA()
     req_ski = self.pkcs10.get_SKI()
@@ -415,12 +415,15 @@ class error_response_pdu(base_elt):
   def toXML(self):
     """Generate payload of "error_response" PDU."""
     assert self.status in self.codes
-    status_elt = self.make_elt("status")
-    status_elt.text = str(self.status)
-    description_elt = self.make_elt("description")
-    description_elt.text = str(self.description)
-    description_elt.set("xml:lang", "en")
-    return [status_elt, description_elt]
+    elt = self.make_elt("status")
+    elt.text = str(self.status)
+    payload = [elt]
+    if self.description:
+      elt = self.make_elt("description")
+      elt.text = str(self.description)
+      elt.set("xml:lang", "en-US")
+      payload.append(elt)
+    return payload
 
   def check_syntax(self):
     """Handle an error response.  For the moment, just raise an
diff --git a/scripts/testpoke.py b/scripts/testpoke.py
index 646755e4..7c86c726 100644
--- a/scripts/testpoke.py
+++ b/scripts/testpoke.py
@@ -14,11 +14,44 @@ import traceback, os, time, getopt, sys, lxml, yaml
 import rpki.resource_set, rpki.up_down, rpki.left_right, rpki.x509
 import rpki.https, rpki.config, rpki.cms, rpki.exceptions, rpki.relaxng
 
-def get_PEM(name, cls):
-  if name in yaml_data:
-    return cls(PEM = yaml_data[name])
-  if name + "-file" in yaml_data:
-    return cls(PEM_file = yaml_data[name + "-file"])
+os.environ["TZ"] = "UTC"
+time.tzset()
+
+def usage(code):
+  print __doc__
+  sys.exit(code)
+
+yaml_file = "testpoke.yaml"
+yaml_cmd = None
+
+opts,argv = getopt.getopt(sys.argv[1:], "c:r:h?", ["config=", "request=", "help"])
+for o,a in opts:
+  if o in ("-h", "--help", "-?"):
+    usage(0)
+  elif o in ("-c", "--config"):
+    yaml_file = a
+  elif o in ("-r", "--request"):
+    yaml_cmd = a
+if argv:
+  usage(1)
+
+f = open(yaml_file)
+yaml_data = yaml.load(f)
+f.close()
+
+if yaml_cmd is None and len(yaml_data["requests"]) == 1:
+  yaml_cmd = yaml_data["requests"].keys()[0]
+
+if yaml_cmd is None:
+  usage(1)
+
+yaml_req = yaml_data["requests"][yaml_cmd]
+
+def get_PEM(name, cls, y = yaml_data):
+  if name in y:
+    return cls(PEM = y[name])
+  if name + "-file" in y:
+    return cls(PEM_file = y[name + "-file"])
   return None
 
 def get_PEM_chain(name, cert = None):
@@ -46,38 +79,19 @@ def do_list():
   print query_up_down(rpki.up_down.list_pdu())
 
 def do_issue():
-  raise NotImplementedError
+  q_pdu = rpki.up_down.issue_pdu()
+  req_key = get_PEM("cert-request-key", rpki.x509.RSA, yaml_req) or cms_key
+  sia = (((1, 3, 6, 1, 5, 5, 7, 48, 5),  ("uri", yaml_req["sia"][0])),
+         ((1, 3, 6, 1, 5, 5, 7, 48, 10), ("uri", yaml_req["sia"][0] + req_key.gSKI() + ".mnf")))
+  q_pdu.class_name = yaml_req["class"]
+  q_pdu.pkcs10 = rpki.x509.PKCS10.create_ca(req_key, sia)
+  print query_up_down(q_pdu)
 
 def do_revoke():
   raise NotImplementedError
 
 dispatch = { "list" : do_list, "issue" : do_issue, "revoke" : do_revoke }
 
-os.environ["TZ"] = "UTC"
-time.tzset()
-
-yaml_file = "testpoke.yaml"
-yaml_req = None
-
-opts,argv = getopt.getopt(sys.argv[1:], "c:r:h?", ["config=", "request=", "help"])
-for o,a in opts:
-  if o in ("-h", "--help", "-?"):
-    print __doc__
-    sys.exit(0)
-  elif o in ("-c", "--config"):
-    yaml_file = a
-  elif o in ("r", "--request"):
-    yaml_req = a
-if argv:
-  raise RuntimeError, "Unexpected arguments %s" % argv
-
-f = open(yaml_file)
-yaml_data = yaml.load(f)
-f.close()
-
-if yaml_req is None and len(yaml_data["requests"]) == 1:
-  yaml_req = yaml_data["requests"].keys()[0]
-
 cms_ta      = get_PEM("cms-ca-cert", rpki.x509.X509)
 cms_cert    = get_PEM("cms-cert", rpki.x509.X509)
 cms_key     = get_PEM("cms-key", rpki.x509.RSA)
@@ -92,4 +106,4 @@ https_tas   = rpki.x509.X509_chain()
 if https_ta is not None:
   https_tas.append(https_ta)
 
-dispatch[yaml_data["requests"][yaml_req]["type"]]()
+dispatch[yaml_req["type"]]()
diff --git a/scripts/testpoke.yaml b/scripts/testpoke.yaml
index dad2136a..9c648151 100644
--- a/scripts/testpoke.yaml
+++ b/scripts/testpoke.yaml
@@ -18,11 +18,11 @@ ssl-ca-cert-file: biz-certs/Bob-Root.cer
 requests:
   list:
     type: list
-# issue:
-#   type: issue
-#   class: 1
-#   sia: [ "rsync://bandicoot.invalid/some/where" ]
-# revoke:
-#   type: revoke
-#   class: 1
-#   ski: FillThisIn
+  issue:
+    type: issue
+    class: 1
+    sia: [ "rsync://bandicoot.invalid/some/where/" ]
+  revoke:
+    type: revoke
+    class: 1
+    ski: FillThisIn