mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-04 00:05:14 +00:00
Code Issues Releases Wiki Activity

drop commented out code from logparser.py

Browse Source
This commit is contained in:
Christian Boltz
2019-04-28 14:37:43 +02:00
parent bed9ce35a1
commit b86fed1a57
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
utils/apparmor/logparser.py
View File

@@ -85,7 +85,6 @@ class ReadLog:
"""Parse the event from log into key value pairs""" """Parse the event from log into key value pairs"""
msg = msg.strip() msg = msg.strip()
self.debug_logger.info('parse_event: %s' % msg) self.debug_logger.info('parse_event: %s' % msg)
#print(repr(msg))
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
# parse_record fails with u'foo' style strings hence typecasting to string # parse_record fails with u'foo' style strings hence typecasting to string
msg = str(msg) msg = str(msg)
@@ -132,10 +131,6 @@ class ReadLog:
if not ev['time']: if not ev['time']:
ev['time'] = int(time.time()) ev['time'] = int(time.time())
# Remove None keys
#for key in ev.keys():
# if not ev[key] or not re.search('[\w]+', ev[key]):
# ev.pop(key)
if ev['aamode']: if ev['aamode']:
# Convert aamode values to their counter-parts # Convert aamode values to their counter-parts
@@ -158,7 +153,6 @@ class ReadLog:
ev['aamode'] = 'ERROR' ev['aamode'] = 'ERROR'
if ev['aamode']: if ev['aamode']:
#debug_logger.debug(ev)
return ev return ev
else: else:
return None return None
@@ -175,17 +169,11 @@ class ReadLog:
self.pid[loc_pid] = arrayref self.pid[loc_pid] = arrayref
for ia in ['fork', loc_pid, profile, hat]: for ia in ['fork', loc_pid, profile, hat]:
arrayref.append(ia) arrayref.append(ia)
# self.pid[parent].append(array_ref)
# self.pid[loc_pid] = array_ref
else: else:
arrayref = [] arrayref = []
self.log.append(arrayref) self.log.append(arrayref)
self.pid[loc_pid] = arrayref self.pid[loc_pid] = arrayref
# self.log.append(array_ref)
# self.pid[loc_pid] = array_ref
self.pid[loc_pid].append([type, loc_pid] + event) self.pid[loc_pid].append([type, loc_pid] + event)
#print("\n\npid",self.pid)
#print("log",self.log)
def parse_event_for_tree(self, e): def parse_event_for_tree(self, e):
aamode = e.get('aamode', 'UNKNOWN') aamode = e.get('aamode', 'UNKNOWN')
@@ -220,7 +208,6 @@ class ReadLog:
if e['error_code'] == 1 and e['info'] == 'unconfined can not change_hat': if e['error_code'] == 1 and e['info'] == 'unconfined can not change_hat':
return None return None
profile = e['name2'] profile = e['name2']
#hat = None
if '//' in e['name2']: if '//' in e['name2']:
profile, hat = e['name2'].split('//')[:2] profile, hat = e['name2'].split('//')[:2]
@@ -306,11 +293,6 @@ class ReadLog:
self.pid[child].append(arrayref) self.pid[child].append(arrayref)
for ia in ['fork', child, profile, hat]: for ia in ['fork', child, profile, hat]:
arrayref.append(ia) arrayref.append(ia)
# if self.pid.get(parent, False):
# self.pid[parent] += [arrayref]
# else:
# self.log += [arrayref]
# self.pid[child] = arrayref
elif self.op_type(e) == 'net': elif self.op_type(e) == 'net':
return(e['pid'], e['parent'], 'netdomain', return(e['pid'], e['parent'], 'netdomain',
@@ -342,14 +324,10 @@ class ReadLog:
seenmark = True seenmark = True
if self.logmark: if self.logmark:
seenmark = False seenmark = False
#last = None
#event_type = None
try: try:
#print(self.filename)
self.LOG = open_file_read(self.filename) self.LOG = open_file_read(self.filename)
except IOError: except IOError:
raise AppArmorException('Can not read AppArmor logfile: ' + self.filename) raise AppArmorException('Can not read AppArmor logfile: ' + self.filename)
#LOG = open_file_read(log_open)
line = True line = True
while line: while line:
line = self.get_next_log_entry() line = self.get_next_log_entry()
@@ -365,7 +343,6 @@ class ReadLog:
continue continue
event = self.parse_event(line) event = self.parse_event(line)
#print(event)
if event: if event:
try: try:
event = self.parse_event_for_tree(event) event = self.parse_event_for_tree(event)