Compare commits

..

No commits in common. "rawhide" and "f27" have entirely different histories.

2 changed files with 4 additions and 201 deletions

View file

@ -1,91 +0,0 @@
From 66afa88fd1411ca3999ecca5cf0798fdc2f65813 Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
Date: Wed, 24 Jun 2020 17:49:14 +0200
Subject: [PATCH] Update to work with setools 4.3
* TERules cannot be altered from the outside any more
** Use derive_expanded to perform partial expansion
** Full expansion is now available via TERule.expand()
* "exception" module was moved from policyrep
* "typeattr" module was merged into policyrep
---
sepolicyanalysis/policy_data_collection.py | 34 ++++------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/sepolicyanalysis/policy_data_collection.py b/sepolicyanalysis/policy_data_collection.py
index 4bf45ce..3e3b9ea 100644
--- a/sepolicyanalysis/policy_data_collection.py
+++ b/sepolicyanalysis/policy_data_collection.py
@@ -51,32 +51,10 @@ def half_expand_rule(rule, expand_source):
expansion = rule.source.expand() if expand_source else rule.target.expand()
if expand_source:
for t in expansion:
- results.append(setools.policyrep.terule.expanded_te_rule_factory(rule, t, rule.target))
+ results.append(rule.derive_expanded(t, rule.target, rule.perms))
else:
for t in expansion:
- results.append(setools.policyrep.terule.expanded_te_rule_factory(rule, rule.source, t))
- return results
-
-# return set of rules where attributes were replaced by all types with given attribute
-def expand_rule(rule):
- results = []
-
- source_exp = rule.source.expand() if is_attribute(rule.source) else [rule.source]
- target_exp = rule.target.expand() if is_attribute(rule.target) else [rule.target]
-
- for source in source_exp:
- for target in target_exp:
- if isinstance(rule, setools.policyrep.terule.ExpandedTERule):
- #expanded_te_rule_factory ignores ExpandedTERules (doesn't set new source/target)
- newrule = setools.policyrep.terule.ExpandedTERule(rule.policy, rule.qpol_symbol)
- newrule.source = source
- newrule.target = target
- nwerule.origin = rule.origin
-
- else:
- newrule = setools.policyrep.terule.expanded_te_rule_factory(rule, source, target)
- results.append(newrule)
-
+ results.append(rule.derive_expanded(rule.source, t, rule.perms))
return results
# expand all rules in given iterable
@@ -90,7 +68,7 @@ def expand_rules(rules):
# discard rules corresponding to unconfined attributes
# TODO: add command line argument that switches this off - i.e. consider unconfined attributes
if (not is_unconfined_attr(rule.source)) and (not is_unconfined_attr(rule.target)):
- results.extend(expand_rule(rule))
+ results.extend(rule.expand())
return results
@@ -223,7 +201,7 @@ def filter_terules_boolean(rules, bool_state = None):
# return rules in agreement with boolean settings
results.append(rule)
- except setools.policyrep.exception.RuleNotConditional:
+ except setools.exception.RuleNotConditional:
# return all unconditional rules
results.append(rule)
@@ -256,12 +234,12 @@ def is_conditional(rule):
boolean = str(rule.conditional)
return boolean
- except setools.policyrep.exception.RuleNotConditional:
+ except setools.exception.RuleNotConditional:
False
# is given object of type "TypeAttribute" ?
def is_attribute(obj):
- return isinstance(obj, setools.policyrep.typeattr.TypeAttribute)
+ return isinstance(obj, setools.policyrep.TypeAttribute)
# is given object of type "TypeAttribute" which is considered unconfined ?
# TODO: refine -- limit to "strong" unconfined domains (associated with lots of privileges)
--
2.25.4

View file

@ -1,23 +1,18 @@
Name: sepolicy_analysis
Version: 0.1
Release: 35%{?dist}
Release: 2%{?dist}
Summary: SELinux policy analysis tool
# Automatically converted from old format: GPLv3 - review is highly recommended.
License: GPL-3.0-only
License: GPLv3
URL: https://github.com/vmojzis/sepolicy_analysis
#./setup.py egg_info --egg-base /tmp sdist
Source0: https://github.com/vmojzis/sepolicy_analysis/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-Update-to-work-with-setools-4.3.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
Requires: python3-setools >= 4.0
Requires: python3-networkx >= 1.11
Requires: python3-matplotlib
Requires: setools-python3 >= 4.0
%description
Tool designed to help increase the quality of SELinux policy by identifying
@ -25,7 +20,7 @@ possibly dangerous permission pathways, simplifying regression testing and
providing policy visualization.
%prep
%autosetup -p 1
%autosetup
%build
%py3_build
@ -53,107 +48,6 @@ providing policy visualization.
%doc %{_mandir}/man1/se*
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 0.1-34
- Rebuilt for Python 3.15
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.1-32
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.1-31
- Rebuilt for Python 3.14.0rc2 bytecode
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 0.1-29
- Rebuilt for Python 3.14
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.1-27
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.1-25
- Rebuilt for Python 3.13
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.1-22
- Rebuilt for Python 3.12
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.1-19
- Rebuilt for Python 3.11
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.1-16
- Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 24 2020 Vit Mojzis <vmojzis@redhat.com> - 0.1-13
- Update to work with setools-4.3
- Add missing dependency on python3-matplotlib
* Thu Jun 04 2020 Vit Mojzis <vmojzis@redhat.com> - 0.1-12
- Add dependency on python3-networkx
- Fix setools dependency (setools-python3 got renamed to python3-setools)
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.1-11
- Rebuilt for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.1-9
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.1-8
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.1-4
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild