fix(rust/c509-certificate): format + err handling

Author: bkioshn

rust/c509-certificate/examples/cli/main.rs

@@ -163,7 +163,7 @@ fn generate(
     let now_timestamp: u64 = Utc::now()
         .timestamp()
         .try_into()
-        .expect("Timestamp cannot be converted to u64");
+        .map_err(|_| anyhow::anyhow!("Current timestamp is invalid"))?;
 
     let not_before = parse_or_default_date(c509_json.validity_not_before, now_timestamp)?;
     // Default as expire date for not_after

rust/c509-certificate/src/attributes/attribute.rs

@@ -72,9 +72,7 @@ struct Helper {
 
 impl<'de> Deserialize<'de> for Attribute {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
+    where D: Deserializer<'de> {
         let helper = Helper::deserialize(deserializer)?;
         let oid =
             Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -88,9 +86,7 @@ impl<'de> Deserialize<'de> for Attribute {
 
 impl Serialize for Attribute {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
+    where S: serde::Serializer {
         let helper = Helper {
             oid: self.registered_oid.get_c509_oid().get_oid().to_string(),
             value: self.value.clone(),
@@ -201,9 +197,11 @@ impl Decode<'_, ()> for AttributeValue {
         match d.datatype()? {
             minicbor::data::Type::String => Ok(AttributeValue::Text(d.str()?.to_string())),
             minicbor::data::Type::Bytes => Ok(AttributeValue::Bytes(d.bytes()?.to_vec())),
-            _ => Err(minicbor::decode::Error::message(
-                "Invalid AttributeValue, value should be either String or Bytes",
-            )),
+            _ => {
+                Err(minicbor::decode::Error::message(
+                    "Invalid AttributeValue, value should be either String or Bytes",
+                ))
+            },
         }
     }
 }

rust/c509-certificate/src/extensions/extension/mod.rs

@@ -67,9 +67,7 @@ struct Helper {
 
 impl<'de> Deserialize<'de> for Extension {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
+    where D: Deserializer<'de> {
         let helper = Helper::deserialize(deserializer)?;
         let oid =
             Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -80,9 +78,7 @@ impl<'de> Deserialize<'de> for Extension {
 
 impl Serialize for Extension {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
+    where S: serde::Serializer {
         let helper = Helper {
             oid: self.registered_oid.get_c509_oid().get_oid().to_string(),
             value: self.value.clone(),
@@ -231,8 +227,7 @@ impl Encode<()> for ExtensionValue {
 }
 
 impl<C> Decode<'_, C> for ExtensionValue
-where
-    C: ExtensionValueTypeTrait + Debug,
+where C: ExtensionValueTypeTrait + Debug
 {
     fn decode(d: &mut Decoder<'_>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
         match ctx.get_type() {
@@ -248,9 +243,11 @@ where
                 let value = AlternativeName::decode(d, &mut ())?;
                 Ok(ExtensionValue::AlternativeName(value))
             },
-            ExtensionValueType::Unsupported => Err(minicbor::decode::Error::message(
-                "Cannot decode Unsupported extension value",
-            )),
+            ExtensionValueType::Unsupported => {
+                Err(minicbor::decode::Error::message(
+                    "Cannot decode Unsupported extension value",
+                ))
+            },
         }
     }
 }

rust/c509-certificate/src/extensions/mod.rs

@@ -1,7 +1,8 @@
 //! C509 Extension as a part of `TBSCertificate` used in C509 Certificate.
 //!
 //! Extension fallback of C509 OID extension
-//! Given OID if not found in the registered OID table, it will be encoded as an unwrapped OID.
+//! Given OID if not found in the registered OID table, it will be encoded as an unwrapped
+//! OID.
 //!
 //! ```cddl
 //! Extensions and Extension can be encoded as the following:

rust/c509-certificate/src/name/mod.rs

@@ -131,9 +131,11 @@ impl Decode<'_, ()> for NameValue {
             // If Name is a text string, the attribute is a CommonName
             minicbor::data::Type::String => Ok(create_attributes_with_cn(d.str()?.to_string())),
             minicbor::data::Type::Bytes => decode_bytes(d),
-            _ => Err(minicbor::decode::Error::message(
-                "Name must be an array, text or bytes",
-            )),
+            _ => {
+                Err(minicbor::decode::Error::message(
+                    "Name must be an array, text or bytes",
+                ))
+            },
         }
     }
 }
@@ -256,9 +258,11 @@ fn decode_eui_cn_bytes(bytes: &[u8]) -> Result<NameValue, minicbor::decode::Erro
             )?);
             Ok(create_attributes_with_cn(text))
         },
-        _ => Err(minicbor::decode::Error::message(
-            "EUI-64 or MAC address must be 7 or 9 bytes",
-        )),
+        _ => {
+            Err(minicbor::decode::Error::message(
+                "EUI-64 or MAC address must be 7 or 9 bytes",
+            ))
+        },
     }
 }
 
@@ -466,6 +470,7 @@ pub(crate) mod test_name {
     // Test data from https://datatracker.ietf.org/doc/draft-ietf-cose-cbor-encoded-cert/11/
     // A.2.  Example IEEE 802.1AR profiled X.509 Certificate
     // Issuer: C=US, ST=CA, O=Example Inc, OU=certification, CN=802.1AR CA
+    #[allow(clippy::similar_names)]
     pub(crate) fn names() -> (Name, String) {
         let mut attr1 = Attribute::new(oid!(2.5.4 .6));
         attr1.add_value(AttributeValue::Text("US".to_string()));

rust/c509-certificate/src/oid.rs

@@ -58,9 +58,7 @@ struct Helper {
 
 impl<'de> Deserialize<'de> for C509oid {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
+    where D: Deserializer<'de> {
         let helper = Helper::deserialize(deserializer)?;
         let oid =
             Oid::from_str(&helper.oid).map_err(|e| serde::de::Error::custom(format!("{e:?}")))?;
@@ -70,9 +68,7 @@ impl<'de> Deserialize<'de> for C509oid {
 
 impl Serialize for C509oid {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
+    where S: serde::Serializer {
         let helper = Helper {
             oid: self.0.to_string(),
         };
@@ -132,9 +128,10 @@ impl Decode<'_, ()> for C509oid {
 #[cfg(test)]
 mod test_c509_oid {
 
-    use super::*;
     use asn1_rs::oid;
 
+    use super::*;
+
     // Test reference 3.1. Encoding of the SHA-256 OID
     // https://datatracker.ietf.org/doc/rfc9090/
     #[test]

rust/c509-certificate/src/tbs_cert.rs

@@ -371,6 +371,7 @@ pub(crate) mod test_tbs_cert {
     // 83 2A 4D 33 6A 08 AD 67 DF 20 F1 50 64 21 18 8A 0A DE 6D 34 92 36
 
     #[test]
+    #[allow(clippy::similar_names)]
     fn tbs_cert2() {
         // ---------helper----------
         // C=US, ST=CA, L=LA, O=example Inc, OU=IoT/serialNumber=Wt1234
@@ -423,10 +424,9 @@ pub(crate) mod test_tbs_cert {
                 true,
             ));
             let mut gns = GeneralNames::new();
-            let hw = OtherNameHardwareModuleName::new(
-                oid!(1.3.6 .1 .4 .1 .6175 .10 .1),
-                vec![0x01, 0x02, 0x03, 0x04],
-            );
+            let hw = OtherNameHardwareModuleName::new(oid!(1.3.6 .1 .4 .1 .6175 .10 .1), vec![
+                0x01, 0x02, 0x03, 0x04,
+            ]);
             gns.add_gn(GeneralName::new(
                 GeneralNameTypeRegistry::OtherNameHardwareModuleName,
                 GeneralNameValue::OtherNameHWModuleName(hw),

rust/c509-certificate/src/time.rs

@@ -4,7 +4,7 @@ use minicbor::{encode::Write, Decode, Decoder, Encode, Encoder};
 use serde::{Deserialize, Serialize};
 
 /// A struct representing a time where it accept seconds since the Unix epoch.
-/// Doesn't support dates before the Unix epoch (January 1, 1970, 00:00:00 UTC) 
+/// Doesn't support dates before the Unix epoch (January 1, 1970, 00:00:00 UTC)
 /// so unsigned integer is used.
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct Time(u64);