Imported Debian patch 4.7.2-3
This commit is contained in:
committed by
Mario Fetka
parent
27edeba051
commit
8bc559c5a1
@@ -21,8 +21,6 @@ Test the `ipaserver/plugins/selinuxusermap.py` module.
|
||||
"""
|
||||
|
||||
from ipalib import api, errors
|
||||
from ipaplatform.constants import constants as platformconstants
|
||||
|
||||
from ipatests.test_xmlrpc import objectclasses
|
||||
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
|
||||
fuzzy_uuid)
|
||||
@@ -32,16 +30,8 @@ from ipatests.test_xmlrpc.test_user_plugin import get_user_result
|
||||
import pytest
|
||||
|
||||
rule1 = u'selinuxrule1'
|
||||
selinuxuser1 = platformconstants.SELINUX_USERMAP_ORDER.split("$")[0]
|
||||
selinuxuser2 = platformconstants.SELINUX_USERMAP_ORDER.split("$")[1]
|
||||
|
||||
INVALID_MCS = "Invalid MCS value, must match {}, where max category {}".format(
|
||||
platformconstants.SELINUX_MCS_REGEX,
|
||||
platformconstants.SELINUX_MCS_MAX)
|
||||
|
||||
INVALID_MLS = "Invalid MLS value, must match {}, where max level {}".format(
|
||||
platformconstants.SELINUX_MLS_REGEX,
|
||||
platformconstants.SELINUX_MLS_MAX)
|
||||
selinuxuser1 = u'guest_u:s0'
|
||||
selinuxuser2 = u'xguest_u:s0'
|
||||
|
||||
user1 = u'tuser1'
|
||||
group1 = u'testgroup1'
|
||||
@@ -251,7 +241,6 @@ class test_selinuxusermap(Declarative):
|
||||
group=tuple(),
|
||||
user=tuple(),
|
||||
service=tuple(),
|
||||
idoverrideuser=tuple(),
|
||||
),
|
||||
),
|
||||
result={
|
||||
@@ -634,46 +623,44 @@ class test_selinuxusermap(Declarative):
|
||||
),
|
||||
expected=errors.ValidationError(
|
||||
name='selinuxuser',
|
||||
error=u'Invalid SELinux user name, must match {}'.format(
|
||||
platformconstants.SELINUX_USER_REGEX)
|
||||
error=u'Invalid SELinux user name, only a-Z, _ '
|
||||
'and . are allowed'
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
dict(
|
||||
desc='Create rule with invalid MLS foo:s{}'.format(
|
||||
platformconstants.SELINUX_MLS_MAX + 1),
|
||||
desc='Create rule with invalid MCS xguest_u:s999',
|
||||
command=(
|
||||
'selinuxusermap_add', [rule1],
|
||||
dict(ipaselinuxuser=u'foo:s{}'.format(
|
||||
platformconstants.SELINUX_MLS_MAX + 1))
|
||||
dict(ipaselinuxuser=u'xguest_u:s999')
|
||||
),
|
||||
expected=errors.ValidationError(name='selinuxuser',
|
||||
error=INVALID_MLS),
|
||||
error=u'Invalid MLS value, must match s[0-15](-s[0-15])'),
|
||||
),
|
||||
|
||||
|
||||
dict(
|
||||
desc='Create rule with invalid MCS foo:s0:p88',
|
||||
desc='Create rule with invalid MLS xguest_u:s0:p88',
|
||||
command=(
|
||||
'selinuxusermap_add', [rule1],
|
||||
dict(ipaselinuxuser=u'foo:s0:p88')
|
||||
dict(ipaselinuxuser=u'xguest_u:s0:p88')
|
||||
),
|
||||
expected=errors.ValidationError(name='selinuxuser',
|
||||
error=INVALID_MCS),
|
||||
error=u'Invalid MCS value, must match c[0-1023].c[0-1023] ' +
|
||||
u'and/or c[0-1023]-c[0-c0123]'),
|
||||
),
|
||||
|
||||
|
||||
dict(
|
||||
desc='Create rule with invalid MCS foo:s0:c0.c{}'.format(
|
||||
platformconstants.SELINUX_MCS_MAX + 1),
|
||||
desc='Create rule with invalid MLS xguest_u:s0:c0.c1028',
|
||||
command=(
|
||||
'selinuxusermap_add', [rule1],
|
||||
dict(ipaselinuxuser=u'foo:s0-s0:c0.c{}'.format(
|
||||
platformconstants.SELINUX_MCS_MAX + 1))
|
||||
dict(ipaselinuxuser=u'xguest_u:s0-s0:c0.c1028')
|
||||
),
|
||||
expected=errors.ValidationError(name='selinuxuser',
|
||||
error=INVALID_MCS),
|
||||
error=u'Invalid MCS value, must match c[0-1023].c[0-1023] ' +
|
||||
u'and/or c[0-1023]-c[0-c0123]'),
|
||||
),
|
||||
|
||||
|
||||
@@ -684,7 +671,7 @@ class test_selinuxusermap(Declarative):
|
||||
dict(setattr=u'ipaselinuxuser=deny')
|
||||
),
|
||||
expected=errors.ValidationError(name='ipaselinuxuser',
|
||||
error=INVALID_MLS),
|
||||
error=u'Invalid MLS value, must match s[0-15](-s[0-15])'),
|
||||
),
|
||||
|
||||
dict(
|
||||
|
||||
Reference in New Issue
Block a user