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

ENH: explicitly define tags which should be escaped

pull/715/head
Steven Hiscocks 2014-05-11 14:49:49 +01:00
parent 904b362215
commit 1e586fb0e9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fail2ban/server/action.py
View File

@ -194,6 +194,8 @@ class CommandAction(ActionBase):
timeout timeout
""" """
_escapedTags = set(('matches', 'ipmatches', 'ipjailmatches'))
def __init__(self, jail, name): def __init__(self, jail, name):
super(CommandAction, self).__init__(jail, name) super(CommandAction, self).__init__(jail, name)
self.timeout = 60 self.timeout = 60
@ -351,8 +353,8 @@ class CommandAction(ActionBase):
if not self.executeCmd(stopCmd, self.timeout): if not self.executeCmd(stopCmd, self.timeout):
raise RuntimeError("Error stopping action") raise RuntimeError("Error stopping action")
@staticmethod @classmethod
def substituteRecursiveTags(tags): def substituteRecursiveTags(cls, tags):
"""Sort out tag definitions within other tags. """Sort out tag definitions within other tags.
so: becomes: so: becomes:
@ -372,8 +374,8 @@ class CommandAction(ActionBase):
""" """
t = re.compile(r'<([^ >]+)>') t = re.compile(r'<([^ >]+)>')
for tag in tags.iterkeys(): for tag in tags.iterkeys():
if tag.endswith('matches'): if tag in cls._escapedTags:
# Escapped so won't match # Escaped so won't match
continue continue
value = str(tags[tag]) value = str(tags[tag])
m = t.search(value) m = t.search(value)
@ -386,8 +388,8 @@ class CommandAction(ActionBase):
# recursive definitions are bad # recursive definitions are bad
#logSys.log(5, 'recursion fail tag: %s value: %s' % (tag, value) ) #logSys.log(5, 'recursion fail tag: %s value: %s' % (tag, value) )
return False return False
elif found_tag.endswith('matches'): elif found_tag in cls._escapedTags:
# Escapped so won't match # Escaped so won't match
continue continue
else: else:
if tags.has_key(found_tag): if tags.has_key(found_tag):
@ -451,7 +453,7 @@ class CommandAction(ActionBase):
for tag in aInfo: for tag in aInfo:
if "<%s>" % tag in query: if "<%s>" % tag in query:
value = str(aInfo[tag]) # assure string value = str(aInfo[tag]) # assure string
if tag.endswith('matches'): if tag in cls._escapedTags:
# That one needs to be escaped since its content is # That one needs to be escaped since its content is
# out of our control # out of our control
value = cls.escapeTag(value) value = cls.escapeTag(value)