chore: fix some compiler warnings and potential stability issues

Author: bitfl0wer

examples/ed25519_basic.rs

@@ -6,6 +6,8 @@
 // This example is not complete and should not be copy-pasted into a production environment without
 // further scrutiny and consideration.
 
+#![allow(clippy::unwrap_used)]
+
 use std::str::FromStr;
 
 use der::asn1::BitString;

examples/ed25519_cert.rs

@@ -2,6 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#![allow(clippy::unwrap_used)]
+
 use std::str::FromStr;
 use std::time::Duration;
 

examples/ed25519_from_der.rs

@@ -2,6 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#![allow(clippy::unwrap_used)]
+
 use std::str::FromStr;
 use std::time::Duration;
 

examples/http_api.rs

@@ -2,6 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#![allow(clippy::unwrap_used, clippy::arithmetic_side_effects)]
+
 use std::str::FromStr;
 
 use der::asn1::BitString;

src/api/core/federated_identity.rs

@@ -32,7 +32,9 @@ mod registration_required {
             match id_cert.full_verify_home_server(
                 std::time::SystemTime::now()
                     .duration_since(UNIX_EPOCH)
-                    .unwrap()
+                    .map_err(|e| RequestError::Custom {
+                        reason: e.to_string(),
+                    })?
                     .as_secs(),
             ) {
                 Ok(_) => (),

src/api/core/migration.rs

@@ -248,6 +248,7 @@ mod registration_not_required {
             }
             let request = request.build()?;
             let response = self.send_request(request).await?;
+            #[allow(clippy::unwrap_used)] // HeaderValue::from_str("0") is always valid.
             let return_body_size_string = response
                 .headers()
                 .get("X-P2-Return-Body-Size-Limit")
@@ -350,3 +351,14 @@ mod registration_not_required {
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use http::HeaderValue;
+
+    #[test]
+    #[allow(clippy::unwrap_used)]
+    fn header_value_zero() {
+        HeaderValue::from_str("0").unwrap();
+    }
+}

src/certs/capabilities/basic_constraints.rs

@@ -59,16 +59,17 @@ impl TryFrom<Attribute> for BasicConstraints {
             .into());
         }
         let values = value.values;
-        if values.len() != 1usize {
+        let element = if let Some(item) = values.get(0) {
+            item
+        } else {
             return Err(CertificateConversionError::InvalidInput(
                 InvalidInput::Length {
                     min_length: 1,
                     max_length: 1,
                     actual_length: values.len().to_string(),
                 },
             ));
-        }
-        let element = values.get(0).expect("This should be infallible. Report this issue at https://github.com/polyphony-chat/polyproto");
+        };
         if element.tag() != Tag::Sequence {
             return Err(CertificateConversionError::InvalidInput(
                 InvalidInput::Malformed(format!(
@@ -86,6 +87,7 @@ impl TryFrom<Attribute> for BasicConstraints {
             match value.tag() {
                 Tag::Boolean => {
                     // Keep track of how many Boolean tags we encounter
+                    #[allow(clippy::arithmetic_side_effects)] // last i checked, 0 + 1 = 1 < 255
                     if num_ca == 0 {
                         num_ca += 1;
                         ca = any_to_bool(value.clone())?;
@@ -99,6 +101,7 @@ impl TryFrom<Attribute> for BasicConstraints {
                 }
                 Tag::Integer => {
                     // Keep track of how many Integer tags we encounter
+                    #[allow(clippy::arithmetic_side_effects)]
                     if num_path_length == 0 {
                         num_path_length += 1;
                         path_length = Some(any_to_u64(value.clone())?);
@@ -218,16 +221,62 @@ impl TryFrom<Extension> for BasicConstraints {
         let mut path_length: Option<u64> = None;
         for item in sequence.iter() {
             match item.tag() {
+                // TODO: lots of repetition. I do not like repetition.
                 Tag::Boolean => {
-                    bool_encounters += 1;
+                    bool_encounters = match bool_encounters.checked_add(1) {
+                        Some(new) => new,
+                        None => return Err(CertificateConversionError::InvalidCert(
+                            crate::errors::InvalidCert::InvalidProperties(
+                                ConstraintError::OutOfBounds
+                                { 
+                                    lower: 0,
+                                    upper: 255,
+                                    actual: "> 255".to_owned(),
+                                    reason:
+                                    "Encountered a suspicious amount of tags in this certificate extension"
+                                    .to_owned()
+                                })
+                            )
+                        ),
+                    };
                     ca = any_to_bool(item.clone())?;
                 }
                 Tag::Integer => {
-                    int_encounters += 1;
+                    int_encounters = match int_encounters.checked_add(1) {
+                        Some(new) => new,
+                        None => return Err(CertificateConversionError::InvalidCert(
+                            crate::errors::InvalidCert::InvalidProperties(
+                                ConstraintError::OutOfBounds
+                                { 
+                                    lower: 0,
+                                    upper: 255,
+                                    actual: "> 255".to_owned(),
+                                    reason:
+                                    "Encountered a suspicious amount of tags in this certificate extension"
+                                    .to_owned()
+                                })
+                            )
+                        ),
+                    };
                     path_length = Some(any_to_u64(item.clone())?);
                 }
                 Tag::Null => {
-                    null_encounters += 1;
+                    null_encounters = match null_encounters.checked_add(1) {
+                        Some(new) => new,
+                        None => return Err(CertificateConversionError::InvalidCert(
+                            crate::errors::InvalidCert::InvalidProperties(
+                                ConstraintError::OutOfBounds
+                                { 
+                                    lower: 0,
+                                    upper: 255,
+                                    actual: "> 255".to_owned(),
+                                    reason:
+                                    "Encountered a suspicious amount of tags in this certificate extension"
+                                    .to_owned()
+                                })
+                            )
+                        ),
+                    };
                     path_length = None;
                 }
                 _ => {
@@ -291,6 +340,7 @@ fn any_to_u64(value: Any) -> Result<u64, ConstraintError> {
             // into a u64.
             let mut buf = [0u8; 8];
             let len = 8.min(value.value().len());
+            #[allow(clippy::indexing_slicing)] // This is fine as long as len <= 8, which is true.
             buf[..len].copy_from_slice(value.value());
             Ok(u64::from_be_bytes(buf))
         }