diff options
| -rw-r--r-- | scripts/rpki/sql.py | 21 | ||||
| -rw-r--r-- | scripts/rpki/up_down.py | 8 |
2 files changed, 11 insertions, 18 deletions
diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py index 2ac0c210..1553d7c2 100644 --- a/scripts/rpki/sql.py +++ b/scripts/rpki/sql.py @@ -401,18 +401,10 @@ class ca_detail_obj(sql_persistant): is_ca = False) def issue(self, gctx, ca, child, subject_key, sia, resources, child_cert = None): - """Issue a new certificate to a child. - - Need to figure out how to share code between issuance of a new - child_cert and reissuance of an existing child cert. If I - understand this correctly, the difference is that in the former - case we're pulling stuff from a PKCS #10, in the latter we're - pulling it from the previous cert. If this theory is correct, - then this method needs to take an extra optional argument which is - a child_cert object to update, and we create a new one if none is - given. child_cert.reissue() becomes the routine that fishes all - the right information out of the existing cert then calls this - method to finish the job. + """Issue a new certificate to a child. Optional child_cert + argument specifies an existing child_cert object to update in + place; if not specified, we create a new one. Returns the + child_cert object containing the newly issued cert. """ assert child_cert is None or (child_cert.child_id == child.child_id and child_cert.ca_detail_id == self.ca_detail_id) @@ -522,8 +514,9 @@ class child_cert_obj(sql_persistant): def reissue(self, gctx, ca_detail, resources, sia): """Reissue an existing child_cert_obj, reusing the public key.""" - if sia is None: - sia = self.cert.get_SIA() + + # if sia is None: sia = self.cert.get_SIA() + return ca_detail.issue(gctx = gctx, ca = ca_obj.sql_fetch(gctx, ca_detail.ca_id), child = rpki.left_right.child_elt.sql_fetch(gctx, self.child_id), diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index d349bce2..1710b30f 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -272,10 +272,10 @@ class issue_pdu(base_elt): sia = req_sia, resources = resources) elif resources != child_cert.cert.get_3779resources() or child_cert.cert.get_SIA() != req_sia: - child_cert.reissue(gctx = gctx, - ca_detail = ca_detail, - sia = req_sia, - resources = resources) + child_cert = child_cert.reissue(gctx = gctx, + ca_detail = ca_detail, + sia = req_sia, + resources = resources) # Save anything we modified and generate response rpki.sql.sql_sweep(gctx) |