From cd157885dd7266cfa562cecba9b39d827d4b10da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?=
 <76261501+zecakeh@users.noreply.github.com>
Date: Sat, 3 Apr 2021 17:00:04 +0200
Subject: [PATCH] common: Fix push::PushCondition::applies for empty value and
 pattern

---
 ruma-common/CHANGELOG.md          |  4 ++++
 ruma-common/src/push/condition.rs | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ruma-common/CHANGELOG.md b/ruma-common/CHANGELOG.md
index 0774add6..5014ad37 100644
--- a/ruma-common/CHANGELOG.md
+++ b/ruma-common/CHANGELOG.md
@@ -1,5 +1,9 @@
 # [unreleased]
 
+Bug fixes:
+
+* Fix `push::PushCondition::applies` for empty value and pattern
+
 # 0.3.0
 
 Breaking changes:
diff --git a/ruma-common/src/push/condition.rs b/ruma-common/src/push/condition.rs
index b10817f7..8601d617 100644
--- a/ruma-common/src/push/condition.rs
+++ b/ruma-common/src/push/condition.rs
@@ -198,10 +198,6 @@ impl StrExt for str {
     }
 
     fn matches_pattern(&self, pattern: &str, match_words: bool) -> bool {
-        if self.is_empty() || pattern.is_empty() {
-            return false;
-        }
-
         let value = &self.to_lowercase();
         let pattern = &pattern.to_lowercase();
 
@@ -213,6 +209,13 @@ impl StrExt for str {
     }
 
     fn matches_word(&self, pattern: &str) -> bool {
+        if self == pattern {
+            return true;
+        }
+        if pattern.is_empty() {
+            return false;
+        }
+
         match self.find(pattern) {
             Some(start) => {
                 let end = start + pattern.len();
@@ -448,6 +451,8 @@ mod tests {
         assert!("Foo bar".matches_pattern("foo", true));
         assert!(!"foobar".matches_pattern("foo", true));
         assert!(!"foo bar".matches_pattern("foo*", true));
+        assert!("".matches_pattern("", true));
+        assert!(!"foo".matches_pattern("", true));
 
         // Glob matching
         assert!(!"foo bar".matches_pattern("foo", false));
@@ -458,6 +463,9 @@ mod tests {
         assert!(!"foo".matches_pattern("foo?", false));
         assert!("foo".matches_pattern("fo?", false));
         assert!("FOO".matches_pattern("foo", false));
+        assert!("".matches_pattern("", false));
+        assert!("".matches_pattern("*", false));
+        assert!(!"foo".matches_pattern("", false));
     }
 
     #[test]