aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rcynic/rcynic.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c
index 5eece8b2..ccf91d6b 100644
--- a/rcynic/rcynic.c
+++ b/rcynic/rcynic.c
@@ -30,9 +30,6 @@
/* $Id$ */
-#warning Clean up AVL_PARANOIA junk as soon as we know new code works properly
-#define AVL_PARANOIA 1
-
/**
* @mainpage
*
@@ -85,6 +82,16 @@
#include "defstack.h"
#include "defasn1.h"
+/*
+ * Whether to run the old slow STACK-based validation_status lookup in
+ * parallel to the new faster AVL-based mechanism. The code
+ * controlled by this option will probably go away soon, it's just here
+ * in case we run into trouble while testing the new code.
+ */
+#ifndef AVL_PARANOIA
+#define AVL_PARANOIA 0
+#endif
+
#if !defined(FILENAME_MAX) && defined(PATH_MAX) && PATH_MAX > 1024
#define FILENAME_MAX PATH_MAX
#elif !defined(FILENAME_MAX)
'#n95'>95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415
"""
Merge XML entitydb and OpenSSL command-line BPKI into SQL IRDB.

This is a work in progress, don't use it unless you really know what
you're doing.

$Id$

Copyright (C) 2011  Internet Systems Consortium ("ISC")

Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
"""

import sys, os, time, getopt, glob, subprocess, base64
import rpki.config, rpki.x509, rpki.relaxng, rpki.sundial
from rpki.mysql_import import MySQLdb
from lxml.etree import ElementTree

if os.getlogin() != "sra":
  sys.exit("I //said// this was a work in progress")

cfg_file = "rpki.conf"
entitydb = "entitydb"
bpki     = "bpki"

opts, argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"])
for o, a in opts:
  if o in ("-h", "--help", "-?"):
    print __doc__
    sys.exit(0)
  if o in ("-c", "--config"):
    cfg_file = a
if argv:
  sys.exit("Unexpected arguments %s" % argv)

cfg = rpki.config.parser(cfg_file)

sql_database = cfg.get("sql-database", section = "irdbd")
sql_username = cfg.get("sql-username", section = "irdbd")
sql_password = cfg.get("sql-password", section = "irdbd")

db = MySQLdb.connect(user = sql_username, db = sql_database, passwd = sql_password)
cur = db.cursor()

# Configure the Django model system

from django.conf import settings

settings.configure(
  DATABASES = { "default" : {
    "ENGINE"   : "django.db.backends.mysql",
    "NAME"     : sql_database,
    "USER"     : sql_username,
    "PASSWORD" : sql_password,
    "HOST"     : "",
    "PORT"     : "",
    "OPTIONS"  : { "init_command": "SET storage_engine=INNODB" }}},
  INSTALLED_APPS = ("rpki.irdb",),
)

import rpki.irdb

# Create the model-based tables if they don't already exist

import django.core.management

django.core.management.call_command("syncdb", verbosity = 4, load_initial_data = False)

# From here down will be an awful lot of messing about with XML and
# X.509 data, extracting stuff from the old SQL database and whacking
# it into the new.  Still working out these bits.

xmlns = "{http://www.hactrn.net/uris/rpki/myrpki/}"

tag_authorization    = xmlns + "authorization"
tag_bpki_child_ta    = xmlns + "bpki_child_ta"
tag_bpki_client_ta   = xmlns + "bpki_client_ta"
tag_bpki_resource_ta = xmlns + "bpki_resource_ta"
tag_bpki_server_ta   = xmlns + "bpki_server_ta"
tag_bpki_ta          = xmlns + "bpki_ta"
tag_contact_info     = xmlns + "contact_info"
tag_identity         = xmlns + "identity"
tag_parent           = xmlns + "parent"
tag_repository       = xmlns + "repository"

e = ElementTree(file = os.path.join(entitydb, "identity.xml")).getroot()
rpki.relaxng.myrpki.assertValid(e)
assert e.tag == tag_identity

self_handle = e.get("handle")
assert self_handle == cfg.get("handle", section = "myrpki")

# Create identity if we haven't already

