diff options
| -rw-r--r-- | rpkid/irbe-setup.py | 2 | ||||
| -rwxr-xr-x | rpkid/irdbd.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/publication.py | 5 | ||||
| -rw-r--r-- | rpkid/rpki/rpki_engine.py | 4 | ||||
| -rw-r--r-- | rpkid/rpki/xml_utils.py | 8 | ||||
| -rw-r--r-- | rpkid/testbed.py | 4 |
6 files changed, 16 insertions, 9 deletions
diff --git a/rpkid/irbe-setup.py b/rpkid/irbe-setup.py index a7e8c441..11f3a7a0 100644 --- a/rpkid/irbe-setup.py +++ b/rpkid/irbe-setup.py @@ -60,7 +60,7 @@ def call_rpkid(pdu): msg = cms) msg = rpki.left_right.cms_msg.unwrap(der, (bpki_ta, rpkid_cert)) pdu = msg[0] - assert len(msg) == 1 and msg.type == "reply" and not isinstance(pdu, rpki.left_right.report_error_elt) + assert len(msg) == 1 and msg.is_reply() and not isinstance(pdu, rpki.left_right.report_error_elt) return pdu print "Create a self instance" diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py index 584e7454..de7a0d71 100755 --- a/rpkid/irdbd.py +++ b/rpkid/irdbd.py @@ -113,7 +113,7 @@ def handler(query, path, cb): q_msg = rpki.left_right.cms_msg.unwrap(query, (bpki_ta, rpkid_cert)) - if not isinstance(q_msg, rpki.left_right.msg) or q_msg.type != "query": + if not isinstance(q_msg, rpki.left_right.msg) or not q_msg.is_query(): raise rpki.exceptions.BadQuery, "Unexpected %s PDU" % repr(q_msg) r_msg = rpki.left_right.msg.reply() diff --git a/rpkid/rpki/publication.py b/rpkid/rpki/publication.py index dc033d31..64094cdd 100644 --- a/rpkid/rpki/publication.py +++ b/rpkid/rpki/publication.py @@ -315,10 +315,9 @@ class msg(rpki.xml_utils.msg, publication_namespace): """ Serve one msg PDU. """ - if self.type != "query": + if not self.is_query(): raise rpki.exceptions.BadQuery, "Message type is not query" - r_msg = self.__class__() - r_msg.type = "reply" + r_msg = self.__class__.reply() def loop(iterator, q_pdu): diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py index 08f090f3..04cc72f9 100644 --- a/rpkid/rpki/rpki_engine.py +++ b/rpkid/rpki/rpki_engine.py @@ -71,7 +71,7 @@ class rpkid_context(object): def unwrap(der): r_msg = rpki.left_right.cms_msg.unwrap(der, (self.bpki_ta, self.irdb_cert)) - if r_msg.type != "reply" or [r_pdu for r_pdu in r_msg if type(r_pdu) is not type(q_pdu)]: + if not r_msg.is_reply() or [r_pdu for r_pdu in r_msg if type(r_pdu) is not type(q_pdu)]: errback(rpki.exceptions.BadIRDBReply( "Unexpected response to IRDB query: %s" % lxml.etree.tostring(r_msg.toXML(), pretty_print = True, encoding = "us-ascii"))) else: @@ -137,7 +137,7 @@ class rpkid_context(object): try: self.sql.ping() q_msg = rpki.left_right.cms_msg.unwrap(query, (self.bpki_ta, self.irbe_cert)) - if q_msg.type != "query": + if not q_msg.is_query(): raise rpki.exceptions.BadQuery, "Message type is not query" q_msg.serve_top_level(self, done) except (rpki.async.ExitNow, SystemExit): diff --git a/rpkid/rpki/xml_utils.py b/rpkid/rpki/xml_utils.py index 9e4aa265..6bcd03c8 100644 --- a/rpkid/rpki/xml_utils.py +++ b/rpkid/rpki/xml_utils.py @@ -429,3 +429,11 @@ class msg(list): self = cls(*args) self.type = "reply" return self + + def is_query(self): + """Is this msg a query?""" + return self.type == "query" + + def is_reply(self): + """Is this msg a reply?""" + return self.type == "reply" diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 698f986e..2ab8357b 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -771,7 +771,7 @@ class allocation(object): msg, xml = rpki.left_right.cms_msg.unwrap(val, (self.rpkid_ta, self.rpkid_cert), pretty_print = True) rpki.log.debug(xml) - assert msg.type == "reply" + assert msg.is_reply() for pdu in msg: assert not isinstance(pdu, rpki.left_right.report_error_elt) cb(msg) @@ -1155,7 +1155,7 @@ def call_pubd(pdus, cb): msg, xml = rpki.publication.cms_msg.unwrap(val, (pubd_ta, pubd_pubd_cert), pretty_print = True) rpki.log.debug(xml) - assert msg.type == "reply" + assert msg.is_reply() for pdu in msg: assert not isinstance(pdu, rpki.publication.report_error_elt) cb(msg) |