Merge pull request #81 from bitwarden/bitwarden/fix-msrv

Fix and enforce MSRV in CI

Author: Progdrasil

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - stable
+          - 1.85.1
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
@@ -31,8 +31,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          # Once we settle on a MSRV we should add that here.
-          - stable
+          - 1.85.1
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
@@ -56,7 +55,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - stable
+          - 1.85.1
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
@@ -71,8 +70,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          # Once we settle on a MSRV we should add that here.
-          - stable
+          - 1.85.1
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
@@ -87,7 +85,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - stable
+          - 1.85.1
         lang:
           - typescript
           - kotlin

passkey-client/src/extensions/prf.rs

@@ -199,15 +199,15 @@ fn get_ctap_extension(
     // base64url encoding, or does not equal the id of some element of
     // allowCredentials after performing base64url decoding, then return a
     // DOMException whose name is “SyntaxError”.
-    if let Some(record) = precomputed_eval_cred.as_ref()
-        && record.iter().any(|(k_bytes, _)| {
+    if let Some(record) = precomputed_eval_cred.as_ref() {
+        if record.iter().any(|(k_bytes, _)| {
             k_bytes.is_empty()
                 || allow_credentials
                     .as_ref()
                     .is_some_and(|allow| !allow.iter().any(|cred| cred.id == *k_bytes))
-        })
-    {
-        return Err(WebauthnError::SyntaxError);
+        }) {
+            return Err(WebauthnError::SyntaxError);
+        }
     }
 
     let new_eval_by_cred = precomputed_eval_cred

rust-toolchain

@@ -0,0 +1 @@
+1.85.1