identity = rpki.irdb.Identity.objects.get_or_create(handle = self_handle)[0]

# Some BPKI utillity routines

def read_openssl_serial(filename):
  f = open(filename, "r")
  text = f.read()
  f.close()
  return int(text.strip(), 16)

def get_or_create_CA(purpose):
  cer = rpki.x509.X509(Auto_file = os.path.join(bpki, purpose, "ca.cer"))
  key = rpki.x509.RSA(Auto_file  = os.path.join(bpki, purpose, "ca.key"))
  crl = rpki.x509.CRL(Auto_file  = os.path.join(bpki, purpose, "ca.crl"))
  serial     = read_openssl_serial(os.path.join(bpki, purpose, "serial"))
  crl_number = read_openssl_serial(os.path.join(bpki, purpose, "crl_number"))

  return rpki.irdb.CA.objects.get_or_create(
    identity = identity,
    purpose = purpose,
    certificate = cer,
    private_key = key,
    latest_crl = crl,
    next_serial = serial,
    next_crl_number = crl_number,
    last_crl_update = crl.getThisUpdate().to_sql(),
    next_crl_update = crl.getNextUpdate().to_sql())[0]

def get_or_create_EECertificate(issuer, capurpose, eepurpose):
  cer = rpki.x509.X509(Auto_file = os.path.join(bpki, capurpose, eepurpose + ".cer"))
  key = rpki.x509.RSA(Auto_file  = os.path.join(bpki, capurpose, eepurpose + ".key"))
  rpki.irdb.EECertificate.objects.get_or_create(
    issuer      = issuer,
    purpose     = eepurpose,
    certificate = cer,
    private_key = key)

# Load BPKI CA data

resource_ca = get_or_create_CA("resources")
if os.path.exists(os.path.join(bpki, "resources", "referral.cer")):
  get_or_create_EECertificate(resource_ca, "resources", "referral")

# Load BPKI server EE certificates and keys

run_flags = dict((i, cfg.getboolean(i, section = "myrpki"))
                 for i in ("run_rpkid", "run_pubd", "run_rootd"))

if any(run_flags.itervalues()):
  server_ca = get_or_create_CA("servers")
  get_or_create_EECertificate(server_ca, "servers", "irbe")
  if run_flags["run_rpkid"]:
    get_or_create_EECertificate(server_ca, "servers", "rpkid")
    get_or_create_EECertificate(server_ca, "servers", "irdbd")
  if run_flags["run_pubd"]:
    get_or_create_EECertificate(server_ca, "servers", "pubd")
  if run_flags["run_rootd"]:
    get_or_create_EECertificate(server_ca, "servers", "rootd")
else:
  server_ca = None

# Load BSC certificates and requests.  Yes, this currently wires in
# exactly one BSC handle, "bsc".  So does the old myrpki code.  Ick.

for fn in glob.iglob(os.path.join(bpki, "resources", "bsc.*.cer")):
  rpki.irdb.BSC.objects.get_or_create(
    issuer      = resource_ca,
    handle      = "bsc",
    certificate = rpki.x509.X509(Auto_file = fn),
    pkcs10      = rpki.x509.PKCS10(Auto_file = fn[:-4] + ".req"))

def xcert_hash(cert):
  """
  Generate the filename hash that myrpki would have generated for a
  cross-certification.  This is nasty, don't look.
  """

  cmd1 = ("openssl", "x509", "-noout", "-pubkey", "-subject")
  cmd2 = ("openssl", "dgst", "-md5")

  env = { "PATH" : os.environ["PATH"], "OPENSSL_CONF" : "/dev/null" }
  p1 = subprocess.Popen(cmd1, env = env, stdin = subprocess.PIPE, stdout = subprocess.PIPE)
  p2 = subprocess.Popen(cmd2, env = env, stdin = p1.stdout, stdout = subprocess.PIPE)
  p1.stdin.write(cert.get_PEM())
  p1.stdin.close()
  hash = p2.stdout.read()
  if p1.wait() != 0:
    raise subprocess.CalledProcessError(returncode = p1.returncode, cmd = cmd1)
  if p2.wait() != 0:
    raise subprocess.CalledProcessError(returncode = p2.returncode, cmd = cmd2)

  hash = "".join(hash.split())
  if hash.startswith("(stdin)="):
    hash =  hash[len("(stdin)="):]
  return hash

