Clean up process trees in aha

This commit is contained in:
Gerard Wagener 2010-01-18 17:00:47 +01:00
parent bd4b19f8a7
commit 0c51cfd662
2 changed files with 17 additions and 3 deletions

View file

@ -19,6 +19,10 @@ class KernelEvents(ProcessEvent):
pid = int(msg['pid'][0]) pid = int(msg['pid'][0])
ppid = int(msg['ppid'][0]) ppid = int(msg['ppid'][0])
type = int(msg['type'][0]) type = int(msg['type'][0])
#Was a process closed?
if type == 3:
self.processtrees.silent_remove_pid(pid)
return
if type == 1: if type == 1:
# Got sys_execve # Got sys_execve
command = msg['file'][0] command = msg['file'][0]
@ -33,7 +37,7 @@ class KernelEvents(ProcessEvent):
#is this process induced by clone or sys_execve related to a user? #is this process induced by clone or sys_execve related to a user?
if self.processtrees.searchTree(pid,ppid) == False: if self.processtrees.searchTree(pid,ppid) == False:
print "Process belongs to the system, allow it" #print "Process belongs to the system, allow it"
#Note the process could also belong to a local #Note the process could also belong to a local
#connected user #connected user
self.ahaa.create_message(filekey,block=0, exitcode=0, self.ahaa.create_message(filekey,block=0, exitcode=0,
@ -41,7 +45,7 @@ class KernelEvents(ProcessEvent):
return return
else: else:
print "Process belongs to a user, play" print "Process belongs to a user, play"
#TODO add default action #TODO add default action
except KeyError,e: except KeyError,e:
print "EXCEPTION: KeyError" print "EXCEPTION: KeyError"
except IndexError,w: except IndexError,w:

View file

@ -31,6 +31,7 @@ class AHAActions:
except OSError,e: except OSError,e:
pass pass
#Can trow IOError #Can trow IOError
def create_message(self,filename,block,exitcode,substitue,insult): def create_message(self,filename,block,exitcode,substitue,insult):
try: try:
@ -129,7 +130,16 @@ class ProcessTrees:
self.processList.pop(pid) self.processList.pop(pid)
return self.foundUser return self.foundUser
def silent_remove_pid(self,pid):
try:
if self.processList.has_key(pid):
self.processList.pop(pid)
if self.userList.has_key(pid):
self.userList.pop(pid)
print "User in process ",pid," pid disconnected"
except KeyError,e:
pass
class TestProcessTree(unittest.TestCase): class TestProcessTree(unittest.TestCase):
def testSearchRegular0(self): def testSearchRegular0(self):
x = ProcessTrees() x = ProcessTrees()