From ead2d509dc0101807f0cad53e896963a5498e47b Mon Sep 17 00:00:00 2001 From: Ross Brown Date: Thu, 17 Dec 2015 17:45:24 +0000 Subject: [PATCH] Updated 'murmur' filter to use new double-anchored regex based on @yarikoptic's suggestions. --- config/filter.d/murmur.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/filter.d/murmur.conf b/config/filter.d/murmur.conf index cc47f022..3775a9d2 100644 --- a/config/filter.d/murmur.conf +++ b/config/filter.d/murmur.conf @@ -10,8 +10,15 @@ before = common.conf _daemon = murmurd -failregex = Rejected connection from :\d+: Invalid server password$ - Rejected connection from :\d+: Wrong certificate or password for existing user$ +# N.B. If you allow users to have usernames that include the '>' character you +# should change this to match the regex assigned to the 'username' +# variable in your server config file (murmur.ini / mumble-server.ini). +_usernameregex = [^>]+ + +_prefix = [\n\s]*(\.\d{3})?\s+\d+ => <\d+:%(_usernameregex)s\(-1\)> Rejected connection from :\d+: + +failregex = ^%(_prefix)s Invalid server password$ + ^%(_prefix)s Wrong certificate or password for existing user$ ignoreregex =