# OK, all this wretched cross-certification looks complicated, but
# that's partly because of the way we've been doing it on disk.  The
# new SQL/object based approach should make it much clearer:
#
#   Child cross certifies parent's resource TA in child's resource CA.
#
#   Parent cross certifies child's resource TA in parent's resource
#   CA.
#
#   Repository cross certifies client's resource TA in repository's
#   server CA.
#
#   Client cross certifies repository's server TA in client's resource
#   CA.
#
# The remaining xcert files look to be TLS relics which no longer
# serve any real purpose; in theory, those can just go away.

# Let's try keeping track of all the xcert filenames we use, so we can
# list the ones we didn't.

xcert_filenames = set(glob.iglob(os.path.join(bpki, "*", "xcert.*.cer")))

# Scrape child data out of the entitydb.

for filename in glob.iglob(os.path.join(entitydb, "children", "*.xml")):
  child_handle = os.path.splitext(os.path.split(filename)[1])[0]

  e = ElementTree(file = filename).getroot()
  rpki.relaxng.myrpki.assertValid(e)
  assert e.tag == tag_parent

  ta = rpki.x509.X509(Base64 = e.findtext(tag_bpki_child_ta))
  xcfn = os.path.join(bpki, "resources", "xcert.%s.cer" % xcert_hash(ta))
  xcert_filenames.discard(xcfn)
  xcert = rpki.x509.X509(Auto_file = xcfn)

  cur.execute("""
              SELECT registrant_id, valid_until FROM registrant
              WHERE registry_handle = %s AND registrant_handle = %s
              """, (self_handle, child_handle))
  assert cur.rowcount == 1
  registrant_id, valid_until = cur.fetchone()

  valid_until = rpki.sundial.datetime.fromdatetime(valid_until)
  assert valid_until == rpki.sundial.datetime.fromXMLtime(e.get("valid_until"))

  child = rpki.irdb.Child.objects.get_or_create(
    handle = child_handle,
    valid_until = valid_until.to_sql(),
    ta = ta,
    certificate = xcert,
    issuer = resource_ca)[0]

  cur.execute("""
              SELECT start_as, end_as FROM registrant_asn WHERE registrant_id = %s
              """, (registrant_id,))
  for start_as, end_as in cur.fetchall():
    rpki.irdb.ChildASN.objects.get_or_create(
      start_as = start_as,
      end_as = end_as,
      child = child)

  cur.execute("""
              SELECT start_ip, end_ip, version FROM registrant_net WHERE registrant_id = %s
              """, (registrant_id,))
  for start_ip, end_ip, version in cur.fetchall():
    rpki.irdb.ChildNet.objects.get_or_create(
      start_ip = start_ip,
      end_ip = end_ip,
      version = version,
      child = child)

# Scrape parent data out of the entitydb.

for filename in glob.iglob(os.path.join(entitydb, "parents", "*.xml")):
  parent_handle = os.path.splitext(os.path.split(filename)[1])[0]

  e = ElementTree(file = filename).getroot()
  rpki.relaxng.myrpki.assertValid(e)
  assert e.tag == tag_parent

  ta = rpki.x509.X509(Base64 = e.findtext(tag_bpki_resource_ta))
  xcfn = os.path.join(bpki, "resources", "xcert.%s.cer" % xcert_hash(ta))
  xcert_filenames.discard(xcfn)
  xcert = rpki.x509.X509(Auto_file = xcfn)

  r = e.find(tag_repository)
  repository_type = r.get("type")
  if repository_type == "referral":
    a = r.find(tag_authorization)
    referrer = a.get("referrer")
    referral_authorization = base64.b64decode(a.text)
  else:
    referrer = None
    referral_authorization = None    

  parent = rpki.irdb.Parent.objects.get_or_create(
    handle = parent_handle,
    parent_handle = e.get("parent_handle"),
    child_handle = e.get("child_handle"),
    ta = ta,
    certificate = xcert,
    repository_type = repository_type,
    referrer = referrer,
    referral_authorization = referral_authorization,
    issuer = resource_ca)[0]

  # While we have the parent object in hand, load any Ghostbuster
  # entries specific to this parent.

  cur.execute("""
              SELECT vcard FROM ghostbuster_request
              WHERE self_handle = %s AND parent_handle = %s
              """, (self_handle, parent_handle))
  for row in cur.fetchall():
    rpki.irdb.GhostbusterRequest.objects.get_or_create(
      identity = identity,
      parent = parent,
      vcard = row[0])

