Administrace komentářů

Zkusil jsem upravit fci __processCMD takto:

##
 # Executes a command with preliminary checks and substitutions.
 #
 # Before executing any commands, executes the "check" command first
 # in order to check if prerequirements are met. If this check fails,
 # it tries to restore a sane environnement before executing the real
 # command.
 # Replaces "aInfo" and "cInfo" in the query too.
 #
 # @param cmd The command to execute
 # @param aInfo Dynamic properties
 # @return True if the command succeeded
 
 def __processCmd(self, cmd, aInfo = None):
 """ Executes an OS command.
 """
 if cmd == "":
 logSys.debug("Nothing to do")
 return True
 
 # IPv4
 checkCmd = Action.replaceTag(self.__actionCheck, self.__cInfo)
 if not Action.executeCmd(checkCmd):
 logSys.error("Invariant check failed. Trying to restore a sane" +
 " environment")
 stopCmd = Action.replaceTag(self.__actionStop, self.__cInfo)
 Action.executeCmd(stopCmd)
 startCmd = Action.replaceTag(self.__actionStart, self.__cInfo)
 Action.executeCmd(startCmd)
 if not Action.executeCmd(checkCmd):
 logSys.fatal("Unable to restore environment")
 return False
 
 # IPv6
 checkCmd = Action.replaceTag(self.__actionCheck, self.__cInfo)
 checkCmd = checkCmd.replace('iptables ', 'ip6tables')
 if not Action.executeCmd(checkCmd):
 logSys.error("Invariant check failed. Trying to restore a sane" +
 " environment")
 stopCmd = Action.replaceTag(self.__actionStop, self.__cInfo)
 stopCmd = stopCmd.replace('iptables ', 'ip6tables')
 Action.executeCmd(stopCmd)
 startCmd = Action.replaceTag(self.__actionStart, self.__cInfo)
 startCmd = startCmd.replace('iptables ', 'ip6tables')
 Action.executeCmd(startCmd)
 if not Action.executeCmd(checkCmd):
 logSys.fatal("Unable to restore environment")
 return False

 # Replace tags
 if not aInfo == None:
 realCmd = Action.replaceTag(cmd, aInfo)
 else:
 realCmd = cmd
 
 # Replace static fields
 realCmd = Action.replaceTag(realCmd, self.__cInfo)
 
 return Action.executeCmd(realCmd)

Mrkněte se prosím na to, zda to tak může být, nebo zda byste to udělali jinak/lépe. Nic jiného mě nenapadlo.

Momentálně zbývá hlavní část a to, jak naučit fail2ban rozpoznávat IPv6 adresy v regulárních výrazech, zatím to rozeznává pouze IPv4.