valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #38236 from gtmanfred/2016.11

Browse Source 
SELINUXTYPE should not be changed
This commit is contained in:
Mike Place 2016-12-15 03:37:06 -07:00 committed by GitHub
commit 6c1ca9dae7
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/selinux.py
View File

@ -134,7 +134,7 @@ def setenforce(mode):
conf = _cf.read() conf = _cf.read()
try: try:
with salt.utils.fopen(config, 'w') as _cf: with salt.utils.fopen(config, 'w') as _cf:
conf = re.sub(r"\nSELINUX.*\n", "\nSELINUX=" + modestring + "\n", conf) conf = re.sub(r"\nSELINUX=.*\n", "\nSELINUX=" + modestring + "\n", conf)
_cf.write(conf) _cf.write(conf)
except (IOError, OSError) as exc: except (IOError, OSError) as exc:
msg = 'Could not write SELinux config file: {0}' msg = 'Could not write SELinux config file: {0}'

6
salt/states/selinux.py
View File

@ -104,12 +104,16 @@ def mode(name):
ret['comment'] = 'SELinux mode is set to be changed to {0}'.format( ret['comment'] = 'SELinux mode is set to be changed to {0}'.format(
tmode) tmode)
ret['result'] = None ret['result'] = None
ret['changes'] = {'old': mode,
'new': tmode}
return ret return ret
mode = __salt__['selinux.setenforce'](tmode) oldmode, mode = mode, __salt__['selinux.setenforce'](tmode)
if mode == tmode: if mode == tmode:
ret['result'] = True ret['result'] = True
ret['comment'] = 'SELinux has been set to {0} mode'.format(tmode) ret['comment'] = 'SELinux has been set to {0} mode'.format(tmode)
ret['changes'] = {'old': oldmode,
'new': mode}
return ret return ret
ret['comment'] = 'Failed to set SELinux to {0} mode'.format(tmode) ret['comment'] = 'Failed to set SELinux to {0} mode'.format(tmode)
return ret return ret

19
tests/unit/states/selinux_test.py
View File

@ -37,13 +37,10 @@ class SelinuxTestCase(TestCase):
Test to verifies the mode SELinux is running in, Test to verifies the mode SELinux is running in,
can be set to enforcing or permissive. can be set to enforcing or permissive.
''' '''
ret = {'name': '', ret = {'name': 'unknown',
'changes': {}, 'changes': {},
'result': False, 'result': False,
'comment': ''} 'comment': 'unknown is not an accepted mode'}
comt = ('unknown is not an accepted mode')
ret.update({'name': 'unknown', 'comment': comt})
self.assertDictEqual(selinux.mode('unknown'), ret) self.assertDictEqual(selinux.mode('unknown'), ret)
mock_en = MagicMock(return_value='Enforcing') mock_en = MagicMock(return_value='Enforcing')
@ -52,24 +49,24 @@ class SelinuxTestCase(TestCase):
{'selinux.getenforce': mock_en, {'selinux.getenforce': mock_en,
'selinux.setenforce': mock_pr}): 'selinux.setenforce': mock_pr}):
comt = ('SELinux is already in Enforcing mode') comt = ('SELinux is already in Enforcing mode')
ret.update({'name': 'Enforcing', 'comment': comt, 'result': True}) ret = {'name': 'Enforcing', 'comment': comt, 'result': True, 'changes': {}}
self.assertDictEqual(selinux.mode('Enforcing'), ret) self.assertDictEqual(selinux.mode('Enforcing'), ret)
with patch.dict(selinux.__opts__, {'test': True}): with patch.dict(selinux.__opts__, {'test': True}):
comt = ('SELinux mode is set to be changed to Permissive') comt = ('SELinux mode is set to be changed to Permissive')
ret.update({'name': 'Permissive', 'comment': comt, ret = {'name': 'Permissive', 'comment': comt,
'result': None}) 'result': None, 'changes': {'new': 'Permissive', 'old': 'Enforcing'}}
self.assertDictEqual(selinux.mode('Permissive'), ret) self.assertDictEqual(selinux.mode('Permissive'), ret)
with patch.dict(selinux.__opts__, {'test': False}): with patch.dict(selinux.__opts__, {'test': False}):
comt = ('SELinux has been set to Permissive mode') comt = ('SELinux has been set to Permissive mode')
ret.update({'name': 'Permissive', 'comment': comt, ret = {'name': 'Permissive', 'comment': comt,
'result': True}) 'result': True, 'changes': {'new': 'Permissive', 'old': 'Enforcing'}}
self.assertDictEqual(selinux.mode('Permissive'), ret) self.assertDictEqual(selinux.mode('Permissive'), ret)
comt = ('Failed to set SELinux to Permissive mode') comt = ('Failed to set SELinux to Permissive mode')
ret.update({'name': 'Permissive', 'comment': comt, ret.update({'name': 'Permissive', 'comment': comt,
'result': False}) 'result': False, 'changes': {}})
self.assertDictEqual(selinux.mode('Permissive'), ret) self.assertDictEqual(selinux.mode('Permissive'), ret)
# 'boolean' function tests: 1 # 'boolean' function tests: 1