fixup! ACME: certificate issue and renewal implementation.

Author: bavshin-f5

Cargo.lock

@@ -24,6 +24,7 @@ libc = "0.2.174"
 openssl = { version = "0.10.73", features = ["bindgen"] }
 openssl-foreign-types = { package = "foreign-types", version = "0.3" }
 openssl-sys = { version = "0.9.109", features = ["bindgen"] }
+scopeguard = "1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
 siphasher = { version = "1.0.1", default-features = false }

Cargo.toml

@@ -386,11 +386,6 @@ where
 
         for challenge in authorization.challenges {
             result = self.do_challenge(order, &identifier, &challenge).await;
-            // unregister here because ownership for scoped guard inside of
-            // do_challenge would be too complicated
-            if let Some(solver) = self.find_solver_for(&challenge.kind) {
-                let _ = solver.unregister(&identifier, &challenge);
-            }
 
             if result.is_ok() {
                 break;
@@ -442,9 +437,15 @@ where
             return Ok(());
         }
 
-        self.find_solver_for(&challenge.kind)
-            .ok_or(anyhow!("no solver for {:?}", challenge.kind))?
-            .register(ctx, identifier, challenge)?;
+        let solver = self
+            .find_solver_for(&challenge.kind)
+            .ok_or(anyhow!("no solver for {:?}", challenge.kind))?;
+
+        solver.register(ctx, identifier, challenge)?;
+
+        scopeguard::defer! {
+            let _ = solver.unregister(identifier, challenge);
+        };
 
         // "{}" in request payload initiates the challenge, "" checks the status.
         let mut payload: &[u8] = b"{}";