IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Validate default user in ordered list when using setattr, require MLS

Browse Source 
The MLS was optional in the format, it should be required.

https://fedorahosted.org/freeipa/ticket/2984
This commit is contained in:
Rob Crittenden
2012-08-15 17:21:19 -04:00
committed by Martin Kosek
parent bb5788fc7e
commit b5d0a9fcb2
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ipalib/plugins/selinuxusermap.py
View File

@@ -72,10 +72,13 @@ notboth_err = _('HBAC rule and local members cannot both be set')
def validate_selinuxuser(ugettext, user): def validate_selinuxuser(ugettext, user):
""" """
An SELinux user has 3 components: user:MLS:MCS An SELinux user has 3 components: user:MLS:MCS. user and MLS are required.
user traditionally ends with _u but this is not mandatory. Regex is ^[a-zA-Z][a-zA-Z_]* user traditionally ends with _u but this is not mandatory.
The MLS part can only be The regex is ^[a-zA-Z][a-zA-Z_]*
The MLS part can only be:
Level: s[0-15](-s[0-15]) Level: s[0-15](-s[0-15])
Then MCS could be c[0-1023].c[0-1023] and/or c[0-1023]-c[0-c0123] Then MCS could be c[0-1023].c[0-1023] and/or c[0-1023]-c[0-c0123]
Meaning Meaning
s0 s0-s1 s0-s15:c0.c1023 s0-s1:c0,c2,c15.c26 s0-s0:c0.c1023 s0 s0-s1 s0-s15:c0.c1023 s0-s1:c0,c2,c15.c26 s0-s0:c0.c1023
@@ -92,7 +95,7 @@ def validate_selinuxuser(ugettext, user):
if not regex_name.match(name): if not regex_name.match(name):
return _('Invalid SELinux user name, only a-Z and _ are allowed') return _('Invalid SELinux user name, only a-Z and _ are allowed')
if mls and not regex_mls.match(mls): if not mls or not regex_mls.match(mls):
return _('Invalid MLS value, must match s[0-15](-s[0-15])') return _('Invalid MLS value, must match s[0-15](-s[0-15])')
if mcs and not regex_mcs.match(mcs): if mcs and not regex_mcs.match(mcs):
return _('Invalid MCS value, must match c[0-1023].c[0-1023] and/or c[0-1023]-c[0-c0123]') return _('Invalid MCS value, must match c[0-1023].c[0-1023] and/or c[0-1023]-c[0-c0123]')
@@ -283,11 +286,11 @@ class selinuxusermap_mod(LDAPUpdate):
if is_all(options, 'hostcategory') and 'memberhost' in entry_attrs: if is_all(options, 'hostcategory') and 'memberhost' in entry_attrs:
raise errors.MutuallyExclusiveError(reason="host category cannot be set to 'all' while there are allowed hosts") raise errors.MutuallyExclusiveError(reason="host category cannot be set to 'all' while there are allowed hosts")
if 'ipaselinuxuser' in options: if 'ipaselinuxuser' in entry_attrs:
validate_selinuxuser_inlist(ldap, options['ipaselinuxuser']) validate_selinuxuser_inlist(ldap, entry_attrs['ipaselinuxuser'])
if 'seealso' in options: if 'seealso' in entry_attrs:
entry_attrs['seealso'] = self.obj._normalize_seealso(options['seealso']) entry_attrs['seealso'] = self.obj._normalize_seealso(entry_attrs['seealso'])
return dn return dn
def post_callback(self, ldap, dn, entry_attrs, *keys, **options): def post_callback(self, ldap, dn, entry_attrs, *keys, **options):

14
tests/test_xmlrpc/test_selinuxusermap_plugin.py
View File

@@ -605,9 +605,9 @@ class test_selinuxusermap(Declarative):
dict( dict(
desc='Create rule with unknown user %r' % rule1, desc='Create rule with unknown user %r' % rule1,
command=( command=(
'selinuxusermap_add', [rule1], dict(ipaselinuxuser=u'notfound') 'selinuxusermap_add', [rule1], dict(ipaselinuxuser=u'notfound:s0:c0')
), ),
expected=errors.NotFound(reason=u'SELinux user notfound not ' + expected=errors.NotFound(reason=u'SELinux user notfound:s0:c0 not ' +
u'found in ordering list (in config)'), u'found in ordering list (in config)'),
), ),
@@ -642,4 +642,14 @@ class test_selinuxusermap(Declarative):
u'and/or c[0-1023]-c[0-c0123]'), u'and/or c[0-1023]-c[0-c0123]'),
), ),
dict(
desc='Create rule with invalid user via setattr',
command=(
'selinuxusermap_mod', [rule1], dict(setattr=u'ipaselinuxuser=deny')
),
expected=errors.ValidationError(name='ipaselinuxuser',
error=u'Invalid MLS value, must match s[0-15](-s[0-15])'),
),
] ]