fixup! ACME: allow specifying preferred or required profile.

Author: bavshin-f5

src/acme.rs

@@ -302,11 +302,8 @@ where
             .transpose()?;
 
         self.profile = match self.issuer.profile {
-            Profile::Required(x) | Profile::Preferred(x)
-                if self.directory.meta.profiles.contains_key(x) =>
-            {
-                Some(x)
-            }
+            Profile::Required(x) => Some(x),
+            Profile::Preferred(x) if self.directory.meta.profiles.contains_key(x) => Some(x),
             Profile::Preferred(x) => {
                 ngx::ngx_log_error!(
                     nginx_sys::NGX_LOG_NOTICE,
@@ -315,7 +312,6 @@ where
                 );
                 None
             }
-            Profile::Required(_) => return Err(NewAccountError::Profile),
             _ => None,
         };
 

src/acme/error.rs

@@ -21,9 +21,6 @@ pub enum NewAccountError {
     #[error("external account key required")]
     ExternalAccount,
 
-    #[error("profile is not supported")]
-    Profile,
-
     #[error(transparent)]
     Protocol(#[from] Problem),
 
@@ -50,7 +47,6 @@ impl NewAccountError {
     pub fn is_invalid(&self) -> bool {
         match self {
             Self::ExternalAccount => true,
-            Self::Profile => true,
             Self::Protocol(err) => matches!(
                 err.category(),
                 ProblemCategory::Account | ProblemCategory::Malformed

src/acme/types.rs

@@ -22,6 +22,7 @@ pub struct DirectoryMetadata {
     pub website: Option<Uri>,
     pub caa_identities: Vec<String>,
     pub external_account_required: Option<bool>,
+    #[serde(deserialize_with = "deserialize_null_as_default")]
     pub profiles: std::collections::BTreeMap<String, IgnoredAny>,
 }
 
@@ -336,12 +337,12 @@ impl Problem {
             | ErrorKind::BadSignatureAlgorithm
             | ErrorKind::ExternalAccountRequired
             | ErrorKind::InvalidContact
-            | ErrorKind::InvalidProfile
             | ErrorKind::UnsupportedContact
             | ErrorKind::UserActionRequired => ProblemCategory::Account,
 
             ErrorKind::BadCsr
             | ErrorKind::Caa
+            | ErrorKind::InvalidProfile
             | ErrorKind::RejectedIdentifier
             | ErrorKind::UnsupportedIdentifier => ProblemCategory::Order,
 
@@ -352,6 +353,15 @@ impl Problem {
     }
 }
 
+fn deserialize_null_as_default<'de, D, T>(deserializer: D) -> Result<T, D::Error>
+where
+    D: serde::de::Deserializer<'de>,
+    T: serde::de::Deserialize<'de> + Default,
+{
+    let val = Option::<T>::deserialize(deserializer)?;
+    Ok(val.unwrap_or_default())
+}
+
 fn deserialize_vec_of_uri<'de, D>(deserializer: D) -> Result<Vec<Uri>, D::Error>
 where
     D: serde::Deserializer<'de>,