Merge pull request #2384 from alan-turing-institute/release-v5.3.1

Release v5.3.1

Author: jemrobinson

SECURITY.md

@@ -7,8 +7,8 @@ All organisations using an earlier version in production should update to the la
 
 | Version                                                                               | Supported          |
 | ------------------------------------------------------------------------------------- | ------------------ |
-| [5.3.0](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v5.2.1) | :white_check_mark: |
-| < 5.3.0                                                                               | :x:                |
+| [5.3.1](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v5.2.1) | :white_check_mark: |
+| < 5.3.1                                                                               | :x:                |
 
 ## Reporting a Vulnerability
 

VERSIONING.md

@@ -80,6 +80,7 @@ Additionally, a production instance of DSH is maintained for use by research pro
 | 2023      | [v4.0.3](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v4.0.3)           |
 | 2023–2024 | [v4.1.0](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v4.1.0)           |
 | 2024      | [v4.2.0](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v4.2.0)           |
+| 2025      | [v5.3.0](https://github.com/alan-turing-institute/data-safe-haven/releases/tag/v5.3.0)           |
 
 ## Versions that have undergone formal security evaluation
 

data_safe_haven/external/api/azure_sdk.py

@@ -641,10 +641,10 @@ def get_keyvault_certificate(
         """Read a certificate from the KeyVault
 
         Returns:
-            KeyVaultCertificate: The certificate
+            The KeyVaultCertificate
 
         Raises:
-            DataSafeHavenAzureError if the secret could not be read
+            DataSafeHavenAzureError if the certificate could not be read
         """
         # Connect to Azure clients
         certificate_client = CertificateClient(
@@ -827,7 +827,9 @@ def import_keyvault_certificate(
                     )
                     break
                 except ResourceExistsError:
-                    # Purge any existing deleted certificate with the same name
+                    # Delete any certificate with the same name
+                    self.remove_keyvault_certificate(certificate_name, key_vault_name)
+                    # Purge any existing deleted certificate
                     self.purge_keyvault_certificate(certificate_name, key_vault_name)
             self.logger.info(
                 f"Imported certificate [green]{certificate_name}[/].",
@@ -1094,8 +1096,8 @@ def remove_keyvault_certificate(
             self.logger.debug(
                 f"Waiting for deletion to complete for certificate [green]{certificate_name}[/]..."
             )
-            while True:
-                # Keep polling until deleted certificate is available
+            # Keep polling until deleted certificate is available or 2 minutes have elapsed
+            for _ in range(12):
                 with suppress(ResourceNotFoundError):
                     if certificate_client.get_deleted_certificate(certificate_name):
                         break

data_safe_haven/infrastructure/components/dynamic/dsh_resource_provider.py

@@ -84,6 +84,9 @@ def create(self, props: dict[str, Any]) -> CreateResult:
 
         Returns:
             CreateResult: a unique ID for this object plus a set of output properties
+
+        Raises:
+            An appropriate DataSafeHavenError if the resource could not be created
         """
 
     @abstractmethod
@@ -94,6 +97,9 @@ def delete(self, id_: str, old_props: dict[str, Any]) -> None:
         Args:
             id_: the ID of the resource
             old_props: the outputs from the last create operation
+
+        Raises:
+            An appropriate DataSafeHavenError if the resource could not be deleted
         """
 
     @abstractmethod

data_safe_haven/infrastructure/components/dynamic/ssl_certificate.py

@@ -2,7 +2,8 @@
 
 import time
 from contextlib import suppress
-from typing import Any
+from datetime import UTC, datetime, timedelta
+from typing import Any, override
 
 from acme.errors import ValidationError
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
@@ -15,6 +16,7 @@
 from pulumi import Input, Output, ResourceOptions
 from pulumi.dynamic import CreateResult, DiffResult, Resource
 from simple_acme_dns import ACMEClient
+from simple_acme_dns.errors import InvalidKeyType
 
 from data_safe_haven.exceptions import DataSafeHavenAzureError, DataSafeHavenSSLError
 from data_safe_haven.external import AzureSdk
@@ -43,8 +45,8 @@ def __init__(
 
 
 class SSLCertificateProvider(DshResourceProvider):
+    @override
     def create(self, props: dict[str, Any]) -> CreateResult:
-        """Create new SSL certificate."""
         outs = dict(**props)
         try:
             client = ACMEClient(
@@ -60,8 +62,8 @@ def create(self, props: dict[str, Any]) -> CreateResult:
             private_key_bytes = client.generate_private_key(key_type="rsa2048")
             client.generate_csr()
             # Request DNS verification tokens and add them to the DNS record
-            azure_sdk = AzureSdk(props["subscription_name"], disable_logging=True)
             verification_tokens = client.request_verification_tokens().items()
+            azure_sdk = AzureSdk(props["subscription_name"], disable_logging=True)
             for record_name, record_values in verification_tokens:
                 record_set = azure_sdk.ensure_dns_txt_record(
                     record_name=record_name.replace(f".{props['domain_name']}", ""),
@@ -96,7 +98,7 @@ def create(self, props: dict[str, Any]) -> CreateResult:
             private_key = load_pem_private_key(private_key_bytes, None)
             if not isinstance(private_key, RSAPrivateKey):
                 msg = f"Private key is of type {type(private_key)} not RSAPrivateKey."
-                raise TypeError(msg)
+                raise DataSafeHavenSSLError(msg)
             all_certs = [
                 load_pem_x509_certificate(data)
                 for data in certificate_bytes.split(b"\n\n")
@@ -118,8 +120,16 @@ def create(self, props: dict[str, Any]) -> CreateResult:
                 certificate_contents=pfx_bytes,
                 key_vault_name=props["key_vault_name"],
             )
-            outs["secret_id"] = kvcert.secret_id
-        except Exception as exc:
+            # Failures here will raise an exception that will be caught below
+            outs["expiry_date"] = kvcert.properties.expires_on.isoformat()
+            outs["secret_id"] = "/".join(kvcert.secret_id.split("/")[:-1])
+        except (
+            AttributeError,
+            DataSafeHavenAzureError,
+            IndexError,
+            InvalidKeyType,
+            StopIteration,
+        ) as exc:
             cert_name = f"[green]{props['certificate_secret_name']}[/]"
             domain_name = f"[green]{props['domain_name']}[/]"
             msg = f"Failed to create SSL certificate {cert_name} for {domain_name}."
@@ -129,8 +139,8 @@ def create(self, props: dict[str, Any]) -> CreateResult:
             outs=outs,
         )
 
+    @override
     def delete(self, id_: str, props: dict[str, Any]) -> None:
-        """Delete an SSL certificate."""
         # Use `id` as a no-op to avoid ARG002 while maintaining function signature
         id(id_)
         try:
@@ -146,43 +156,51 @@ def delete(self, id_: str, props: dict[str, Any]) -> None:
                 certificate_name=props["certificate_secret_name"],
                 key_vault_name=props["key_vault_name"],
             )
-        except Exception as exc:
+        except DataSafeHavenAzureError as exc:
             cert_name = f"[green]{props['certificate_secret_name']}[/]"
             domain_name = f"[green]{props['domain_name']}[/]"
             msg = f"Failed to delete SSL certificate {cert_name} for {domain_name}."
             raise DataSafeHavenSSLError(msg) from exc
 
+    @override
     def diff(
         self,
         id_: str,
         old_props: dict[str, Any],
         new_props: dict[str, Any],
     ) -> DiffResult:
-        """Calculate diff between old and new state"""
         # Use `id` as a no-op to avoid ARG002 while maintaining function signature
         id(id_)
-        return self.partial_diff(old_props, new_props, [])
+        partial = self.partial_diff(old_props, new_props, [])
+        expiry_date = datetime.fromisoformat(
+            old_props.get("expiry_date", "0001-01-01T00:00:00+00:00")
+        )
+        needs_renewal = datetime.now(UTC) + timedelta(days=30) > expiry_date
+        return DiffResult(
+            changes=partial.changes or needs_renewal,
+            replaces=partial.replaces,
+            stables=partial.stables,
+            delete_before_replace=True,
+        )
 
+    @override
     def refresh(self, props: dict[str, Any]) -> dict[str, Any]:
-        try:
-            outs = dict(**props)
-            with suppress(DataSafeHavenAzureError, KeyError):
-                azure_sdk = AzureSdk(outs["subscription_name"], disable_logging=True)
-                certificate = azure_sdk.get_keyvault_certificate(
-                    outs["certificate_secret_name"], outs["key_vault_name"]
-                )
-                if certificate.secret_id:
-                    outs["secret_id"] = certificate.secret_id
-            return outs
-        except Exception as exc:
-            cert_name = f"[green]{props['certificate_secret_name']}[/]"
-            domain_name = f"[green]{props['domain_name']}[/]"
-            msg = f"Failed to refresh SSL certificate {cert_name} for {domain_name}."
-            raise DataSafeHavenSSLError(msg) from exc
+        outs = dict(**props)
+        with suppress(DataSafeHavenAzureError, KeyError):
+            azure_sdk = AzureSdk(outs["subscription_name"], disable_logging=True)
+            kvcert = azure_sdk.get_keyvault_certificate(
+                outs["certificate_secret_name"], outs["key_vault_name"]
+            )
+            if kvcert.secret_id:
+                outs["secret_id"] = kvcert.secret_id
+            if kvcert.properties and kvcert.properties.expires_on:
+                outs["expiry_date"] = kvcert.properties.expires_on.isoformat()
+        return outs
 
 
 class SSLCertificate(Resource):
     _resource_type_name = "dsh:common:SSLCertificate"  # set resource type
+    expiry_date: Output[str]
     secret_id: Output[str]
 
     def __init__(
@@ -194,6 +212,6 @@ def __init__(
         super().__init__(
             SSLCertificateProvider(),
             name,
-            {"secret_id": None, **vars(props)},
+            {"expiry_date": None, "secret_id": None, **vars(props)},
             opts,
         )

data_safe_haven/infrastructure/programs/sre/software_repositories.py

@@ -187,7 +187,7 @@ def __init__(
                         ],
                     ),
                     containerinstance.ContainerArgs(
-                        image="sonatype/nexus3:3.71.0",
+                        image="sonatype/nexus3:3.76.0",
                         name="nexus"[:63],
                         environment_variables=[],
                         ports=[],

data_safe_haven/version.py

@@ -1,2 +1,2 @@
-__version__ = "5.3.0"
+__version__ = "5.3.1"
 __version_info__ = tuple(__version__.split("."))

docs/source/deployment/index.md

@@ -46,10 +46,10 @@ See [the instructions here](https://docs.docker.com/security/for-developers/acce
 $ pipx install data-safe-haven
 :::
 
-- Or install a specific version with
+- Or install a specific version with (for instance)
 
 :::{code} shell
-$ pipx install data-safe-haven==5.0.0
+$ pipx install data-safe-haven==5.3.1
 :::
 
 ::::{admonition} [Advanced] install into a virtual environment