diff options
| -rw-r--r-- | rpkid/rpki/irdb/models.py | 8 | ||||
| -rw-r--r-- | rpkid/rpki/rpkic.py | 6 | ||||
| -rw-r--r-- | scripts/convert-from-entitydb-to-sql.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py index 34656363..9ab50de5 100644 --- a/rpkid/rpki/irdb/models.py +++ b/rpkid/rpki/irdb/models.py @@ -154,12 +154,12 @@ class CertificateManager(django.db.models.Manager): changed = False try: - # Icky, but does what we need. + # Seriously icky, but does what we need. Rewrite using some + # kind of method routine that returns the key names. try: - keys = self.model._meta.unique_together - except AttributeError: + keys = self.model._meta.unique_together[0] or ("handle",) + except (AttributeError, IndexError): keys = ("handle",) - print "++ Keys:", repr(keys) obj = self.get(**dict((k, kwargs[k]) for k in keys)) except self.model.DoesNotExist: diff --git a/rpkid/rpki/rpkic.py b/rpkid/rpki/rpkic.py index 5a0aff85..ea2b7b2a 100644 --- a/rpkid/rpki/rpkic.py +++ b/rpkid/rpki/rpkic.py @@ -222,7 +222,7 @@ class main(rpki.cli.Cmd): except rpki.irdb.CA.DoesNotExist: self.resource_ca = None try: - self.server_ca = rpki.irdb.CA.objects.get(handle = "") + self.server_ca = rpki.irdb.CA.objects.get(handle = "*") except rpki.irdb.CA.DoesNotExist: self.server_ca = None @@ -271,7 +271,7 @@ class main(rpki.cli.Cmd): print "Created new BPKI resource CA for identity %s" % self.handle if self.run_rpkid or self.run_pubd or self.run_rootd: - self.server_ca, created = rpki.irdb.CA.objects.get_or_certify(handle = "") + self.server_ca, created = rpki.irdb.CA.objects.get_or_certify(handle = "*") if created: print "Created new BPKI server CA" if self.run_rpkid: @@ -869,7 +869,7 @@ class main(rpki.cli.Cmd): action = "set", bpki_crl = self.server_ca.latest_crl)) - for ca in rpki.irdb.CA.objects.exclude(handle = ""): + for ca in rpki.irdb.CA.objects.exclude(handle = "*"): # See what rpkid and pubd already have on file for this entity. diff --git a/scripts/convert-from-entitydb-to-sql.py b/scripts/convert-from-entitydb-to-sql.py index 8c1e6bbb..dbdde34c 100644 --- a/scripts/convert-from-entitydb-to-sql.py +++ b/scripts/convert-from-entitydb-to-sql.py @@ -117,7 +117,7 @@ def get_or_create_CA(purpose): crl_number = read_openssl_serial(os.path.join(bpki, purpose, "crl_number")) return rpki.irdb.CA.objects.get_or_create( - handle = self_handle if purpose == "resources" else "", + handle = self_handle if purpose == "resources" else "*", certificate = cer, private_key = key, latest_crl = crl, |