Merge pull request #310 from NabuCasa/improve_acme_reset

Make ACME reset more error tolerant
NabuCasa · Jan 21, 2022 · 3aa68e9 · 3aa68e9
2 parents 72b333f + 1a1da08
commit 3aa68e9
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/hass_nabucasa/acme.py b/hass_nabucasa/acme.py
@@ -1,5 +1,6 @@
 """Handle ACME and local certificates."""
 import asyncio
+import contextlib
 from datetime import datetime, timedelta
 import logging
 from pathlib import Path
@@ -339,9 +340,6 @@ def _revoke_certificate(self) -> None:
                 _LOGGER.error("Can't revoke certificate: %s", err)
                 raise AcmeClientError() from err
 
-        self.path_fullchain.unlink(missing_ok=True)
-        self.path_private_key.unlink(missing_ok=True)
-
     def _deactivate_account(self) -> None:
         """Deactivate account."""
         if not self.path_registration_info.exists():
@@ -358,8 +356,11 @@ def _deactivate_account(self) -> None:
             _LOGGER.error("Can't deactivate account: %s", err)
             raise AcmeClientError() from err
 
-        self.path_registration_info.unlink()
-        self.path_account_key.unlink()
+    def _remove_files(self) -> None:
+        self.path_registration_info.unlink(missing_ok=True)
+        self.path_account_key.unlink(missing_ok=True)
+        self.path_fullchain.unlink(missing_ok=True)
+        self.path_private_key.unlink(missing_ok=True)
 
     async def issue_certificate(self) -> None:
         """Create/Update certificate."""
@@ -403,12 +404,15 @@ async def reset_acme(self) -> None:
             await self.cloud.run_executor(self._create_client)
 
         try:
-            await self.cloud.run_executor(self._revoke_certificate)
-            await self.cloud.run_executor(self._deactivate_account)
+            with contextlib.suppress(AcmeClientError):
+                await self.cloud.run_executor(self._revoke_certificate)
+            with contextlib.suppress(AcmeClientError):
+                await self.cloud.run_executor(self._deactivate_account)
         finally:
             self._acme_client = None
             self._account_jwk = None
             self._x509 = None
+            await self.cloud.run_executor(self._remove_files)
 
     async def hardening_files(self) -> None:
         """Control permission on files."""