Quietly ignore CSV entries with no matching PEM files.

svn path=/myrpki.rototill/convert-from-csv-to-entitydb.py; revision=3123

1 files changed, 57 insertions, 46 deletions

diff --git a/myrpki.rototill/convert-from-csv-to-entitydb.py b/myrpki.rototill/convert-from-csv-to-entitydb.py
index dcd98231..92c85180 100644
--- a/myrpki.rototill/convert-from-csv-to-entitydb.py
+++ b/myrpki.rototill/convert-from-csv-to-entitydb.py
@@ -166,57 +166,68 @@ one_year_from_now = str(rpki.sundial.now() + rpki.sundial.timedelta(days = 365))
 
 if os.path.exists(children_csv):
   for child_handle, valid_until, child_resource_pemfile in myrpki.csv_open(children_csv):
+    try:
 
-    e = Element("parent",
-                valid_until = valid_until if preserve_valid_until else one_year_from_now,
-                service_uri = "https://%s:%s/up-down/%s/%s" % (rpkid_server_host, rpkid_server_port, handle, child_handle),
-                child_handle = child_handle,
-                parent_handle = handle)
-    myrpki.PEMElement(e, "bpki_resource_ta", bpki_resources_pemfile)
-    myrpki.PEMElement(e, "bpki_server_ta",   bpki_servers_pemfile)
-    myrpki.PEMElement(e, "bpki_child_ta",    child_resource_pemfile)
-    myrpki.etree_write(e, entitydb("children", "%s.xml" % child_handle))
+      e = Element("parent",
+                  valid_until = valid_until if preserve_valid_until else one_year_from_now,
+                  service_uri = "https://%s:%s/up-down/%s/%s" % (rpkid_server_host, rpkid_server_port, handle, child_handle),
+                  child_handle = child_handle,
+                  parent_handle = handle)
+      myrpki.PEMElement(e, "bpki_resource_ta", bpki_resources_pemfile)
+      myrpki.PEMElement(e, "bpki_server_ta",   bpki_servers_pemfile)
+      myrpki.PEMElement(e, "bpki_child_ta",    child_resource_pemfile)
+      myrpki.etree_write(e, entitydb("children", "%s.xml" % child_handle))
 
+    except IOError:
+      pass
 
 if os.path.exists(parents_csv):
   for parent_handle, parent_service_uri, parent_cms_pemfile, parent_https_pemfile, parent_myhandle, parent_sia_base in myrpki.csv_open(parents_csv):
-
-    e = Element("parent",
-                valid_until = one_year_from_now,
-                service_uri = parent_service_uri,
-                child_handle = parent_myhandle,
-                parent_handle = parent_handle)
-    myrpki.PEMElement(e, "bpki_resource_ta", parent_cms_pemfile)
-    myrpki.PEMElement(e, "bpki_server_ta",   parent_https_pemfile)
-    myrpki.PEMElement(e, "bpki_child_ta",    bpki_resources_pemfile)
-    myrpki.etree_write(e, entitydb("parents", "%s.xml" % parent_handle))
-
-    client_handle = "/".join(parent_sia_base.rstrip("/").split("/")[3:])
-    assert client_handle.startswith(repository_handle)
-
-    e = Element("repository",
-                parent_handle = parent_handle,
-                client_handle = client_handle,
-                service_uri = "%s/client/%s" % (pubd_base.rstrip("/"), client_handle),
-                sia_base = parent_sia_base,
-                type = "confirmed")
-    myrpki.PEMElement(e, "bpki_server_ta", repository_bpki_certificate)
-    myrpki.PEMElement(e, "bpki_client_ta", bpki_resources_pemfile)
-    SubElement(e, "contact_info").text = "Automatically generated by convert-csv.py"
-    myrpki.etree_write(e, entitydb("repositories", "%s.xml" % parent_handle))
+    try:
+
+      e = Element("parent",
+                  valid_until = one_year_from_now,
+                  service_uri = parent_service_uri,
+                  child_handle = parent_myhandle,
+                  parent_handle = parent_handle)
+      myrpki.PEMElement(e, "bpki_resource_ta", parent_cms_pemfile)
+      myrpki.PEMElement(e, "bpki_server_ta",   parent_https_pemfile)
+      myrpki.PEMElement(e, "bpki_child_ta",    bpki_resources_pemfile)
+      myrpki.etree_write(e, entitydb("parents", "%s.xml" % parent_handle))
+
+      client_handle = "/".join(parent_sia_base.rstrip("/").split("/")[3:])
+      assert client_handle.startswith(repository_handle)
+
+      e = Element("repository",
+                  parent_handle = parent_handle,
+                  client_handle = client_handle,
+                  service_uri = "%s/client/%s" % (pubd_base.rstrip("/"), client_handle),
+                  sia_base = parent_sia_base,
+                  type = "confirmed")
+      myrpki.PEMElement(e, "bpki_server_ta", repository_bpki_certificate)
+      myrpki.PEMElement(e, "bpki_client_ta", bpki_resources_pemfile)
+      SubElement(e, "contact_info").text = "Automatically generated by convert-csv.py"
+      myrpki.etree_write(e, entitydb("repositories", "%s.xml" % parent_handle))
+
+    except IOError:
+      pass
 
 if os.path.exists(pubclients_csv):
   for client_handle, client_resource_pemfile, client_sia_base in myrpki.csv_open(pubclients_csv):
-
-    parent_handle = client_handle.split("/")[-2] if "/" in client_handle else handle
-
-    e = Element("repository",
-                parent_handle = parent_handle,
-                client_handle = client_handle,
-                service_uri = "https://%s:%s/client/%s" % (pubd_server_host, pubd_server_port, client_handle),
-                sia_base = client_sia_base,
-                type = "confirmed")
-    myrpki.PEMElement(e, "bpki_server_ta", bpki_servers_pemfile)
-    myrpki.PEMElement(e, "bpki_client_ta", client_resource_pemfile)
-    SubElement(e, "contact_info").text = "Automatically generated by convert-csv.py"
-    myrpki.etree_write(e, entitydb("pubclients", "%s.xml" % client_handle.replace("/", ".")))
+    try:
+
+      parent_handle = client_handle.split("/")[-2] if "/" in client_handle else handle
+
+      e = Element("repository",
+                  parent_handle = parent_handle,
+                  client_handle = client_handle,
+                  service_uri = "https://%s:%s/client/%s" % (pubd_server_host, pubd_server_port, client_handle),
+                  sia_base = client_sia_base,
+                  type = "confirmed")
+      myrpki.PEMElement(e, "bpki_server_ta", bpki_servers_pemfile)
+      myrpki.PEMElement(e, "bpki_client_ta", client_resource_pemfile)
+      SubElement(e, "contact_info").text = "Automatically generated by convert-csv.py"
+      myrpki.etree_write(e, entitydb("pubclients", "%s.xml" % client_handle.replace("/", ".")))
+
+    except IOError:
+      pass