Attempt to write updated .conf file.

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

1 files changed, 123 insertions, 18 deletions

diff --git a/myrpki.rototill/convert-from-csv-to-entitydb.py b/myrpki.rototill/convert-from-csv-to-entitydb.py
index 7f7ede15..00148a02 100644
--- a/myrpki.rototill/convert-from-csv-to-entitydb.py
+++ b/myrpki.rototill/convert-from-csv-to-entitydb.py
@@ -18,41 +18,146 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 """
 
-import subprocess, csv, re, os, getopt, sys, rpki.config, base64, myrpki
-import rpki.sundial
+import subprocess, csv, re, os, getopt, sys, ConfigParser, base64, urlparse
+import rpki.sundial, myrpki
 
 from lxml.etree import Element, SubElement, ElementTree
 
 cfg_file = "myrpki.conf"
+template_file = os.path.join(os.path.dirname(sys.argv[0]), "examples", "myrpki.conf")
+new_cfg_file = None
 
-opts, argv = getopt.getopt(sys.argv[1:], "c:h:?", ["config=", "help"])
+opts, argv = getopt.getopt(sys.argv[1:], "c:hn:t:?", ["config=", "new_config=", "template_config=", "help"])
 for o, a in opts:
   if o in ("-h", "--help", "-?"):
     print __doc__
     sys.exit(0)
   elif o in ("-c", "--config"):
     cfg_file = a
+  elif o in ("-n", "--new_config"):
+    new_cfg_file = a
+  elif o in ("-t", "--template_config"):
+    template_file = a
 if argv:
   raise RuntimeError, "Unexpected arguments %r" % (argv,)
-
-cfg = rpki.config.parser(cfg_file, "myrpki")
-
-entitydb                    = myrpki.EntityDB(cfg)
-
-handle                      = cfg.get("handle")
-bpki_resources_directory    = cfg.get("bpki_resources_directory")
-bpki_servers_directory      = cfg.get("bpki_servers_directory")
-repository_bpki_certificate = cfg.get("repository_bpki_certificate")
-repository_handle           = cfg.get("repository_handle")
-
-pubd_server_host            = cfg.get("pubd_server_host")
-pubd_server_port            = cfg.get("pubd_server_port")
-rpkid_server_host           = cfg.get("rpkid_server_host")
-rpkid_server_port           = cfg.get("rpkid_server_port")
+if os.path.samefile(cfg_file, template_file):
+  raise RuntimeError, "Old config and template for new config can't be the same file"
+if new_cfg_file is None:
+  new_cfg_file = cfg_file + ".new"
+if os.path.exists(new_cfg_file):
+  raise RuntimeError, "%s already exists, NOT overwriting" % new_cfg_file
+
+cfg = ConfigParser.RawConfigParser()
+cfg.readfp(open(cfg_file))
+
+newcfg = ConfigParser.RawConfigParser()
+newcfg.readfp(open(template_file))
+
+# These two have no counterpart in new config file, just read them from old
+
+repository_bpki_certificate = cfg.get("myrpki", "repository_bpki_certificate")
+repository_handle           = cfg.get("myrpki", "repository_handle")
+
+# Here we need to construct values for the new config file from the
+# old one.  Basic model here is to look at whatever variables need to
+# be set in the template (mostly just the [myrpki], I hope), pull
+# necessary data from old config file any way we can.  Stuff that
+# didn't make the jump from old config file to new we can just ignore,
+# stuff that is automated via macro expansions in the new config file
+# should be ok without modification.
+
+if cfg.has_section("myrpki"):
+  for i in ("handle", "roa_csv", "prefix_csv", "asn_csv", "xml_filename"):
+    newcfg.set("myrpki", i, cfg.get("myrpki", i))
+  newcfg.set("myrpki", "bpki_resources_directory", cfg.get("myrpki", "bpki_directory"))
+
+if cfg.has_section("myirbe"):
+  newcfg.set("myrpki", "bpki_servers_directory",   cfg.get("myirbe", "bpki_directory"))
+  newcfg.set("myrpki", "run_rpkid", True)
+  newcfg.set("myrpki", "run_pubd",  cfg.getboolean("myirbe", "want_pubd"))
+  newcfg.set("myrpki", "run_rootd", cfg.getboolean("myirbe", "want_rootd"))
+else:
+  for i in ("run_rpkid", "run_pubd", "run_rootd"):
+    newcfg.set("myrpki", i, False)
+
+if cfg.has_section("rpkid"):
+  newcfg.set("myrpki", "rpkid_server_host", cfg.get("rpkid", "server-host"))
+  newcfg.set("myrpki", "rpkid_server_port", cfg.get("rpkid", "server-port"))
+
+if cfg.has_section("irdbd"):
+  u = urlparse.urlparse(cfg.get("irdbd", "https-url"))
+  newcfg.set("myrpki", "irdbd_server_host", u.hostname or "localhost")
+  newcfg.set("myrpki", "irdbd_server_port", u.port or 443)
+
+if cfg.has_section("pubd"):
+  newcfg.set("myrpki", "pubd_server_host", cfg.get("pubd", "server-host"))
+  newcfg.set("myrpki", "pubd_server_port", cfg.get("pubd", "server-port"))
+  newcfg.set("myrpki", "publication_base_directory", cfg.get("pubd", "publication-base"))
+
+if cfg.has_section("rootd"):
+  newcfg.set("myrpki", "rootd_server_port", cfg.get("rootd", "server-port"))
+  u = urlparse.urlparse(cfg.get("rootd", "rpki-base-uri"))
+  if (newcfg.get("myrpki", "publication_rsync_server") == "${myrpki::pubd_server_host}" and
+      u.netloc not in ("rpki.example.org", newcfg.get("myrpki", "pubd_server_host"))):
+    newcfg.set("myrpki", "publication_rsync_server", u.netloc)
+
+for i in ("rpkid", "irdbd", "pubd"):
+  if cfg.has_section(i):
+    for j in ("sql-database", "sql-username", "sql-password"):
+      newcfg.set(i, j, cfg.get(i, j))
+
+# Done constructing new config file
+
+# Get all of these from the new config file; in theory we just set all
+# of them, but we want to use values matching new config in any case.
+
+handle                      = newcfg.get("myrpki", "handle")
+bpki_resources_directory    = newcfg.get("myrpki", "bpki_resources_directory")
+bpki_servers_directory      = newcfg.get("myrpki", "bpki_servers_directory")
+
+pubd_server_host            = newcfg.get("myrpki", "pubd_server_host")
+pubd_server_port            = newcfg.get("myrpki", "pubd_server_port")
+rpkid_server_host           = newcfg.get("myrpki", "rpkid_server_host")
+rpkid_server_port           = newcfg.get("myrpki", "rpkid_server_port")
 
 bpki_resources_pemfile      = bpki_resources_directory + "/ca.cer"
 bpki_servers_pemfile        = bpki_servers_directory + "/ca.cer"
 
+# If we got this far, it should be ok to write the new config file.
+
+f = open(new_cfg_file, "w")
+f.write("""\
+# Automatically converted from
+#   %s
+# using
+#   %s
+# as a template.  Sorry about the lack of comments, ConfigParser
+# doesn't preserve them.\n
+""" % (cfg_file, template_file))
+newcfg.write(f)
+f.close()
+print "Wrote", new_cfg_file
+
+try:
+  entitydb_dir = newcfg.get("myrpki", "entitydb_dir")
+except ConfigParser.NoOptionError:
+  entitydb_dir = "entitydb"
+  
+def entitydb(*args):
+  return os.path.join(entitydb_dir, *args)
+
+# Now convert the .csv files.  It'd be nice to have XML validation
+# enabled for this, so try to turn it on ourselves if the magic
+# environment variable hasn't already been set.
+
+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")):
+  if not os.path.exists(d):
+    os.makedirs(d)
+
 if os.path.exists("children.csv"):
   for child_handle, valid_until, child_resource_pemfile in myrpki.csv_open("children.csv"):