diff options
Diffstat (limited to 'rpkid/rpki')
| -rw-r--r-- | rpkid/rpki/__init__.py | 15 | ||||
| -rw-r--r-- | rpkid/rpki/left_right.py | 65 | ||||
| -rw-r--r-- | rpkid/rpki/relaxng.py | 17 |
3 files changed, 10 insertions, 87 deletions
diff --git a/rpkid/rpki/__init__.py b/rpkid/rpki/__init__.py index 9852d0b0..29d6b76b 100644 --- a/rpkid/rpki/__init__.py +++ b/rpkid/rpki/__init__.py @@ -476,31 +476,30 @@ ## @verbatim ## Usage: irbe-cli.py --config= --help --pem_out= ## -## parent --action= --type= --tag= --self_id= --parent_id= +## parent --action= --tag= --self_id= --parent_id= ## --bsc_id= --repository_id= --peer_contact_uri= ## --sia_base= --sender_name= --recipient_name= ## --bpki_cms_cert= --bpki_cms_glue= ## --bpki_https_cert= --bpki_https_glue= ## --rekey --reissue --revoke ## -## repository --action= --type= --tag= --self_id= --repository_id= +## repository --action= --tag= --self_id= --repository_id= ## --bsc_id= --peer_contact_uri= ## --bpki_cms_cert= --bpki_cms_glue= ## --bpki_https_cert= --bpki_https_glue= ## -## self --action= --type= --tag= --self_id= --crl_interval= +## self --action= --tag= --self_id= --crl_interval= ## --bpki_cert= --bpki_glue= -## --extension_preference= --rekey --reissue --revoke +## --rekey --reissue --revoke ## --run_now --publish_world_now -## --clear_extension_preferences ## -## child --action= --type= --tag= --self_id= --child_id= +## child --action= --tag= --self_id= --child_id= ## --bsc_id= --bpki_cms_cert= --bpki_cms_glue= --reissue ## -## route_origin --action= --type= --tag= --self_id= --route_origin_id= +## route_origin --action= --tag= --self_id= --route_origin_id= ## --as_number= --ipv4= --ipv6= --suppress_publication ## -## bsc --action= --type= --tag= --self_id= --bsc_id= +## bsc --action= --tag= --self_id= --bsc_id= ## --key_type= --hash_alg= --key_length= --signing_cert= ## --signing_cert_crl= --generate_keypair ## @endverbatim diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py index 78c080f5..46c1c908 100644 --- a/rpkid/rpki/left_right.py +++ b/rpkid/rpki/left_right.py @@ -187,35 +187,13 @@ class data_elt(base_elt, rpki.sql.sql_persistant): if unimplemented: raise rpki.exceptions.NotImplementedYet, "Unimplemented control %s" % ", ".join(unimplemented) -class extension_preference_elt(base_elt): - """Container for extension preferences.""" - - element_name = "extension_preference" - attributes = ("name",) - - def startElement(self, stack, name, attrs): - """Handle <extension_preference/> elements.""" - assert name == "extension_preference", "Unexpected name %s, stack %s" % (name, stack) - self.read_attrs(attrs) - - def endElement(self, stack, name, text): - """Handle <extension_preference/> elements.""" - self.value = text - stack.pop() - - def toXML(self): - """Generate <extension_preference/> elements.""" - elt = self.make_elt() - elt.text = self.value - return elt - class self_elt(data_elt): """<self/> element.""" element_name = "self" attributes = ("action", "tag", "self_id", "crl_interval", "regen_margin") - elements = ("extension_preference", "bpki_cert", "bpki_glue") - booleans = ("rekey", "reissue", "revoke", "run_now", "publish_world_now", "clear_extension_preferences") + elements = ("bpki_cert", "bpki_glue") + booleans = ("rekey", "reissue", "revoke", "run_now", "publish_world_now") sql_template = rpki.sql.template("self", "self_id", "use_hsm", "crl_interval", "regen_margin", ("bpki_cert", rpki.x509.X509), ("bpki_glue", rpki.x509.X509)) @@ -227,29 +205,6 @@ class self_elt(data_elt): bpki_cert = None bpki_glue = None - def __init__(self): - """Initialize a self_elt.""" - self.prefs = [] - - def sql_fetch_hook(self): - """Extra SQL fetch actions for self_elt -- handle extension preferences.""" - self.gctx.cur.execute("SELECT pref_name, pref_value FROM self_pref WHERE self_id = %s", (self.self_id,)) - for name, value in self.gctx.cur.fetchall(): - e = extension_preference_elt() - e.name = name - e.value = value - self.prefs.append(e) - - def sql_insert_hook(self): - """Extra SQL insert actions for self_elt -- handle extension preferences.""" - if self.prefs: - self.gctx.cur.executemany("INSERT self_pref (self_id, pref_name, pref_value) VALUES (%s, %s, %s)", - ((e.name, e.value, self.self_id) for e in self.prefs)) - - def sql_delete_hook(self): - """Extra SQL delete actions for self_elt -- handle extension preferences.""" - self.gctx.cur.execute("DELETE FROM self_pref WHERE self_id = %s", (self.self_id,)) - def bscs(self): """Fetch all BSC objects that link to this self object.""" return bsc_elt.sql_fetch_where(self.gctx, "self_id = %s", (self.self_id,)) @@ -269,14 +224,6 @@ class self_elt(data_elt): def route_origins(self): """Fetch all route_origin objects that link to this self object.""" return route_origin_elt.sql_fetch_where(self.gctx, "self_id = %s", (self.self_id,)) - - def serve_pre_save_hook(self, q_pdu, r_pdu): - """Extra server actions for self_elt -- handle extension preferences.""" - rpki.log.trace() - if self is not q_pdu: - if q_pdu.clear_extension_preferences: - self.prefs = [] - self.prefs.extend(q_pdu.prefs) def serve_post_save_hook(self, q_pdu, r_pdu): """Extra server actions for self_elt.""" @@ -319,12 +266,7 @@ class self_elt(data_elt): def startElement(self, stack, name, attrs): """Handle <self/> element.""" - if name == "extension_preference": - pref = extension_preference_elt() - self.prefs.append(pref) - stack.append(pref) - pref.startElement(stack, name, attrs) - elif name not in ("bpki_cert", "bpki_glue"): + if name not in ("bpki_cert", "bpki_glue"): assert name == "self", "Unexpected name %s, stack %s" % (name, stack) self.read_attrs(attrs) @@ -345,7 +287,6 @@ class self_elt(data_elt): self.make_b64elt(elt, "bpki_cert", self.bpki_cert.get_DER()) if self.bpki_glue and not self.bpki_glue.empty(): self.make_b64elt(elt, "bpki_glue", self.bpki_glue.get_DER()) - elt.extend([i.toXML() for i in self.prefs]) return elt def client_poll(self): diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py index d7997e96..110d9fbb 100644 --- a/rpkid/rpki/relaxng.py +++ b/rpkid/rpki/relaxng.py @@ -201,11 +201,6 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc <value>yes</value> </attribute> </optional> - <optional> - <attribute name="clear_extension_preferences"> - <value>yes</value> - </attribute> - </optional> </define> <define name="self_payload"> <optional> @@ -236,18 +231,6 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc <ref name="base64"/> </element> </optional> - <zeroOrMore> - <element name="extension_preference"> - <attribute name="name"> - <data type="token"> - <param name="maxLength">1024</param> - </data> - </attribute> - <data type="string"> - <param name="maxLength">512000</param> - </data> - </element> - </zeroOrMore> </define> <define name="self_id"> <attribute name="self_id"> |