From aa6ba57cde905213b91ea9064b0ef7904847ec7f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 6 Mar 2017 12:19:49 +0100 Subject: [PATCH] Improved followup regex (quote ticket_hook). --- app/models/ticket/number/date.rb | 4 ++-- app/models/ticket/number/increment.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/ticket/number/date.rb b/app/models/ticket/number/date.rb index 300d96b99..ce92976f9 100644 --- a/app/models/ticket/number/date.rb +++ b/app/models/ticket/number/date.rb @@ -82,12 +82,12 @@ module Ticket::Number::Date ticket = nil # probe format - string.scan(/#{ticket_hook}#{ticket_hook_divider}(#{system_id}\d{2,48})/i) { + string.scan(/#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(#{system_id}\d{2,48})/i) { ticket = Ticket.find_by(number: $1) break if ticket } if !ticket - string.scan(/#{ticket_hook}\s{0,2}(#{system_id}\d{2,48})/i) { + string.scan(/#{Regexp.quote(ticket_hook)}\s{0,2}(#{system_id}\d{2,48})/i) { ticket = Ticket.find_by(number: $1) break if ticket } diff --git a/app/models/ticket/number/increment.rb b/app/models/ticket/number/increment.rb index a84574c87..e02dfc824 100644 --- a/app/models/ticket/number/increment.rb +++ b/app/models/ticket/number/increment.rb @@ -79,12 +79,12 @@ module Ticket::Number::Increment ticket = nil # probe format - string.scan(/#{ticket_hook}#{ticket_hook_divider}(#{system_id}\d{2,48})/i) { + string.scan(/#{Regexp.quote(ticket_hook)}#{Regexp.quote(ticket_hook_divider)}(#{system_id}\d{2,48})/i) { ticket = Ticket.find_by(number: $1) break if ticket } if !ticket - string.scan(/#{ticket_hook}\s{0,2}(#{system_id}\d{2,48})/i) { + string.scan(/#{Regexp.quote(ticket_hook)}\s{0,2}(#{system_id}\d{2,48})/i) { ticket = Ticket.find_by(number: $1) break if ticket }