diff options
| -rw-r--r-- | scripts/rpki/left_right.py | 8 | ||||
| -rw-r--r-- | scripts/rpki/up_down.py | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 589cc25c..14b60fcb 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -258,7 +258,7 @@ class self_elt(data_elt): def client_poll(self, gctx): """Run the regular client poll cycle with each of this self's parents in turn.""" for parent in parent_elt.sql_fetch_where(gctx, "self_id = %s" % self.self_id): - r_pdu = rpki.up_down.list_pdu(gctx, parent) + r_pdu = rpki.up_down.list_pdu.query(gctx, parent) ca_map = dict((ca.parent_resource_class, ca) for ca in rpki.sql.ca_obj.sql_fetch_where(gctx, "parent_id = %s" % parent.parent_id)) for rc in r_pdu.payload: @@ -288,12 +288,12 @@ class bsc_elt(data_elt): def __init__(self): """Initialize bsc_elt.""" - self.signing_cert = [] + self.signing_cert = rpki.x509.X509_chain() def sql_fetch_hook(self, gctx): """Extra SQL fetch actions for bsc_elt -- handle signing certs.""" gctx.cur.execute("SELECT cert FROM bsc_cert WHERE bsc_id = %s", self.bsc_id) - self.signing_cert = [rpki.x509.X509(DER=x) for (x,) in gctx.cur.fetchall()] + self.signing_cert[:] = [rpki.x509.X509(DER=x) for (x,) in gctx.cur.fetchall()] def sql_insert_hook(self, gctx): """Extra SQL insert actions for bsc_elt -- handle signing certs.""" @@ -309,7 +309,7 @@ class bsc_elt(data_elt): """Extra server actions for bsc_elt -- handle signing certs and key generation.""" if self is not q_pdu: if q_pdu.clear_signing_certs: - self.signing_cert = [] + self.signing_cert[:] = [] self.signing_cert.extend(q_pdu.signing_cert) if q_pdu.generate_keypair: # diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 268134ca..7a9f0d7e 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -192,8 +192,7 @@ class list_pdu(base_elt): @classmethod def query(cls, gctx, parent): """Send a "list" query to parent.""" - self = cls() - return parent.query_up_down(gctx, self) + return parent.query_up_down(gctx, cls()) class class_response_syntax(base_elt): """Syntax for Up-Down protocol "list_response" and "issue_response" PDUs.""" @@ -477,7 +476,7 @@ class message_pdu(base_elt): @classmethod def make_query(cls, payload, sender = "tweedledee", recipient = "tweedledum"): """Construct one message PDU.""" - assert not self.type2name[type(payload)].endswith("_response") + assert not cls.type2name[type(payload)].endswith("_response") self = cls() self.sender = sender self.recipient = recipient |