Fix word boundary check in Ticket::Number::{Date,Increment}#check

zammad · Jun 23, 2018 · d6f1c3d · d6f1c3d
1 parent df0b213
commit d6f1c3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/models/ticket/number/date.rb b/app/models/ticket/number/date.rb
@@ -86,12 +86,14 @@ def check(string)
     end
 
     # probe format
-    string.scan(/\b#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(\d{4,10}#{system_id}\d{2,40})\b/i) do
+    # NOTE: we use `(?<=\W|^)` at the start of the regular expressions below
+    # because `\b` fails when ticket_hook begins with a non-word character (like '#')
+    string.scan(/(?<=\W|^)#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(\d{4,10}#{system_id}\d{2,40})\b/i) do
       ticket = Ticket.find_by(number: $1)
       break if ticket
     end
     if !ticket
-      string.scan(/\b#{Regexp.quote(ticket_hook)}\s{0,2}(\d{4,10}#{system_id}\d{2,40})\b/i) do
+      string.scan(/(?<=\W|^)#{Regexp.quote(ticket_hook)}\s{0,2}(\d{4,10}#{system_id}\d{2,40})\b/i) do
         ticket = Ticket.find_by(number: $1)
         break if ticket
       end

diff --git a/app/models/ticket/number/increment.rb b/app/models/ticket/number/increment.rb
@@ -83,12 +83,14 @@ def check(string)
     end
 
     # probe format
-    string.scan(/\b#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(#{system_id}\d{2,48})\b/i) do
+    # NOTE: we use `(?<=\W|^)` at the start of the regular expressions below
+    # because `\b` fails when ticket_hook begins with a non-word character (like '#')
+    string.scan(/(?<=\W|^)#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(#{system_id}\d{2,48})\b/i) do
       ticket = Ticket.find_by(number: $1)
       break if ticket
     end
     if !ticket
-      string.scan(/\b#{Regexp.quote(ticket_hook)}\s{0,2}(#{system_id}\d{2,48})\b/i) do
+      string.scan(/(?<=\W|^)#{Regexp.quote(ticket_hook)}\s{0,2}(#{system_id}\d{2,48})\b/i) do
         ticket = Ticket.find_by(number: $1)
         break if ticket
       end