diff options
Diffstat (limited to 'scripts/rpki')
| -rw-r--r-- | scripts/rpki/left_right.py | 11 | ||||
| -rw-r--r-- | scripts/rpki/sql.py | 11 |
2 files changed, 3 insertions, 19 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index b6f899ac..f3353026 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -351,21 +351,16 @@ class child_elt(data_elt): self.certs = {} def sql_fetch_hook(self, db, cur): - self.cas = rpki.sql.fetch_column(cur, "SELECT ca_id FROM child_ca_link WHERE child_id = %s", self.child_id) - cur.execute("SELECT ca_detail_id, cert FROM child_ca_certificate WHERE child_id = %s", self.child_id) + cur.execute("SELECT ca_detail_id, cert FROM child_cert WHERE child_id = %s", self.child_id) self.certs = dict((ca_detail_id, rpki.x509.X509(DER=cert)) for (ca_detail_id, cert) in cur.fetchall()) def sql_insert_hook(self, db, cur): - if self.cas: - cur.executemany("INSERT child_ca_link (ca_id, child_id) VALUES (%s, %s)", - ((x.ca_id, self.child_id) for x in self.cas)) if self.certs: - cur.executemany("INSERT child_ca_certificate (child_id, ca_detail_id, cert) VALUES (%s, %s, %s)", + cur.executemany("INSERT child_cert (child_id, ca_detail_id, cert) VALUES (%s, %s, %s)", ((self.child_id, ca_detail_id, cert.get_DER()) for (ca_detail_id, cert) in self.certs.items())) def sql_delete_hook(self, db, cur): - cur.execute("DELETE FROM child_ca_link where child_id = %s", self.child_id) - cur.execute("DELETE FROM child_ca_certificate where child_id = %s", self.child_id) + cur.execute("DELETE FROM child_cert where child_id = %s", self.child_id) def serve_post_save_hook(self, q_pdu, r_pdu): if self.reissue: diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py index c67062f2..d74be7fb 100644 --- a/scripts/rpki/sql.py +++ b/scripts/rpki/sql.py @@ -196,14 +196,3 @@ class ca_obj(sql_persistant): """Internal CA object.""" sql_template = template("ca", "ca_id", "last_crl_sn", "next_crl_update", "last_issued_sn", "last_manifest_sn", "next_manifest_update", "sia_uri", "parent_id") - - def sql_fetch_hook(self, db, cur): - self.children = fetch_column(cur, "SELECT child_id FROM child_ca_link WHERE ca_id = %s", self.ca_id) - - def sql_insert_hook(self, db, cur): - if self.children: - cur.executemany("INSERT child_ca_link (ca_id, child_id) VALUES (%s, %s)", - ((self.ca_id, x.child_id) for x in self.children)) - - def sql_delete_hook(self, db, cur): - cur.execute("DELETE FROM child_ca_link where ca_id = %s", self.ca_id) |