2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-05 08:45:22 +00:00
Files
apparmor/utils/apparmor/rule/capability.py
Christian Boltz 6f63cf3664 Adjust type(x) == str checks in the rule classes for py2
python 3 uses only the 'str' type, while python 2 also uses 'unicode'.
This patch adds a type_is_str() function to common.py - depending on the
python version, it checks for both. This helper function is used to keep
the complexity outside of the rule classes.

The rule classes get adjusted to use type_is_str() instead of checking
for type(x) == str, which means they support both python versions.

As pointed out by Tyler, there are also some type(...) == str checks in
aare.py and rule/__init__.py which should get the same change.

Finally, add test-common.py with some tests for type_is_str().


References: https://bugs.launchpad.net/apparmor/+bug/1513880


Acked-by: Tyler Hicks <tyhicks@canonical.com> for trunk and 2.10

Note: 2.10 doesn't contain SignalRule, therefore it doesn't get that
part of the patch.
2015-12-17 23:33:36 +01:00

160 lines
5.8 KiB
Python

# ----------------------------------------------------------------------
# Copyright (C) 2013 Kshitij Gupta <kgupta8592@gmail.com>
# Copyright (C) 2014 Christian Boltz <apparmor@cboltz.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public
# License as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# ----------------------------------------------------------------------
from apparmor.regex import RE_PROFILE_CAP
from apparmor.common import AppArmorBug, AppArmorException, type_is_str
from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers
import re
# setup module translations
from apparmor.translations import init_translation
_ = init_translation()
class CapabilityRule(BaseRule):
'''Class to handle and store a single capability rule'''
# Nothing external should reference this class, all external users
# should reference the class field CapabilityRule.ALL
class __CapabilityAll(object):
pass
ALL = __CapabilityAll
def __init__(self, cap_list, audit=False, deny=False, allow_keyword=False,
comment='', log_event=None):
super(CapabilityRule, self).__init__(audit=audit, deny=deny,
allow_keyword=allow_keyword,
comment=comment,
log_event=log_event)
# Because we support having multiple caps in one rule,
# initializer needs to accept a list of caps.
self.all_caps = False
if cap_list == CapabilityRule.ALL:
self.all_caps = True
self.capability = set()
else:
if type_is_str(cap_list):
self.capability = {cap_list}
elif type(cap_list) == list and len(cap_list) > 0:
self.capability = set(cap_list)
else:
raise AppArmorBug('Passed unknown object to CapabilityRule: %s' % str(cap_list))
# make sure none of the cap_list arguments are blank, in
# case we decide to return one cap per output line
for cap in self.capability:
if len(cap.strip()) == 0:
raise AppArmorBug('Passed empty capability to CapabilityRule: %s' % str(cap_list))
@classmethod
def _match(cls, raw_rule):
return RE_PROFILE_CAP.search(raw_rule)
@classmethod
def _parse(cls, raw_rule):
'''parse raw_rule and return CapabilityRule'''
matches = cls._match(raw_rule)
if not matches:
raise AppArmorException(_("Invalid capability rule '%s'") % raw_rule)
audit, deny, allow_keyword, comment = parse_modifiers(matches)
capability = []
if matches.group('capability'):
capability = matches.group('capability').strip()
capability = re.split("[ \t]+", capability)
else:
capability = CapabilityRule.ALL
return CapabilityRule(capability, audit=audit, deny=deny,
allow_keyword=allow_keyword,
comment=comment)
def get_clean(self, depth=0):
'''return rule (in clean/default formatting)'''
space = ' ' * depth
if self.all_caps:
return('%s%scapability,%s' % (space, self.modifiers_str(), self.comment))
else:
caps = ' '.join(self.capability).strip() # XXX return multiple lines, one for each capability, instead?
if caps:
return('%s%scapability %s,%s' % (space, self.modifiers_str(), ' '.join(sorted(self.capability)), self.comment))
else:
raise AppArmorBug("Empty capability rule")
def is_covered_localvars(self, other_rule):
'''check if other_rule is covered by this rule object'''
if not other_rule.capability and not other_rule.all_caps:
raise AppArmorBug('No capability specified')
if not self.all_caps:
if other_rule.all_caps:
return False
if not other_rule.capability.issubset(self.capability):
return False
# still here? -> then it is covered
return True
def is_equal_localvars(self, rule_obj):
'''compare if rule-specific variables are equal'''
if not type(rule_obj) == CapabilityRule:
raise AppArmorBug('Passed non-capability rule: %s' % str(rule_obj))
if (self.capability != rule_obj.capability
or self.all_caps != rule_obj.all_caps):
return False
return True
def severity(self, sev_db):
if self.all_caps:
severity = sev_db.rank_capability('__ALL__')
else:
severity = -1
for cap in self.capability:
sev = sev_db.rank_capability(cap)
if isinstance(sev, int): # type check avoids breakage caused by 'unknown'
severity = max(severity, sev)
if severity == -1:
severity = sev # effectively 'unknown'
return severity
def logprof_header_localvars(self):
if self.all_caps:
cap_txt = _('ALL')
else:
cap_txt = ' '.join(sorted(self.capability))
return [
_('Capability'), cap_txt,
]
class CapabilityRuleset(BaseRuleset):
'''Class to handle and store a collection of capability rules'''
def get_glob(self, path_or_rule):
'''Return the next possible glob. For capability rules, that's always "capability," (all capabilities)'''
return 'capability,'