From 2061b9dfeb4915d2628633a7507e41bc74878014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20Br=C3=A4u?= <andibraeu@users.noreply.github.com>
Date: Thu, 14 May 2020 09:51:33 +0200
Subject: [PATCH 1/2] support ejabberd 20.x and other authentications

before things like PLAIN worked, SCRAM-SHA-1 didn't match.
---
 config/filter.d/ejabberd-auth.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/filter.d/ejabberd-auth.conf b/config/filter.d/ejabberd-auth.conf
index 48e82df5..36c35af3 100644
--- a/config/filter.d/ejabberd-auth.conf
+++ b/config/filter.d/ejabberd-auth.conf
@@ -17,7 +17,8 @@
 # Values:  TEXT
 #
 failregex = ^=INFO REPORT====  ===\nI\(<0\.\d+\.0>:ejabberd_c2s:\d+\) : \([^)]+\) Failed authentication for \S+ from (?:IP )?<HOST>(?: \({{(?:\d+,){3}\d+},\d+}\))?$
-            ^(?:\.\d+)? \[info\] <0\.\d+\.\d>@ejabberd_c2s:\w+:\d+ \([^\)]+\) Failed (?:c2s \w+ )?authentication for \S+ from (?:IP )?(?:::FFFF:)?<HOST>(?:: |$)
+            ^(?:\.\d+)? \[info\] <0\.\d+\.\d>@ejabberd_c2s:\w+:\d+ \([^\)]+\) Failed (?:c2s [A-Z0-9\-]+ )?authentication for \S+ from (?:IP )?(?:::FFFF:)?<HOST>(?:: |$)
+            ^(?:\.\d+)? \[info\] <0\.\d+\.\d>@ejabberd_c2s:\w+:\d+ \([^\)]+\) Failed (?:c2s [A-Z0-9\-]+ )?authentication for \S+ from (?:IP )?(?:::ffff:)?<HOST>(?:: |$)
 
 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.

From f0f40e6c668ec9cc8a878ac6132221bc193dad51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20Br=C3=A4u?= <andibraeu@users.noreply.github.com>
Date: Thu, 14 May 2020 09:57:16 +0200
Subject: [PATCH 2/2] set correct log level for ejabberd 20.x

---
 config/filter.d/ejabberd-auth.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/filter.d/ejabberd-auth.conf b/config/filter.d/ejabberd-auth.conf
index 36c35af3..cbb7d5bc 100644
--- a/config/filter.d/ejabberd-auth.conf
+++ b/config/filter.d/ejabberd-auth.conf
@@ -18,7 +18,7 @@
 #
 failregex = ^=INFO REPORT====  ===\nI\(<0\.\d+\.0>:ejabberd_c2s:\d+\) : \([^)]+\) Failed authentication for \S+ from (?:IP )?<HOST>(?: \({{(?:\d+,){3}\d+},\d+}\))?$
             ^(?:\.\d+)? \[info\] <0\.\d+\.\d>@ejabberd_c2s:\w+:\d+ \([^\)]+\) Failed (?:c2s [A-Z0-9\-]+ )?authentication for \S+ from (?:IP )?(?:::FFFF:)?<HOST>(?:: |$)
-            ^(?:\.\d+)? \[info\] <0\.\d+\.\d>@ejabberd_c2s:\w+:\d+ \([^\)]+\) Failed (?:c2s [A-Z0-9\-]+ )?authentication for \S+ from (?:IP )?(?:::ffff:)?<HOST>(?:: |$)
+            ^(?:\.\d+)? \[warning\] <0\.\d+\.\d>@ejabberd_c2s:\w+:\d+ \([^\)]+\) Failed (?:c2s [A-Z0-9\-]+ )?authentication for \S+ from (?:IP )?(?:::ffff:)?<HOST>(?:: |$)
 
 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.