github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

BF/ENH: fix error when action doesn't match regex. Document unreachable code. Simplify regex

pull/484/head
Daniel Black 2013-12-12 20:07:09 +00:00
parent 3036afca91
commit b18ce122dd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/jailreader.py
View File

@ -35,7 +35,7 @@ logSys = logging.getLogger("fail2ban.client.config")
class JailReader(ConfigReader): class JailReader(ConfigReader):
actionCRE = re.compile("^((?:\w|-|_|\.)+)(?:\[(.*)\])?$") actionCRE = re.compile("^([\w_.-]+)(?:\[(.*)\])?$")
def __init__(self, name, force_enable=False, **kwargs): def __init__(self, name, force_enable=False, **kwargs):
ConfigReader.__init__(self, **kwargs) ConfigReader.__init__(self, **kwargs)
@ -173,12 +173,16 @@ class JailReader(ConfigReader):
def splitAction(action): def splitAction(action):
m = JailReader.actionCRE.match(action) m = JailReader.actionCRE.match(action)
d = dict() d = dict()
try:
mgroups = m.groups() mgroups = m.groups()
except AttributeError:
raise ValueError("While reading action %s we should have got 1 or "
"2 groups. Got: 0" % action)
if len(mgroups) == 2: if len(mgroups) == 2:
action_name, action_opts = mgroups action_name, action_opts = mgroups
elif len(mgroups) == 1: elif len(mgroups) == 1:
action_name, action_opts = mgroups[0], None action_name, action_opts = mgroups[0], None
else: else: # pragma: nocover - unreachable - regex only can capture 2 groups
raise ValueError("While reading action %s we should have got up to " raise ValueError("While reading action %s we should have got up to "
"2 groups. Got: %r" % (action, mgroups)) "2 groups. Got: %r" % (action, mgroups))
if not action_opts is None: if not action_opts is None: