From 5bb6be01636ca515ded2b906bb9c7f72ea85b96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Tue, 30 May 2017 02:05:38 +0200
Subject: [PATCH 1/2] IPv6 address may overlap

---
 config/action.d/helpers-common.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/action.d/helpers-common.conf b/config/action.d/helpers-common.conf
index b04c7f7a..ccbcb172 100644
--- a/config/action.d/helpers-common.conf
+++ b/config/action.d/helpers-common.conf
@@ -5,7 +5,7 @@
 #   (printf %%b "Log-excerpt contains 'test':\n"; %(_grep_logs)s; printf %%b "Log-excerpt contains 'test':\n") | mail ...
 #
 _grep_logs = logpath="<logpath>"; grep <grepopts> -E %(_grep_logs_args)s $logpath | <greplimit>
-_grep_logs_args = '(^|[^0-9])<ip>([^0-9]|$)'
+_grep_logs_args = '(^|[^0-9:])<ip>([^0-9:]|$)'
 
 # Used for actions, that should not by executed if ticket was restored:
 _bypass_if_restored = if [ '<restored>' = '1' ]; then exit 0; fi;
@@ -13,4 +13,4 @@ _bypass_if_restored = if [ '<restored>' = '1' ]; then exit 0; fi;
 [Init]
 greplimit = tail -n <grepmax>
 grepmax = 1000
-grepopts = -m <grepmax>
\ No newline at end of file
+grepopts = -m <grepmax>

From 80cc47b75ff14858d9a7bab8410ce982745508da Mon Sep 17 00:00:00 2001
From: "Serg G. Brester" <github@sebres.de>
Date: Tue, 30 May 2017 09:14:43 +0200
Subject: [PATCH 2/2] Update helpers-common.conf

fixed grep pattern: escape dot-char in search-IP and more restrictive boundaries (IPv6-capable)
---
 config/action.d/helpers-common.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/action.d/helpers-common.conf b/config/action.d/helpers-common.conf
index ccbcb172..5799d9d3 100644
--- a/config/action.d/helpers-common.conf
+++ b/config/action.d/helpers-common.conf
@@ -5,7 +5,7 @@
 #   (printf %%b "Log-excerpt contains 'test':\n"; %(_grep_logs)s; printf %%b "Log-excerpt contains 'test':\n") | mail ...
 #
 _grep_logs = logpath="<logpath>"; grep <grepopts> -E %(_grep_logs_args)s $logpath | <greplimit>
-_grep_logs_args = '(^|[^0-9:])<ip>([^0-9:]|$)'
+_grep_logs_args = "(^|[^0-9a-fA-F:])$(echo '<ip>' | sed 's/\./\\./g')([^0-9a-fA-F:]|$)"
 
 # Used for actions, that should not by executed if ticket was restored:
 _bypass_if_restored = if [ '<restored>' = '1' ]; then exit 0; fi;