Error on duplicate modifiers in parameter string

mcginty · Jan 26, 2024 · dbdcc48 · dbdcc48
1 parent 8b1a819
commit dbdcc48
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/params/mod.rs b/src/params/mod.rs
@@ -282,6 +282,19 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_duplicate_psk_mod() {
+        assert!("Noise_XXfallback+psk1_25519_AESGCM_SHA256".parse::<NoiseParams>().is_ok());
+        assert_eq!(
+            Error::Pattern(PatternProblem::UnsupportedModifier),
+            "Noise_XXfallback+fallback_25519_AESGCM_SHA256".parse::<NoiseParams>().unwrap_err()
+        );
+        assert_eq!(
+            Error::Pattern(PatternProblem::UnsupportedModifier),
+            "Noise_XXpsk1+psk1_25519_AESGCM_SHA256".parse::<NoiseParams>().unwrap_err()
+        );
+    }
+
     #[test]
     fn test_modified_psk_handshake() {
         let p: NoiseParams = "Noise_XXpsk0_25519_AESGCM_SHA256".parse().unwrap();

diff --git a/src/params/patterns.rs b/src/params/patterns.rs
@@ -203,7 +203,12 @@ impl FromStr for HandshakeModifierList {
             let modifier_names = s.split('+');
             let mut modifiers = vec![];
             for modifier_name in modifier_names {
-                modifiers.push(modifier_name.parse()?);
+                let modifier: HandshakeModifier = modifier_name.parse()?;
+                if modifiers.contains(&modifier) {
+                    return Err(Error::Pattern(PatternProblem::UnsupportedModifier));
+                } else {
+                    modifiers.push(modifier);
+                }
             }
             Ok(HandshakeModifierList { list: modifiers })
         }