Merge pull request #25 from 1Password/ivan/push-llkxlypknpsr

Update zxcvbn

Upstream PR async-graphql#1671

Author: ipetkov

Cargo.toml

@@ -113,7 +113,7 @@ futures-channel = { version = "0.3.30", optional = true }
 lru = { version = "0.16", optional = true }
 serde_cbor = { version = "0.11.2", optional = true }
 sha2 = { version = "0.10.8", optional = true }
-zxcvbn = { version = "2.2.2", optional = true }
+zxcvbn = { version = "3.1.0", optional = true }
 handlebars = { version = "6.3", optional = true }
 schemars = { version = "1", optional = true }
 

src/validators/min_password_strength.rs

@@ -1,21 +1,25 @@
-use zxcvbn::{ZxcvbnError, zxcvbn};
+use zxcvbn::{Score, zxcvbn};
 
 use crate::{InputType, InputValueError};
 
 pub fn min_password_strength<T: AsRef<str> + InputType>(
     value: &T,
     min_score: u8,
 ) -> Result<(), InputValueError<T>> {
-    match zxcvbn(value.as_ref(), &[]) {
-        Ok(password_strength) => {
-            if password_strength.score() < min_score {
-                Err("password is too weak".into())
-            } else {
-                Ok(())
-            }
-        }
-        Err(ZxcvbnError::BlankPassword) => Err("password is too weak".into()),
-        _ => Err("error processing password strength".into()),
+    let min_score = match min_score {
+        0 => Score::Zero,
+        1 => Score::One,
+        2 => Score::Two,
+        3 => Score::Three,
+        _ => Score::Four,
+    };
+
+    let score = zxcvbn(value.as_ref(), &[]).score();
+
+    if score < min_score {
+        Err("password is too weak".into())
+    } else {
+        Ok(())
     }
 }