Debug

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

1 files changed, 11 insertions, 6 deletions

diff --git a/myrpki.rototill/convert-from-csv-to-entitydb.py b/myrpki.rototill/convert-from-csv-to-entitydb.py
index 3c25ba55..f115aadf 100644
--- a/myrpki.rototill/convert-from-csv-to-entitydb.py
+++ b/myrpki.rototill/convert-from-csv-to-entitydb.py
@@ -29,8 +29,9 @@ variable_regexp = re.compile("\s*([-a-zA-Z0-9_]+)(\s*=\s*)(.+?)\s*$")
 cfg_file = "myrpki.conf"
 template_file = os.path.join(os.path.dirname(sys.argv[0]), "examples", "myrpki.conf")
 new_cfg_file = None
+preserve_valid_until = False
 
-opts, argv = getopt.getopt(sys.argv[1:], "c:hn:t:?", ["config=", "new_config=", "template_config=", "help"])
+opts, argv = getopt.getopt(sys.argv[1:], "c:hn:pt:?", ["config=", "new_config=", "preserve_valid_until", "template_config=", "help"])
 for o, a in opts:
   if o in ("-h", "--help", "-?"):
     print __doc__
@@ -39,6 +40,8 @@ for o, a in opts:
     cfg_file = a
   elif o in ("-n", "--new_config"):
     new_cfg_file = a
+  elif o in ("-p", "--preserve_valid_until"):
+    preserve_valid_until = True
   elif o in ("-t", "--template_config"):
     template_file = a
 if argv:
@@ -158,16 +161,18 @@ rng_file = os.path.join(os.path.dirname(sys.argv[0]), "myrpki.rng")
 if not os.getenv("MYRPKI_RNG") and os.path.exists(rng_file):
   os.putenv("MYRPKI_RNG", rng_file)
 
-for d in map(entitydb, ("children", "parents", "repositories")):
+for d in map(entitydb, ("children", "parents", "repositories", "pubclients")):
   if not os.path.exists(d):
     os.makedirs(d)
 
+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"):
 
     e = Element("parent",
-                valid_until = valid_until,
-                service_uri = "https://%s:%s/left-right/%s/%s" % (rpkid_server_host, rpkid_server_port, handle, child_handle),
+                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)
@@ -180,7 +185,7 @@ 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 = str(rpki.sundial.now() + rpki.sundial.timedelta(days = 365)),
+                valid_until = one_year_from_now,
                 service_uri = parent_service_uri,
                 child_handle = parent_myhandle,
                 parent_handle = parent_handle)
@@ -217,4 +222,4 @@ if os.path.exists("pubclients.csv"):
     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("repositories", "%s.xml" % client_handle.replace("/", ".")))
+    myrpki.etree_write(e, entitydb("pubclients", "%s.xml" % client_handle.replace("/", ".")))