diff --git a/ChangeLog b/ChangeLog index 1ea46aed..e79d3be0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,7 @@ ver. 0.8.11 (2013/XX/XXX) - wanna-be-released - Enhancements: Daniel Black - * config/filter.d/asterisk.conf -- more stringent anchoring + * filter.d/{asterisk,assp}.conf -- regex hardening ver. 0.8.10 (2013/06/12) - wanna-be-secure ----------- diff --git a/config/filter.d/assp.conf b/config/filter.d/assp.conf index b1bfc082..2854d898 100644 --- a/config/filter.d/assp.conf +++ b/config/filter.d/assp.conf @@ -18,11 +18,11 @@ # Examples: Apr-27-13 02:33:09 Blocking 217.194.197.97 - too much AUTH errors (41); # Dec-29-12 17:10:31 [SSL-out] 200.247.87.82 SSL negotiation with client failed: SSL accept attempt failed with unknown errorerror:140760FC:SSL routines:SSL23_GET_CLIENT_HELLO:unknown protocol; # Dec-30-12 04:01:47 [SSL-out] 81.82.232.66 max sender authentication errors (5) exceeded -__assp_actions = (dropping|refusing) +__assp_actions = (?:dropping|refusing) -failregex = max sender authentication errors \(\d{,3}\) exceeded -- %(__assp_actions)s connection - after reply: \d{3} \d{1}\.\d{1}.\d{1} Error: authentication failed: [a-zA-Z0-9]+;$ - SSL negotiation with client failed: SSL accept attempt failed with unknown error.*:unknown protocol;$ - Blocking - too much AUTH errors \(\d{,3}\);$ +failregex = ^(:? \[SSL-out\])? max sender authentication errors \(\d{,3}\) exceeded -- %(__assp_actions)s connection - after reply: \d{3} \d{1}\.\d{1}.\d{1} Error: authentication failed: \w+;$ + ^(?: \[SSL-out\])? SSL negotiation with client failed: SSL accept attempt failed with unknown error.*:unknown protocol;$ + ^ Blocking - too much AUTH errors \(\d{,3}\);$ # Option: ignoreregex