diff options
| -rw-r--r-- | scripts/up-down-protocol-samples/error_response.xml | 2 | ||||
| -rw-r--r-- | scripts/up-down-protocol-samples/issue.xml | 2 | ||||
| -rw-r--r-- | scripts/up-down-protocol-samples/issue_response.xml | 11 | ||||
| -rw-r--r-- | scripts/up-down-protocol-samples/list.xml | 3 | ||||
| -rw-r--r-- | scripts/up-down-protocol-samples/list_response.xml | 11 | ||||
| -rw-r--r-- | scripts/up-down-protocol-samples/revoke.xml | 1 | ||||
| -rw-r--r-- | scripts/up-down-protocol-samples/revoke_response.xml | 1 | ||||
| -rwxr-xr-x | scripts/xml-parse-test.py | 36 |
8 files changed, 14 insertions, 53 deletions
diff --git a/scripts/up-down-protocol-samples/error_response.xml b/scripts/up-down-protocol-samples/error_response.xml index 82ef0258..83af6649 100644 --- a/scripts/up-down-protocol-samples/error_response.xml +++ b/scripts/up-down-protocol-samples/error_response.xml @@ -3,9 +3,7 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="42" type="error_response"> <status>2001</status> - <last_msg_processed>17</last_msg_processed> <description xml:lang="en-US">[Readable text]</description> </message> diff --git a/scripts/up-down-protocol-samples/issue.xml b/scripts/up-down-protocol-samples/issue.xml index 1efc6644..9eaaa4f1 100644 --- a/scripts/up-down-protocol-samples/issue.xml +++ b/scripts/up-down-protocol-samples/issue.xml @@ -3,7 +3,7 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="42" type="issue"> + type="issue"> <request class_name="class name" req_resource_set_as="" req_resource_set_ipv4="10.0.0.44/32" diff --git a/scripts/up-down-protocol-samples/issue_response.xml b/scripts/up-down-protocol-samples/issue_response.xml index 13fcdb35..940410ad 100644 --- a/scripts/up-down-protocol-samples/issue_response.xml +++ b/scripts/up-down-protocol-samples/issue_response.xml @@ -3,25 +3,16 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="1" type="issue_response"> <class class_name="class name" cert_url="url" - cert_ski="g(ski)" resource_set_as="22,42,44444-5555555" resource_set_ipv4="10.0.0.44-10.3.0.44,10.6.0.2/32" resource_set_ipv6="dead:beef::/128"> <certificate cert_url="url" - cert_ski="g(ski)" - cert_aki="g(aki)" - cert_serial="1" - resource_set_as="14-17" - resource_set_ipv4="128.224.1.136/22" - resource_set_ipv6="0:0::/22" req_resource_set_as="" req_resource_set_ipv4="10.0.0.77/16,127.0.0.1/8" - req_resource_set_ipv6="dead:beef::/16" - status="match"> + req_resource_set_ipv6="dead:beef::/16"> deadbeef </certificate> <issuer>deadbeef</issuer> diff --git a/scripts/up-down-protocol-samples/list.xml b/scripts/up-down-protocol-samples/list.xml index bceb823c..01a803f3 100644 --- a/scripts/up-down-protocol-samples/list.xml +++ b/scripts/up-down-protocol-samples/list.xml @@ -3,5 +3,4 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="42" - type="list"/> + type="list" /> diff --git a/scripts/up-down-protocol-samples/list_response.xml b/scripts/up-down-protocol-samples/list_response.xml index eef79052..fc39c8ba 100644 --- a/scripts/up-down-protocol-samples/list_response.xml +++ b/scripts/up-down-protocol-samples/list_response.xml @@ -3,26 +3,17 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="42" type="list_response"> <class class_name="class name" cert_url="url" - cert_ski="g(ski)" resource_set_as="1,2,4,6,16-32" resource_set_ipv4="128.224.1.1-128.22.4.32" resource_set_ipv6="" suggested_sia_head="rsync://wombat.example/fnord/"> <certificate cert_url="url" - cert_ski="g(ski)" - cert_aki="g(aki)" - cert_serial="1" - resource_set_as="" - resource_set_ipv4="" - resource_set_ipv6="" req_resource_set_as="" req_resource_set_ipv4="" - req_resource_set_ipv6="" - status="match"> + req_resource_set_ipv6=""> deadbeef </certificate> <!-- Repeated for each current certificate naming the client as subject --> diff --git a/scripts/up-down-protocol-samples/revoke.xml b/scripts/up-down-protocol-samples/revoke.xml index cf52cb95..216ce9fb 100644 --- a/scripts/up-down-protocol-samples/revoke.xml +++ b/scripts/up-down-protocol-samples/revoke.xml @@ -3,7 +3,6 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="42" type="revoke"> <key class_name="class name" ski="g(ski)"/> diff --git a/scripts/up-down-protocol-samples/revoke_response.xml b/scripts/up-down-protocol-samples/revoke_response.xml index 362a7a6d..59f17661 100644 --- a/scripts/up-down-protocol-samples/revoke_response.xml +++ b/scripts/up-down-protocol-samples/revoke_response.xml @@ -3,7 +3,6 @@ version="1" sender="sender name" recipient="recipient name" - msg_ref="42" type="revoke_response"> <key class_name="class name" ski="g(ski)"/> diff --git a/scripts/xml-parse-test.py b/scripts/xml-parse-test.py index d4d8f26f..ba4da001 100755 --- a/scripts/xml-parse-test.py +++ b/scripts/xml-parse-test.py @@ -76,9 +76,8 @@ class rpki_updown_msg(object): version="1"\n\ sender="%s"\n\ recipient="%s"\n\ - msg_ref="%s"\n\ type="%s">\n' \ - % (self.sender, self.recipient, self.msg_ref, self.type) + % (self.sender, self.recipient, self.type) ) + self.toXML() + "</message>\n" def toXML(self): @@ -93,12 +92,8 @@ class rpki_updown_msg(object): class rpki_updown_cert(object): def __init__(self, attrs): - for k in ("cert_url", "cert_ski", "cert_aki", "cert_serial", "status"): + for k in ("cert_url", ): setattr(self, k, attrs.getValue(k).encode("ascii")) - for k,f in (("resource_set_as", rpki_updown_resource_set_as), - ("resource_set_ipv4", rpki_updown_resource_set_ipv4), - ("resource_set_ipv6", rpki_updown_resource_set_ipv6)): - setattr(self, k, f(attrs.getValue(k).encode("ascii"))) for k,f in (("req_resource_set_as", rpki_updown_resource_set_as), ("req_resource_set_ipv4", rpki_updown_resource_set_ipv4), ("req_resource_set_ipv6", rpki_updown_resource_set_ipv6)): @@ -108,30 +103,20 @@ class rpki_updown_cert(object): setattr(self, k, None) def toXML(self): - xml = ('\ - <certificate cert_url="%s"\n\ - cert_ski="%s"\n\ - cert_aki="%s"\n\ - cert_serial="%s"\n\ - resource_set_as="%s"\n\ - resource_set_ipv4="%s"\n\ - resource_set_ipv6="%s"\n' \ - % (self.cert_url, self.cert_ski, self.cert_aki, self.cert_serial, - self.resource_set_as, self.resource_set_ipv4, self.resource_set_ipv6)) + xml = (' <certificate cert_url="%s"' % (self.cert_url)) if self.req_resource_set_as: - xml += (' req_resource_set_as="%s"\n' % self.req_resource_set_as) + xml += ('\n req_resource_set_as="%s"' % self.req_resource_set_as) if self.req_resource_set_ipv4: - xml += (' req_resource_set_ipv4="%s"\n' % self.req_resource_set_ipv4) + xml += ('\n req_resource_set_ipv4="%s"' % self.req_resource_set_ipv4) if self.req_resource_set_ipv6: - xml += (' req_resource_set_ipv6="%s"\n' % self.req_resource_set_ipv6) - xml += (' status="%s">' % self.status) - xml += base64.b64encode(self.cert) + "</certificate>\n" + xml += ('\n req_resource_set_ipv6="%s"' % self.req_resource_set_ipv6) + xml += ">" + base64.b64encode(self.cert) + "</certificate>\n" return xml class rpki_updown_class(object): def __init__(self, attrs): - for k in ("class_name", "cert_url", "cert_ski"): + for k in ("class_name", "cert_url"): setattr(self, k, attrs.getValue(k).encode("ascii")) for k,f in (("resource_set_as", rpki_updown_resource_set_as), ("resource_set_ipv4", rpki_updown_resource_set_ipv4), @@ -147,11 +132,10 @@ class rpki_updown_class(object): xml = ('\ <class class_name="%s"\n\ cert_url="%s"\n\ - cert_ski="%s"\n\ resource_set_as="%s"\n\ resource_set_ipv4="%s"\n\ resource_set_ipv6="%s"' \ - % (self.class_name, self.cert_url, self.cert_ski, + % (self.class_name, self.cert_url, self.resource_set_as, self.resource_set_ipv4, self.resource_set_ipv6)) if self.suggested_sia_head: xml += ('\n suggested_sia_head="%s"' % (self.suggested_sia_head)) @@ -271,7 +255,7 @@ class rpki_updown_sax_handler(xml.sax.handler.ContentHandler): "error_response" : rpki_updown_error_response() }[attrs.getValue("type")] assert self.obj != None - for k in ("type", "sender", "recipient", "msg_ref"): + for k in ("type", "sender", "recipient"): setattr(self.obj, k, attrs.getValue(k).encode("ascii")) else: assert self.obj != None |