mirror of
https://github.com/SELinuxProject/setools
synced 2025-02-19 13:37:04 +00:00
Chris PeBenito
parent
f5b2c77a71
commit
b0ed2c5477
51
sediff
51
sediff
@ -487,6 +487,57 @@ try:
|
||||
|
||||
print()
|
||||
|
||||
if all_differences or args.role_allow:
|
||||
if diff.added_role_allows or diff.removed_role_allows or args.role_allow:
|
||||
print("Role allow Rules ({0} Added, {1} Removed)".format(
|
||||
len(diff.added_role_allows), len(diff.removed_role_allows)))
|
||||
|
||||
if diff.added_role_allows:
|
||||
print(" Added Role allow Rules: {0}".format(
|
||||
len(diff.added_role_allows)))
|
||||
for r in sorted(diff.added_role_allows):
|
||||
print(" + {0}".format(r))
|
||||
|
||||
if diff.removed_role_allows:
|
||||
print(" Removed Role allow Rules: {0}".format(
|
||||
len(diff.removed_role_allows)))
|
||||
for r in sorted(diff.removed_role_allows):
|
||||
print(" - {0}".format(r))
|
||||
|
||||
print()
|
||||
|
||||
if all_differences or args.role_trans:
|
||||
if diff.added_role_transitions or diff.removed_role_transitions or \
|
||||
diff.modified_role_transitions or args.role_trans:
|
||||
print("Role_transition Rules ({0} Added, {1} Removed, {2} Modified)".format(
|
||||
len(diff.added_role_transitions), len(diff.removed_role_transitions),
|
||||
len(diff.modified_role_transitions)))
|
||||
|
||||
if diff.added_role_transitions:
|
||||
print(" Added Role_transition Rules: {0}".format(
|
||||
len(diff.added_role_transitions)))
|
||||
for r in sorted(diff.added_role_transitions):
|
||||
print(" + {0}".format(r))
|
||||
|
||||
if diff.removed_role_transitions:
|
||||
print(" Removed Role_transition Rules: {0}".format(
|
||||
len(diff.removed_role_transitions)))
|
||||
for r in sorted(diff.removed_role_transitions):
|
||||
print(" - {0}".format(r))
|
||||
|
||||
if diff.modified_role_transitions:
|
||||
print(" Modified Role_transition Rules: {0}".format(
|
||||
len(diff.modified_role_transitions)))
|
||||
|
||||
for rule, added_default, removed_default in sorted(diff.modified_role_transitions):
|
||||
rule_string = \
|
||||
"{0.ruletype} {0.source} {0.target}:{0.tclass} +{1} -{2}".format(
|
||||
rule, added_default, removed_default)
|
||||
|
||||
print(" * {0}".format(rule_string))
|
||||
|
||||
print()
|
||||
|
||||
if all_differences or args.range_trans:
|
||||
if diff.added_range_transitions or diff.removed_range_transitions or \
|
||||
diff.modified_range_transitions or args.range_trans:
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
from .commons import CommonDifference
|
||||
from .mlsrules import MLSRulesDifference
|
||||
from .objclass import ObjClassDifference
|
||||
from .rbacrules import RBACRulesDifference
|
||||
from .roles import RolesDifference
|
||||
from .terules import TERulesDifference
|
||||
from .types import TypesDifference
|
||||
@ -29,6 +30,7 @@ __all__ = ['PolicyDifference']
|
||||
class PolicyDifference(CommonDifference,
|
||||
MLSRulesDifference,
|
||||
ObjClassDifference,
|
||||
RBACRulesDifference,
|
||||
RolesDifference,
|
||||
TERulesDifference,
|
||||
TypesDifference):
|
||||
|
||||
187
setools/diff/rbacrules.py
Normal file
187
setools/diff/rbacrules.py
Normal file
@ -0,0 +1,187 @@
|
||||
# Copyright 2016, Tresys Technology, LLC
|
||||
#
|
||||
# This file is part of SETools.
|
||||
#
|
||||
# SETools is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as
|
||||
# published by the Free Software Foundation, either version 2.1 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# SETools 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 Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with SETools. If not, see
|
||||
# <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
from collections import namedtuple
|
||||
|
||||
from .descriptors import DiffResultDescriptor
|
||||
from .difference import Difference, SymbolWrapper, Wrapper
|
||||
|
||||
|
||||
modified_rbacrule_record = namedtuple("modified_rbacrule", ["rule",
|
||||
"added_default",
|
||||
"removed_default"])
|
||||
|
||||
|
||||
class RBACRulesDifference(Difference):
|
||||
|
||||
"""Determine the difference in RBAC rules between two policies."""
|
||||
|
||||
added_role_allows = DiffResultDescriptor("diff_role_allows")
|
||||
removed_role_allows = DiffResultDescriptor("diff_role_allows")
|
||||
# role allows cannot be modified, only added/removed
|
||||
|
||||
added_role_transitions = DiffResultDescriptor("diff_role_transitions")
|
||||
removed_role_transitions = DiffResultDescriptor("diff_role_transitions")
|
||||
modified_role_transitions = DiffResultDescriptor("diff_role_transitions")
|
||||
|
||||
# Lists of rules for each policy
|
||||
_left_role_allows = None
|
||||
_right_role_allows = None
|
||||
|
||||
_left_role_transitions = None
|
||||
_right_role_transitions = None
|
||||
|
||||
def diff_role_allows(self):
|
||||
"""Generate the difference in role allow rules between the policies."""
|
||||
|
||||
self.log.info(
|
||||
"Generating role allow differences from {0.left_policy} to {0.right_policy}".
|
||||
format(self))
|
||||
|
||||
if self._left_role_allows is None or self._right_role_allows is None:
|
||||
self._create_rbac_rule_lists()
|
||||
|
||||
self.added_role_allows, self.removed_role_allows, _ = \
|
||||
self._set_diff(self._expand_generator(self._left_role_allows, RoleAllowWrapper),
|
||||
self._expand_generator(self._right_role_allows, RoleAllowWrapper))
|
||||
|
||||
def diff_role_transitions(self):
|
||||
"""Generate the difference in role_transition rules between the policies."""
|
||||
|
||||
self.log.info(
|
||||
"Generating role_transition differences from {0.left_policy} to {0.right_policy}".
|
||||
format(self))
|
||||
|
||||
if self._left_role_transitions is None or self._right_role_transitions is None:
|
||||
self._create_rbac_rule_lists()
|
||||
|
||||
self.added_role_transitions, \
|
||||
self.removed_role_transitions, \
|
||||
self.modified_role_transitions = self._diff_rbac_rules(
|
||||
self._expand_generator(self._left_role_transitions, RoleTransitionWrapper),
|
||||
self._expand_generator(self._right_role_transitions, RoleTransitionWrapper))
|
||||
|
||||
#
|
||||
# Internal functions
|
||||
#
|
||||
def _create_rbac_rule_lists(self):
|
||||
"""Create rule lists for both policies."""
|
||||
self._left_role_allows = []
|
||||
self._left_role_transitions = []
|
||||
for rule in self.left_policy.rbacrules():
|
||||
# do not expand yet, to keep memory
|
||||
# use down as long as possible
|
||||
if rule.ruletype == "allow":
|
||||
self._left_role_allows.append(rule)
|
||||
elif rule.ruletype == "role_transition":
|
||||
self._left_role_transitions.append(rule)
|
||||
else:
|
||||
raise TypeError("Unknown rule type: {0}".format(rule.ruletype))
|
||||
|
||||
self._right_role_allows = []
|
||||
self._right_role_transitions = []
|
||||
for rule in self.right_policy.rbacrules():
|
||||
# do not expand yet, to keep memory
|
||||
# use down as long as possible
|
||||
if rule.ruletype == "allow":
|
||||
self._right_role_allows.append(rule)
|
||||
elif rule.ruletype == "role_transition":
|
||||
self._right_role_transitions.append(rule)
|
||||
else:
|
||||
raise TypeError("Unknown rule type: {0}".format(rule.ruletype))
|
||||
|
||||
def _diff_rbac_rules(self, left_list, right_list):
|
||||
"""Common method for comparing rbac rules."""
|
||||
added, removed, matched = self._set_diff(left_list, right_list)
|
||||
|
||||
modified = []
|
||||
|
||||
for left_rule, right_rule in matched:
|
||||
# Criteria for modified rules
|
||||
# 1. change to default role
|
||||
if SymbolWrapper(left_rule.default) != SymbolWrapper(right_rule.default):
|
||||
modified.append(modified_rbacrule_record(left_rule,
|
||||
right_rule.default,
|
||||
left_rule.default))
|
||||
|
||||
return added, removed, modified
|
||||
|
||||
def _reset_diff(self):
|
||||
"""Reset diff results on policy changes."""
|
||||
self.log.debug("Resetting RBAC rule differences")
|
||||
self.added_role_allows = None
|
||||
self.removed_role_allows = None
|
||||
self.modified_role_allows = None
|
||||
self.added_role_transitions = None
|
||||
self.removed_role_transitions = None
|
||||
self.modified_role_transitions = None
|
||||
|
||||
# Sets of rules for each policy
|
||||
self._left_role_allows = None
|
||||
self._right_role_allows = None
|
||||
self._left_role_transitions = None
|
||||
self._right_role_transitions = None
|
||||
|
||||
|
||||
class RoleAllowWrapper(Wrapper):
|
||||
|
||||
"""Wrap role allow rules to allow set operations."""
|
||||
|
||||
def __init__(self, rule):
|
||||
self.origin = rule
|
||||
self.ruletype = rule.ruletype
|
||||
self.source = SymbolWrapper(rule.source)
|
||||
self.target = SymbolWrapper(rule.target)
|
||||
self.key = hash(rule)
|
||||
|
||||
def __hash__(self):
|
||||
return self.key
|
||||
|
||||
def __lt__(self, other):
|
||||
return self.key < other.key
|
||||
|
||||
def __eq__(self, other):
|
||||
# because RBACRuleDifference groups rules by ruletype,
|
||||
# the ruletype always matches.
|
||||
return self.source == other.source and self.target == other.target
|
||||
|
||||
|
||||
class RoleTransitionWrapper(Wrapper):
|
||||
|
||||
"""Wrap role_transition rules to allow set operations."""
|
||||
|
||||
def __init__(self, rule):
|
||||
self.origin = rule
|
||||
self.ruletype = rule.ruletype
|
||||
self.source = SymbolWrapper(rule.source)
|
||||
self.target = SymbolWrapper(rule.target)
|
||||
self.tclass = SymbolWrapper(rule.tclass)
|
||||
self.key = hash(rule)
|
||||
|
||||
def __hash__(self):
|
||||
return self.key
|
||||
|
||||
def __lt__(self, other):
|
||||
return self.key < other.key
|
||||
|
||||
def __eq__(self, other):
|
||||
# because RBACRuleDifference groups rules by ruletype,
|
||||
# the ruletype always matches.
|
||||
return self.source == other.source and \
|
||||
self.target == other.target and \
|
||||
self.tclass == other.tclass
|
||||
@ -778,6 +778,81 @@ class PolicyDifferenceTest(ValidateRule, unittest.TestCase):
|
||||
self.assertEqual("s0:c0,c4 - s1:c0.c2,c4", added_default)
|
||||
self.assertEqual("s2:c0 - s3:c0.c2", removed_default)
|
||||
|
||||
#
|
||||
# Role allow rules
|
||||
#
|
||||
def test_added_role_allow_rules(self):
|
||||
"""Diff: added role_allow rules."""
|
||||
rules = sorted(self.diff.added_role_allows)
|
||||
self.assertEqual(2, len(rules))
|
||||
|
||||
# added rule with existing roles
|
||||
self.assertEqual("allow", rules[0].ruletype)
|
||||
self.assertEqual("added_role", rules[0].source)
|
||||
self.assertEqual("system", rules[0].target)
|
||||
|
||||
# added rule with new roles
|
||||
self.assertEqual("allow", rules[1].ruletype)
|
||||
self.assertEqual("added_rule_source_r", rules[1].source)
|
||||
self.assertEqual("added_rule_target_r", rules[1].target)
|
||||
|
||||
def test_removed_role_allow_rules(self):
|
||||
"""Diff: removed role_allow rules."""
|
||||
rules = sorted(self.diff.removed_role_allows)
|
||||
self.assertEqual(2, len(rules))
|
||||
|
||||
# removed rule with removed role
|
||||
self.assertEqual("allow", rules[0].ruletype)
|
||||
self.assertEqual("removed_role", rules[0].source)
|
||||
self.assertEqual("system", rules[0].target)
|
||||
|
||||
# removed rule with existing roles
|
||||
self.assertEqual("allow", rules[1].ruletype)
|
||||
self.assertEqual("removed_rule_source_r", rules[1].source)
|
||||
self.assertEqual("removed_rule_target_r", rules[1].target)
|
||||
|
||||
#
|
||||
# Role_transition rules
|
||||
#
|
||||
def test_added_role_transition_rules(self):
|
||||
"""Diff: added role_transition rules."""
|
||||
rules = sorted(self.diff.added_role_transitions)
|
||||
self.assertEqual(2, len(rules))
|
||||
|
||||
# added rule with new role
|
||||
self.validate_rule(rules[0], "role_transition", "added_role", "system", "infoflow4",
|
||||
"system")
|
||||
|
||||
# added rule with existing roles
|
||||
self.validate_rule(rules[1], "role_transition", "role_tr_added_rule_source",
|
||||
"role_tr_added_rule_target", "infoflow6", "system")
|
||||
|
||||
def test_removed_role_transition_rules(self):
|
||||
"""Diff: removed role_transition rules."""
|
||||
rules = sorted(self.diff.removed_role_transitions)
|
||||
self.assertEqual(2, len(rules))
|
||||
|
||||
# removed rule with new role
|
||||
self.validate_rule(rules[0], "role_transition", "removed_role", "system", "infoflow4",
|
||||
"system")
|
||||
|
||||
# removed rule with existing roles
|
||||
self.validate_rule(rules[1], "role_transition", "role_tr_removed_rule_source",
|
||||
"role_tr_removed_rule_target", "infoflow5", "system")
|
||||
|
||||
def test_modified_role_transition_rules(self):
|
||||
"""Diff: modified role_transition rules."""
|
||||
l = sorted(self.diff.modified_role_transitions)
|
||||
self.assertEqual(1, len(l))
|
||||
|
||||
rule, added_default, removed_default = l[0]
|
||||
self.assertEqual("role_transition", rule.ruletype)
|
||||
self.assertEqual("role_tr_matched_source", rule.source)
|
||||
self.assertEqual("role_tr_matched_target", rule.target)
|
||||
self.assertEqual("infoflow3", rule.tclass)
|
||||
self.assertEqual("role_tr_new_role", added_default)
|
||||
self.assertEqual("role_tr_old_role", removed_default)
|
||||
|
||||
|
||||
class PolicyDifferenceTestNoDiff(unittest.TestCase):
|
||||
|
||||
@ -930,3 +1005,27 @@ class PolicyDifferenceTestNoDiff(unittest.TestCase):
|
||||
def test_modified_range_transitions(self):
|
||||
"""NoDiff: no modified range_transition rules."""
|
||||
self.assertFalse(self.diff.modified_range_transitions)
|
||||
|
||||
def test_added_role_allows(self):
|
||||
"""NoDiff: no added role_allow rules."""
|
||||
self.assertFalse(self.diff.added_role_allows)
|
||||
|
||||
def test_removed_role_allows(self):
|
||||
"""NoDiff: no removed role_allow rules."""
|
||||
self.assertFalse(self.diff.removed_role_allows)
|
||||
|
||||
def test_modified_role_allows(self):
|
||||
"""NoDiff: no modified role_allow rules."""
|
||||
self.assertFalse(self.diff.modified_role_allows)
|
||||
|
||||
def test_added_role_transitions(self):
|
||||
"""NoDiff: no added role_transition rules."""
|
||||
self.assertFalse(self.diff.added_role_transitions)
|
||||
|
||||
def test_removed_role_transitions(self):
|
||||
"""NoDiff: no removed role_transition rules."""
|
||||
self.assertFalse(self.diff.removed_role_transitions)
|
||||
|
||||
def test_modified_role_transitions(self):
|
||||
"""NoDiff: no modified role_transition rules."""
|
||||
self.assertFalse(self.diff.modified_role_transitions)
|
||||
|
||||
@ -551,6 +551,38 @@ type rt_unioned_perm_via_attr_B_t, rt_unioned_perm_via_attr;
|
||||
range_transition rt_unioned_perm_via_attr system:infoflow2 s0;
|
||||
range_transition rt_unioned_perm_via_attr_A_t system:infoflow2 s0;
|
||||
|
||||
# role allow
|
||||
role matched_source_r;
|
||||
role matched_target_r;
|
||||
allow matched_source_r matched_target_r;
|
||||
|
||||
role removed_rule_source_r;
|
||||
role removed_rule_target_r;
|
||||
allow removed_rule_source_r removed_rule_target_r;
|
||||
|
||||
role added_rule_source_r;
|
||||
role added_rule_target_r;
|
||||
|
||||
allow removed_role system;
|
||||
|
||||
# role_transition
|
||||
role role_tr_matched_source;
|
||||
type role_tr_matched_target;
|
||||
role_transition role_tr_matched_source role_tr_matched_target:infoflow system;
|
||||
|
||||
role role_tr_removed_rule_source;
|
||||
type role_tr_removed_rule_target;
|
||||
role_transition role_tr_removed_rule_source role_tr_removed_rule_target:infoflow5 system;
|
||||
|
||||
role role_tr_added_rule_source;
|
||||
type role_tr_added_rule_target;
|
||||
|
||||
role_transition removed_role system:infoflow4 system;
|
||||
|
||||
role role_tr_old_role;
|
||||
role role_tr_new_role;
|
||||
role_transition role_tr_matched_source role_tr_matched_target:infoflow3 role_tr_old_role;
|
||||
|
||||
################################################################################
|
||||
|
||||
#users
|
||||
|
||||
@ -552,6 +552,38 @@ type rt_unioned_perm_via_attr_B_t, rt_unioned_perm_via_attr;
|
||||
range_transition rt_unioned_perm_via_attr system:infoflow2 s0;
|
||||
range_transition rt_unioned_perm_via_attr_B_t system:infoflow2 s0;
|
||||
|
||||
# role allow
|
||||
role matched_source_r;
|
||||
role matched_target_r;
|
||||
allow matched_source_r matched_target_r;
|
||||
|
||||
role removed_rule_source_r;
|
||||
role removed_rule_target_r;
|
||||
|
||||
role added_rule_source_r;
|
||||
role added_rule_target_r;
|
||||
allow added_rule_source_r added_rule_target_r;
|
||||
|
||||
allow added_role system;
|
||||
|
||||
# role_transition
|
||||
role role_tr_matched_source;
|
||||
type role_tr_matched_target;
|
||||
role_transition role_tr_matched_source role_tr_matched_target:infoflow system;
|
||||
|
||||
role role_tr_removed_rule_source;
|
||||
type role_tr_removed_rule_target;
|
||||
|
||||
role role_tr_added_rule_source;
|
||||
type role_tr_added_rule_target;
|
||||
role_transition role_tr_added_rule_source role_tr_added_rule_target:infoflow6 system;
|
||||
|
||||
role_transition added_role system:infoflow4 system;
|
||||
|
||||
role role_tr_old_role;
|
||||
role role_tr_new_role;
|
||||
role_transition role_tr_matched_source role_tr_matched_target:infoflow3 role_tr_new_role;
|
||||
|
||||
################################################################################
|
||||
|
||||
#users
|
||||
|
||||
Loading…
Reference in New Issue
Block a user