diff options
| -rw-r--r-- | myrpki/myirbe.py | 12 | ||||
| -rw-r--r-- | myrpki/yamltest.py | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/myrpki/myirbe.py b/myrpki/myirbe.py index 185b5017..546f5346 100644 --- a/myrpki/myirbe.py +++ b/myrpki/myirbe.py @@ -398,7 +398,7 @@ for xmlfile in xmlfiles: parent_pdu = parent_pdus.pop(parent_handle, None) parent_uri = parent.get("service_uri") parent_myhandle = parent.get("myhandle") - parent_sia-base = parent.get("sia_base") + parent_sia_base = parent.get("sia_base") parent_cms_cert = findbase64(parent, "bpki_cms_certificate") parent_https_cert = findbase64(parent, "bpki_https_certificate") @@ -454,16 +454,16 @@ for xmlfile in xmlfiles: # Publication setup, used to be inferred (badly) from parent setup, # now handled explictly via yet another freaking .csv file. - - for client_handle, client_bpki_cert, client_base_uri in myrpki.csv_open("children.csv"): + + for client_handle, client_bpki_cert, client_base_uri in myrpki.csv_open(cfg.get("pubclients_csv", "pubclients.csv")): client_pdu = client_pdus.pop(client_handle, None) client_bpki_cert = rpki.x509.X509(PEM_file = bpki_pubd.xcert(client_bpki_cert)) - if (client_handle is None or - client.base_uri != client_base_uri or - client.bpki_cert != client_bpki_cert): + if (client_pdu is None or + client_pdu.base_uri != client_base_uri or + client_pdu.bpki_cert != client_bpki_cert): pubd_query.append(rpki.publication.client_elt.make_pdu( action = "create" if client_pdu is None else "set", client_handle = client_handle, diff --git a/myrpki/yamltest.py b/myrpki/yamltest.py index e36d4342..a53f2889 100644 --- a/myrpki/yamltest.py +++ b/myrpki/yamltest.py @@ -353,6 +353,13 @@ class allocation(object): for r in self.roa_requests: f.writerows((p, r.asn) for p in (r.v4 + r.v6 if r.v4 and r.v6 else r.v4 or r.v6 or ())) + def dump_clients(self, fn): + """ + Write pubclients CSV file. + """ + f = self.csvout(fn) + f.writerows((s.name, s.path("bpki.myrpki/ca.cer"), s.sia_base) for s in [self] + self.kids) + def dump_conf(self, fn): """ Write configuration file for OpenSSL and RPKI tools. @@ -530,6 +537,7 @@ for d in db: d.dump_parents("parents.csv") d.dump_prefixes("prefixes.csv") d.dump_roas("roas.csv") + d.dump_clients("pubclients.csv") d.dump_conf("myrpki.conf") # Do initial myirbe.py run for each hosting entity to set up BPKI |