aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/left-right-xml6
-rw-r--r--scripts/left-right-protocol-samples/pdu.053.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.056.xml2
-rw-r--r--scripts/left-right-protocol-samples/pdu.058.xml2
-rw-r--r--scripts/left-right-schema.rnc2
-rw-r--r--scripts/left-right-schema.rng2
-rw-r--r--scripts/rpki/left_right.py72
7 files changed, 22 insertions, 66 deletions
diff --git a/docs/left-right-xml b/docs/left-right-xml
index d839100e..99c743d3 100644
--- a/docs/left-right-xml
+++ b/docs/left-right-xml
@@ -668,7 +668,7 @@
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
<route_origin action="set" type="query" self_id="42" route_origin_id="88"
suppress_publication="yes"
- asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
+ as_number="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
</msg>
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
@@ -681,7 +681,7 @@
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
<route_origin action="get" type="reply" self_id="42" route_origin_id="88"
- asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
+ as_number="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
</msg>
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
@@ -690,7 +690,7 @@
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
<route_origin action="list" type="reply" self_id="42" route_origin_id="88"
- asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
+ as_number="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
</msg>
<msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
diff --git a/scripts/left-right-protocol-samples/pdu.053.xml b/scripts/left-right-protocol-samples/pdu.053.xml
index e2dd6d6a..a36dc495 100644
--- a/scripts/left-right-protocol-samples/pdu.053.xml
+++ b/scripts/left-right-protocol-samples/pdu.053.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="US-ASCII"?>
<!--Automatically generated, do not edit.-->
<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
- <route_origin action="set" type="query" self_id="42" route_origin_id="88" suppress_publication="yes" asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
+ <route_origin action="set" type="query" self_id="42" route_origin_id="88" suppress_publication="yes" as_number="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
</msg>
diff --git a/scripts/left-right-protocol-samples/pdu.056.xml b/scripts/left-right-protocol-samples/pdu.056.xml
index fb88d50b..554cf859 100644
--- a/scripts/left-right-protocol-samples/pdu.056.xml
+++ b/scripts/left-right-protocol-samples/pdu.056.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="US-ASCII"?>
<!--Automatically generated, do not edit.-->
<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
- <route_origin action="get" type="reply" self_id="42" route_origin_id="88" asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
+ <route_origin action="get" type="reply" self_id="42" route_origin_id="88" as_number="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
</msg>
diff --git a/scripts/left-right-protocol-samples/pdu.058.xml b/scripts/left-right-protocol-samples/pdu.058.xml
index 537f805f..d4d72210 100644
--- a/scripts/left-right-protocol-samples/pdu.058.xml
+++ b/scripts/left-right-protocol-samples/pdu.058.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="US-ASCII"?>
<!--Automatically generated, do not edit.-->
<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
- <route_origin action="list" type="reply" self_id="42" route_origin_id="88" asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
+ <route_origin action="list" type="reply" self_id="42" route_origin_id="88" as_number="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/>
</msg>
diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc
index 9ba5c7a8..7b3ab24f 100644
--- a/scripts/left-right-schema.rnc
+++ b/scripts/left-right-schema.rnc
@@ -160,7 +160,7 @@ ro_id = attribute route_origin_id { sql_id }
ro_bool = attribute suppress_publication { "yes" }?
-ro_payload = (attribute asn { xsd:token { maxLength="1024" } }?,
+ro_payload = (attribute as_number { xsd:token { maxLength="1024" } }?,
attribute ipv4 { xsd:token { maxLength="1024" } }?,
attribute ipv6 { xsd:token { maxLength="1024" } }?)
diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng
index 209f53ad..b794e5ea 100644
--- a/scripts/left-right-schema.rng
+++ b/scripts/left-right-schema.rng
@@ -720,7 +720,7 @@
</define>
<define name="ro_payload">
<optional>
- <attribute name="asn">
+ <attribute name="as_number">
<data type="token">
<param name="maxLength">1024</param>
</data>
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index 67449644..bc04868c 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -56,7 +56,16 @@ class data_elt(base_elt, rpki.sql.sql_persistant):
top-level persistant data elements.
"""
- pass
+ def sql_decode(self, vals):
+ rpki.sql.sql_persistant.sql_decode(self, vals)
+ if "peer_ta" in vals:
+ self.peer_ta = rpki.x509.X509(DER=vals["peer_ta"])
+
+ def sql_encode(self):
+ d = rpki.sql.sql_persistant.sql_encode(self)
+ if "peer_id" in d:
+ d["peer_ta"] = self.peer_ta.get_DER()
+ return d
def get_ta_DER(thing):
"""None-tolerant wrapper around rpki.x509.X509.get_DER()."""
@@ -151,23 +160,6 @@ class parent_elt(data_elt):
sql_template = rpki.sql.template("parent", "parent_id", "self_id", "bsc_id", "repository_id", "peer_ta", "peer_contact_uri", "sia_base")
- def sql_decode(self, vals):
- self.self_id = vals["self_id"]
- self.bsc_id = vals["bsc_id"]
- self.repository_id = vals["repository_id"]
- self.parent_id = vals["parent_id"]
- self.peer_contact_uri = vals["peer_contact_uri"]
- self.peer_ta = rpki.x509.X509(DER=vals["peer_ta"])
-
- def sql_encode(self):
- return { "self_id" : self.self_id,
- "bsc_id" : self.bsc_id,
- "repository_id" : self.repository_id,
- "parent_id" : self.parent_id,
- "peer_contact_uri" : self.peer_contact_uri,
- "peer_ta" : get_ta_DER(self.peer_ta),
- "sia_base" : self.sia_base }
-
peer_ta = None
def startElement(self, stack, name, attrs):
@@ -200,21 +192,9 @@ class child_elt(data_elt):
sql_template = rpki.sql.template("child", "child_id", "self_id", "bsc_id", "peer_ta")
- def sql_decode(self, vals):
- self.self_id = vals["self_id"]
- self.bsc_id = vals["bsc_id"]
- self.child_id = vals["child_id"]
- self.peer_ta = rpki.x509.X509(DER=vals["peer_ta"])
-
- def sql_encode(self):
- return { "self_id" : self.self_id,
- "bsc_id" : self.bsc_id,
- "child_id" : self.child_id,
- "peer_ta" : get_ta_DER(self.peer_ta) }
-
def sql_fetch_hook(self, db, cur):
self.cas = rpki.sql.get_column(db, 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_ca_certificate 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):
@@ -260,20 +240,6 @@ class repository_elt(data_elt):
sql_template = rpki.sql.template("repository", "repository_id", "self_id", "bsc_id", "peer_ta", "peer_contact_uri")
- def sql_decode(self, vals):
- self.self_id = vals["self_id"]
- self.bsc_id = vals["bsc_id"]
- self.repository_id = vals["repository_id"]
- self.peer_contact_uri = vals["peer_contact_uri"]
- self.peer_ta = rpki.x509.X509(DER=vals["peer_ta"])
-
- def sql_encode(self):
- return { "self_id" : self.self_id,
- "bsc_id" : self.bsc_id,
- "repository_id" : self.repository_id,
- "peer_contact_uri" : self.peer_contact_uri,
- "peer_ta" : get_ta_DER(self.peer_ta) }
-
peer_ta = None
def startElement(self, stack, name, attrs):
@@ -301,7 +267,7 @@ class route_origin_elt(data_elt):
"""<route_origin/> element."""
element_name = "route_origin"
- attributes = ("action", "type", "self_id", "route_origin_id", "asn", "ipv4", "ipv6")
+ attributes = ("action", "type", "self_id", "route_origin_id", "as_number", "ipv4", "ipv6")
booleans = ("suppress_publication",)
sql_template = rpki.sql.template("route_origin", "route_origin_id", "self_id", "as_number")
@@ -309,16 +275,6 @@ class route_origin_elt(data_elt):
ca_detail_id = None
roa = None
- def sql_decode(self, vals):
- self.self_id = vals["self_id"]
- self.asn = vals["as_number"]
- self.route_origin = vals["route_origin_id"]
-
- def sql_encode(self):
- return { "self_id" : self.self_id,
- "route_origin_id" : self.route_origin_id,
- "as_number" : self.asn }
-
def sql_fetch_hook(self, db, cur):
self.ipv4 = rpki.resource_set.resource_set_ipv4()
self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip NOT LIKE '%:%'", self.route_origin_id)
@@ -348,8 +304,8 @@ class route_origin_elt(data_elt):
"""Handle <route_origin/> element."""
assert name == "route_origin", "Unexpected name %s, stack %s" % (name, stack)
self.read_attrs(attrs)
- if self.asn is not None:
- self.asn = long(self.asn)
+ if self.as_number is not None:
+ self.as_number = long(self.as_number)
if self.ipv4 is not None:
self.ipv4 = rpki.resource_set.resource_set_ipv4(self.ipv4)
if self.ipv6 is not None:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-14 02:50:56 +0000