# Scrape repository data out of the entitydb.

for filename in glob.iglob(os.path.join(entitydb, "repositories", "*.xml")):
  repository_handle = os.path.splitext(os.path.split(filename)[1])[0]

  e = ElementTree(file = filename).getroot()
  rpki.relaxng.myrpki.assertValid(e)
  assert e.tag == tag_repository

  if e.get("type") != "confirmed":
    continue

  ta = rpki.x509.X509(Base64 = e.findtext(tag_bpki_server_ta))
  xcfn = os.path.join(bpki, "resources", "xcert.%s.cer" % xcert_hash(ta))
  xcert_filenames.discard(xcfn)
  xcert = rpki.x509.X509(Auto_file = xcfn)

  parent = rpki.irdb.Parent.objects.get(handle = e.get("parent_handle"))

  rpki.irdb.Repository.objects.get_or_create(
    handle = repository_handle,
    client_handle = e.get("client_handle"),
    ta = ta,
    certificate = xcert,
    service_uri = e.get("service_uri"),
    sia_base = e.get("sia_base"),
    parent = parent,
    issuer = resource_ca)

# Scrape client data out of the entitydb.

for filename in glob.iglob(os.path.join(entitydb, "pubclients", "*.xml")):
  client_handle = os.path.splitext(os.path.split(filename)[1])[0]

  e = ElementTree(file = filename).getroot()
  rpki.relaxng.myrpki.assertValid(e)
  assert e.tag == tag_repository

  assert e.get("type") == "confirmed"

  ta = rpki.x509.X509(Base64 = e.findtext(tag_bpki_client_ta))
  xcfn = os.path.join(bpki, "servers", "xcert.%s.cer" % xcert_hash(ta))
  xcert_filenames.discard(xcfn)
  xcert = rpki.x509.X509(Auto_file = xcfn)

  rpki.irdb.Repository.objects.get_or_create(
    handle = client_handle,
    ta = ta,
    certificate = xcert,
    issuer = server_ca)

# Copy over any ROA requests

cur.execute("""
            SELECT roa_request_id, asn FROM roa_request
            WHERE roa_request_handle = %s
            """, (self_handle,))
for roa_request_id, asn in cur.fetchall():
  roa_request = rpki.irdb.ROARequest.objects.get_or_create(identity = identity, asn = asn)[0]
  cur.execute("""
              SELECT prefix, prefixlen, max_prefixlen, version FROM roa_request_prefix
              WHERE roa_request_id = %s
              """, (roa_request_id,))
  for prefix, prefixlen, max_prefixlen, version in cur.fetchall():
    rpki.irdb.ROARequestPrefix.objects.get_or_create(
      roa_request = roa_request,
      version = version,
      prefix = prefix,
      prefixlen = prefixlen,
      max_prefixlen = max_prefixlen)

# Copy over any non-parent-specific Ghostbuster requests.

cur.execute("""
            SELECT vcard FROM ghostbuster_request
            WHERE self_handle = %s AND parent_handle IS NULL
            """, (self_handle,))
for row in cur.fetchall():
  rpki.irdb.GhostbusterRequest.objects.get_or_create(
    identity = identity,
    parent = None,
    vcard = row[0])

# List cross certifications we didn't use.

for filename in sorted(xcert_filenames):
  cer = rpki.x509.X509(Auto_file = filename)
  #print "Unused cross-certificate:", filename, cer.getSubject()
  print "Unused cross-certificate:", filename, cer.get_POW().pprint()

# Done!

cur.close()
db.close()