From 6d5fe21be4393ef644965669b4de2c976bc0096f Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 16 Oct 2015 23:07:52 +0000 Subject: PyLint. As usual, a lot of noise and a handful of real, albeit minor, bugs. svn path=/branches/tk705/; revision=6123 --- rpki/up_down.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'rpki/up_down.py') diff --git a/rpki/up_down.py b/rpki/up_down.py index fbd7b97f..1303647e 100644 --- a/rpki/up_down.py +++ b/rpki/up_down.py @@ -21,16 +21,14 @@ RPKI "up-down" protocol. """ -import base64 import logging -import lxml.etree import rpki.resource_set import rpki.x509 import rpki.exceptions import rpki.log import rpki.relaxng -from lxml.etree import Element, SubElement, tostring as ElementToString +from lxml.etree import SubElement, tostring as ElementToString logger = logging.getLogger(__name__) @@ -48,6 +46,11 @@ content_type = "application/x-rpki" # queries. allowed_content_types = ("application/rpki-updown", "application/x-rpki") +## @var enforce_strict_up_down_xml_sender +# Enforce strict checking of XML "sender" field in up-down protocol + +enforce_strict_up_down_xml_sender = False + tag_certificate = xmlns + "certificate" tag_class = xmlns + "class" tag_description = xmlns + "description" @@ -119,7 +122,7 @@ def check_response(r_msg, q_type): raise rpki.exceptions.UpstreamError(error_response_codes[int(r_msg.findtext(tag_status))]) if r_type != q_type + "_response": - raise UnexpectedUpDownResponse + raise rpki.exceptions.UnexpectedUpDownResponse if r_type == "issue_response" and (len(r_msg) != 1 or len(r_msg[0]) != 2): logger.debug("Weird issue_response %r: len(r_msg) %s len(r_msg[0]) %s", -- cgit v1.2.3