RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-01-30 19:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ConfigSetDescriptor: Fix parsing of multiline values.

Browse Source 
The parsing did not correctly handle newline and tab characters.

Add a multiline value in the sechecker test config file to make sure this
case is tested.

Signed-off-by: Chris PeBenito <pebenito@ieee.org>
This commit is contained in:
Chris PeBenito 2021-04-15 16:36:29 -04:00
parent a7fd01467a
commit 35465fe21d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,3 +1,5 @@
* Fix bug in sechecker parsing of multiline values.
*setools-4.4.0 (5 Mar 2021) *setools-4.4.0 (5 Mar 2021)
* Updated policy representation to handle policydb version 33, compressed * Updated policy representation to handle policydb version 33, compressed

3
setools/checker/descriptors.py
View File

@ -16,6 +16,7 @@
# License along with SETools. If not, see # License along with SETools. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
# #
import re
from typing import Callable, Union from typing import Callable, Union
from ..exception import InvalidCheckValue from ..exception import InvalidCheckValue
@ -90,7 +91,7 @@ class ConfigSetDescriptor(CriteriaDescriptor):
else: else:
lookup = getattr(obj.policy, self.lookup_function) lookup = getattr(obj.policy, self.lookup_function)
ret = set() ret = set()
for item in (i for i in value.split(" ") if i): for item in (i for i in re.split(r"\s", value) if i):
try: try:
o = lookup(item) o = lookup(item)
if self.expand: if self.expand:

3
tests/checker/checker-valid.ini
View File

@ -7,7 +7,8 @@ attr = empty_source_attr
desc = read only executables test desc = read only executables test
check_type = ro_execs check_type = ro_execs
exempt_exec_domain = unconfined exempt_exec_domain = unconfined
exempt_write_domain = domain1 domain2 unconfined exempt_write_domain = domain1
domain2 unconfined
[assertte] [assertte]
check_type = assert_te check_type = assert_te