diff options
| author | Rob Austein <sra@hactrn.net> | 2011-12-15 15:19:13 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-12-15 15:19:13 +0000 |
| commit | 30923f4cb2ae26aca367c01fab6ead0b59e59db9 (patch) | |
| tree | 9fed81f5f14d415bc4c6414e8f573ed08da70d95 /scripts | |
| parent | fc2941d92286ca1e01400c3a46abbd88b411f6f8 (diff) | |
Checkpoint. Add rpki.irdb.models.CertificateManager() to consolidate
BPKI object creation logic. Move CSV code out of rpkic.
svn path=/branches/tk100/; revision=4122
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/convert-from-entitydb-to-sql.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scripts/convert-from-entitydb-to-sql.py b/scripts/convert-from-entitydb-to-sql.py index 1fb1bbea..bea12e84 100644 --- a/scripts/convert-from-entitydb-to-sql.py +++ b/scripts/convert-from-entitydb-to-sql.py @@ -130,18 +130,20 @@ def get_or_create_CA(purpose): last_crl_update = crl.getThisUpdate().to_sql(), next_crl_update = crl.getNextUpdate().to_sql())[0] -def get_or_create_EECertificate(issuer, purpose): - cer = rpki.x509.X509(Auto_file = os.path.join(bpki, "servers", purpose + ".cer")) - key = rpki.x509.RSA(Auto_file = os.path.join(bpki, "servers", purpose + ".key")) +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 = rpki.irdb.EECertificate.purpose_map[purpose], + purpose = rpki.irdb.EECertificate.purpose_map[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 @@ -150,14 +152,14 @@ run_flags = dict((i, cfg.getboolean(i, section = "myrpki")) if any(run_flags.itervalues()): server_ca = get_or_create_CA("servers") - get_or_create_EECertificate(server_ca, "irbe") + get_or_create_EECertificate(server_ca, "servers", "irbe") if run_flags["run_rpkid"]: - get_or_create_EECertificate(server_ca, "rpkid") - get_or_create_EECertificate(server_ca, "irdbd") + 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, "pubd") + get_or_create_EECertificate(server_ca, "servers", "pubd") if run_flags["run_rootd"]: - get_or_create_EECertificate(server_ca, "rootd") + get_or_create_EECertificate(server_ca, "servers", "rootd") else: server_ca = None |