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

DOC: missing cinfo tags are ok. Log error for self referencing definitions

pull/194/head
Daniel Black 2013-04-30 08:14:50 +10:00
parent d28f3fa285
commit d7862266d6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/action.py
View File

@ -145,6 +145,7 @@ class Action:
def execActionStart(self): def execActionStart(self):
if self.__cInfo: if self.__cInfo:
if not Action.substituteRecursiveTags(self.__cInfo): if not Action.substituteRecursiveTags(self.__cInfo):
logSys.error("Cinfo/definitions contain self referencing definitions and cannot be resolved")
return False return False
startCmd = Action.replaceTag(self.__actionStart, self.__cInfo) startCmd = Action.replaceTag(self.__actionStart, self.__cInfo)
return Action.executeCmd(startCmd) return Action.executeCmd(startCmd)
@ -268,7 +269,9 @@ class Action:
value = value[0:m.start()] + tags[m.group(1)] + value[m.end():] value = value[0:m.start()] + tags[m.group(1)] + value[m.end():]
m = t.search(value, m.start()) m = t.search(value, m.start())
else: else:
# TODO missing tag? to abort or not? there is the <STDIN> case maybe # Missing tags are ok so we just continue on searching.
# cInfo can contain aInfo elements like <HOST> and valid shell
# constructs like <STDIN>.
m = t.search(value, m.start() + 1) m = t.search(value, m.start() + 1)
tags[tag] = value tags[tag] = value
return tags return tags