commit 817a144712ecb112298079262d79b15f9c68e60d Author: Micha vor dem Berge m@mcvdb.de Date: Fri Jan 29 13:49:06 2010 +0000
Fixed mixed tab and whitespace-errors
modules/selinux_mod.py | 30 +++++++++++++++------------- modules/sudo_mod.py | 49 ++++++++++++++++++++++++----------------------- modules/yum_mod.py | 28 +++++++++++++------------- 3 files changed, 55 insertions(+), 52 deletions(-) --- diff --git a/modules/selinux_mod.py b/modules/selinux_mod.py index d603877..0e40b20 100644 --- a/modules/selinux_mod.py +++ b/modules/selinux_mod.py @@ -23,8 +23,8 @@ class selinux_mod(InternalModule): self.logger.put(3, 'initializing selinux') rc = re.compile
- self.ignore = 0 - self.preventing = 1 + self.ignore = 0 + self.preventing = 1
selinux_map = { rc('.*setroubleshoot: SELinux is preventing'): self.selinux @@ -52,30 +52,32 @@ class selinux_mod(InternalModule): # Line-matching routines # def selinux(self, linemap): - action = self.preventing - self.logger.put(3, 'selinux invoked') + action = self.preventing + self.logger.put(3, 'selinux invoked') sys, msg, mult = self.get_smm(linemap)
- self.logger.put(3, 'test selinux %d' % mult) + self.logger.put(3, 'test selinux %d' % mult) message = self._get_selinux_message(msg) - self.logger.put(3, 'selinux message: %s' % message) + self.logger.put(3, 'selinux message: %s' % message)
restuple = self._mk_restuple(sys, action, message) - self.logger.put(3, 'selinux finished') + self.logger.put(3, 'selinux finished') return {restuple: mult}
+ ## # Helpers # def _mk_restuple(self, sys, action, message): - return (action, message, sys) + return (action, message, sys)
def _get_selinux_message(self, str): - message = 'unknown' + message = 'unknown' mo = self.selinux_message_re.search(str) if mo: message = mo.group(1) return message
+ #### # Finalize the report def finalize(self, rs): @@ -95,15 +97,15 @@ class selinux_mod(InternalModule): else: flipper = self.flip service_rep = []
- for system in rs.get_distinct((action, message,)): - service_rep.append(system) + for system in rs.get_distinct((action, message,)): + service_rep.append(system)
- system_list = ', '.join(service_rep) - rep[action] += self.line_rep % (flipper, message, system_list) + system_list = ', '.join(service_rep) + rep[action] += self.line_rep % (flipper, message, system_list)
if rep[self.preventing]: report += self.subreport_wrap % (self.selinux_preventing_title, rep[self.preventing]) - logger.put(3, 'selinux report: self.preventing added') + logger.put(3, 'selinux report: self.preventing added')
report = self.report_wrap % report return report diff --git a/modules/sudo_mod.py b/modules/sudo_mod.py index 786e3bf..d411b9f 100644 --- a/modules/sudo_mod.py +++ b/modules/sudo_mod.py @@ -23,9 +23,9 @@ class sudo_mod(InternalModule): self.logger.put(2, 'initializing sudo') rc = re.compile
- self.ignore = 0 - self.open = 1 - self.not_allowed = 2 + self.ignore = 0 + self.open = 1 + self.not_allowed = 2
sudo_map = { rc('.*sudo:\s+\S+\s:\sTTY'): self.sudo, @@ -61,20 +61,20 @@ class sudo_mod(InternalModule): # Line-matching routines # def sudo(self, linemap): - action = self.open - self.logger.put(2, 'sudo invoked') + action = self.open + self.logger.put(2, 'sudo invoked') sys, msg, mult = self.get_smm(linemap)
- self.logger.put(3, 'test sudo %d' % mult) + self.logger.put(3, 'test sudo %d' % mult) user = self._get_sudo_user(msg) - self.logger.put(3, 'sudo user: %s' % user) - asuser = self._get_sudo_as_user(msg) - self.logger.put(3, 'sudo asuser: %s' % asuser) - command_name = self._get_sudo_command_name(msg) - self.logger.put(3, 'sudo command: %s' % command_name) + self.logger.put(3, 'sudo user: %s' % user) + asuser = self._get_sudo_as_user(msg) + self.logger.put(3, 'sudo asuser: %s' % asuser) + command_name = self._get_sudo_command_name(msg) + self.logger.put(3, 'sudo command: %s' % command_name)
restuple = self._mk_restuple(sys, action, user, asuser, command_name, None) - self.logger.put(2, 'sudo finished') + self.logger.put(2, 'sudo finished') return {restuple: mult}
def sudo_na(self, linemap): @@ -89,7 +89,7 @@ class sudo_mod(InternalModule): self.logger.put(3, 'sudo asuser: %s' % asuser) command_name = self._get_sudo_command_name(msg) self.logger.put(3, 'sudo command: %s' % command_name) - error_message = self._get_sudo_error_message(msg) + error_message = self._get_sudo_error_message(msg) self.logger.put(3, 'sudo error_message: %s' % error_message)
restuple = self._mk_restuple(sys, action, user, asuser, command_name, error_message) @@ -97,30 +97,30 @@ class sudo_mod(InternalModule): return {restuple: mult}
def sudo_ignore(self, linemap): - restuple = self._mk_restuple(None, self.ignore, None, None, None, None) - return {restuple: 1} + restuple = self._mk_restuple(None, self.ignore, None, None, None, None) + return {restuple: 1}
## - # HElpers + # Helpers # def _mk_restuple(self, sys, action, user=None, asuser=None, command_name=None, error_message=None): - return (action, user, command_name, asuser, error_message, sys) + return (action, user, command_name, asuser, error_message, sys) #return (sys, action, user, asuser, command_name)
def _get_sudo_user(self, str): - user = 'unknown' + user = 'unknown' mo = self.sudo_user_name_re.search(str) if mo: user = mo.group(1) return user
def _get_sudo_as_user(self, str): - asuser = 'unknown' + asuser = 'unknown' mo = self.sudo_as_user_re.search(str) if mo: asuser = mo.group(1) return asuser
def _get_sudo_error_message(self, str): - pass_attempts = 0 + pass_attempts = 0 mo = self.sudo_error_message_re.search(str) if mo: pass_attempts = mo.group(1) return pass_attempts @@ -131,6 +131,7 @@ class sudo_mod(InternalModule): if mo: command_name = mo.group(1) return command_name
+ #### # Finalize the report def finalize(self, rs): @@ -167,19 +168,19 @@ class sudo_mod(InternalModule): #logger.put(2, 'sudo svcrep: %s' % svcrep) if blank: user = ' ' else: blank = 1 - if (action == self.open): + if (action == self.open): rep[action] += self.line_rep % (flipper, user, svcrep[0], svcrep[1], svcrep[2]) - else: + else: rep[action] += self.line_rep_na % (flipper, user, svcrep[0], svcrep[3], svcrep[1], svcrep[2])
if rep[self.open]: report += self.subreport_wrap % (self.sudo_open_title, rep[self.open]) - logger.put(2, 'sudo report: self.open added') + logger.put(2, 'sudo report: self.open added')
if rep[self.not_allowed]: report += self.subreport_na_wrap % (self.sudo_not_allowed_title, rep[self.not_allowed]) - logger.put(2, 'sudo report: self.not_allowed added') + logger.put(2, 'sudo report: self.not_allowed added')
report = self.report_wrap % report return report diff --git a/modules/yum_mod.py b/modules/yum_mod.py index 0ab5e9d..c6409fc 100644 --- a/modules/yum_mod.py +++ b/modules/yum_mod.py @@ -25,10 +25,10 @@ class yum_mod(InternalModule): self.logger = logger rc = re.compile
- self.ignore = 0 - self.installed = 1 - self.updated = 2 - self.erased = 3 + self.ignore = 0 + self.installed = 1 + self.updated = 2 + self.erased = 3
yum_map = { rc('yum: Installed:'): self.pkg_installed, @@ -64,12 +64,12 @@ class yum_mod(InternalModule): # def pkg_updated(self, linemap): self.logger.put(3, 'entered pkg_updated...') - action = self.updated + action = self.updated sys, msg, mult = self.get_smm(linemap)
- self.logger.put(3, 'test yum %d' % mult) - name = self._get_updated_name(msg) - self.logger.put(3, 'name: %s' % name) + self.logger.put(3, 'test yum %d' % mult) + name = self._get_updated_name(msg) + self.logger.put(3, 'name: %s' % name)
restuple = self._mk_restuple(action, sys, name) return {restuple: mult} @@ -103,10 +103,10 @@ class yum_mod(InternalModule): # Helpers # def _mk_restuple(self, action, sys, name=None): - return (action, sys, name) + return (action, sys, name)
def _get_name(self, str): - name = 'unknown' + name = 'unknown' mo = self.name_re.search(str) if mo: name = mo.group(1) return name @@ -136,7 +136,7 @@ class yum_mod(InternalModule): # report = '' rep = {} - # (action, sys, name) + # (action, sys, name) for action in [self.updated, self.installed, self.erased]: rep[action] = '' flipper = '' @@ -146,10 +146,10 @@ class yum_mod(InternalModule): else: flipper = self.flip service_rep = []
- for name in rs.get_distinct((action, system,)): - service_rep.append(name) + for name in rs.get_distinct((action, system,)): + service_rep.append(name)
- user_list = ', '.join(service_rep) + user_list = ', '.join(service_rep) rep[action] += self.line_rep % (flipper, system, user_list)
if rep[self.installed]: