Skip to content

Commit

Permalink
chroot: add new chroot module
Browse files Browse the repository at this point in the history
  • Loading branch information
aplanas committed Nov 15, 2018
1 parent 065e33a commit 984fb62
Show file tree
Hide file tree
Showing 2 changed files with 349 additions and 0 deletions.
165 changes: 165 additions & 0 deletions salt/modules/chroot.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
# -*- coding: utf-8 -*-
#
# Author: Alberto Planas <[email protected]>
#
# Copyright 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

'''
:maintainer: Alberto Planas <[email protected]>
:maturity: new
:depends: None
:platform: Linux
'''
from __future__ import absolute_import, print_function, unicode_literals
import logging
import os
import sys
import tempfile

from salt.defaults.exitcodes import EX_OK
from salt.exceptions import CommandExecutionError
from salt.utils.args import clean_kwargs

log = logging.getLogger(__name__)


def __virtual__():
'''
Chroot command is required.
'''
if __utils__['path.which']('chroot') is not None:
return True
else:
return (False, 'Module chroot requires the command chroot')


def exist(name):
'''
Return True if the chroot environment is present.
'''
dev = os.path.join(name, 'dev')
proc = os.path.join(name, 'proc')
return all(os.path.isdir(i) for i in (name, dev, proc))


def create(name):
'''
Create a basic chroot environment.
Note that this environment is not functional. The caller needs to
install the minimal required binaries, including Python if
chroot.call is called.
name
Path to the chroot environment
CLI Example:
.. code-block:: bash
salt myminion chroot.create /chroot
'''
if not exist(name):
dev = os.path.join(name, 'dev')
proc = os.path.join(name, 'proc')
try:
os.makedirs(dev, mode=0o755)
os.makedirs(proc, mode=0o555)
except OSError as e:
log.error('Error when trying to create chroot directories: %s', e)
return False
return True


def call(name, function, *args, **kwargs):
'''
Executes a Salt function inside a chroot environment.
The chroot does not need to have Salt installed, but Python is
required.
name
Path to the chroot environment
function
Salt execution module function
CLI Example:
.. code-block:: bash
salt myminion chroot.call /chroot test.ping
'''

if not function:
raise CommandExecutionError('Missing function parameter')

if not exist(name):
raise CommandExecutionError('Chroot environment not found')

# Create a temporary directory inside the chroot where we can
# untar salt-thin
thin_dest_path = tempfile.mkdtemp(dir=name)
thin_path = __utils__['thin.gen_thin'](
__opts__['cachedir'],
extra_mods=__salt__['config.option']('thin_extra_mods', ''),
so_mods=__salt__['config.option']('thin_so_mods', '')
)
stdout = __salt__['archive.tar']('xzf', thin_path, dest=thin_dest_path)
if stdout:
__utils__['files.rm_rf'](thin_dest_path)
return {'result': False, 'comment': stdout}

chroot_path = os.path.join(os.path.sep,
os.path.relpath(thin_dest_path, name))
try:
safe_kwargs = clean_kwargs(**kwargs)
salt_argv = [
'python{}'.format(sys.version_info[0]),
os.path.join(chroot_path, 'salt-call'),
'--metadata',
'--local',
'--log-file', os.path.join(chroot_path, 'log'),
'--cachedir', os.path.join(chroot_path, 'cache'),
'--out', 'json',
'-l', 'quiet',
'--',
function
] + list(args) + ['{}={}'.format(k, v) for (k, v) in safe_kwargs]
ret = __salt__['cmd.run_chroot'](name, [str(x) for x in salt_argv])
if ret['retcode'] != EX_OK:
raise CommandExecutionError(ret['stderr'])

# Process "real" result in stdout
try:
data = __utils__['json.find_json'](ret['stdout'])
local = data.get('local', data)
if isinstance(local, dict) and 'retcode' in local:
__context__['retcode'] = local['retcode']
return local.get('return', data)
except ValueError:
return {
'result': False,
'comment': "Can't parse container command output"
}
finally:
__utils__['files.rm_rf'](thin_dest_path)
184 changes: 184 additions & 0 deletions tests/unit/modules/test_chroot.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
# -*- coding: utf-8 -*-
#
# Author: Alberto Planas <[email protected]>
#
# Copyright 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

'''
:maintainer: Alberto Planas <[email protected]>
:platform: Linux
'''

# Import Python Libs
from __future__ import absolute_import, print_function, unicode_literals

# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch,
)

from salt.exceptions import CommandExecutionError
import salt.modules.chroot as chroot


@skipIf(NO_MOCK, NO_MOCK_REASON)
class ChrootTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.chroot
'''

def setup_loader_modules(self):
return {
chroot: {
'__salt__': {},
'__utils__': {},
'__opts__': {'cachedir': ''},
}
}

@patch('os.path.isdir')
def test_exist(self, isdir):
'''
Test if the chroot environment exist.
'''
isdir.side_effect = (True, True, True)
self.assertTrue(chroot.exist('/chroot'))

isdir.side_effect = (True, True, False)
self.assertFalse(chroot.exist('/chroot'))

@patch('os.makedirs')
@patch('salt.modules.chroot.exist')
def test_create(self, exist, makedirs):
'''
Test the creation of an empty chroot environment.
'''
exist.return_value = True
self.assertTrue(chroot.create('/chroot'))
makedirs.assert_not_called()

exist.return_value = False
self.assertTrue(chroot.create('/chroot'))
makedirs.assert_called()

@patch('salt.modules.chroot.exist')
def test_call_fails_input_validation(self, exist):
'''
Test execution of Salt functions in chroot.
'''
# Basic input validation
exist.return_value = False
self.assertRaises(CommandExecutionError, chroot.call, '/chroot', '')
self.assertRaises(CommandExecutionError, chroot.call, '/chroot', 'test.ping')

@patch('salt.modules.chroot.exist')
@patch('tempfile.mkdtemp')
def test_call_fails_untar(self, mkdtemp, exist):
'''
Test execution of Salt functions in chroot.
'''
# Fail the tar command
exist.return_value = True
mkdtemp.return_value = '/chroot/tmp01'
utils_mock = {
'thin.gen_thin': MagicMock(return_value='/salt-thin.tgz'),
'files.rm_rf': MagicMock(),
}
salt_mock = {
'archive.tar': MagicMock(return_value='Error'),
'config.option': MagicMock(),
}
with patch.dict(chroot.__utils__, utils_mock), \
patch.dict(chroot.__salt__, salt_mock):
self.assertEqual(chroot.call('/chroot', 'test.ping'), {
'result': False,
'comment': 'Error'
})
utils_mock['thin.gen_thin'].assert_called_once()
salt_mock['config.option'].assert_called()
salt_mock['archive.tar'].assert_called_once()
utils_mock['files.rm_rf'].assert_called_once()

@patch('salt.modules.chroot.exist')
@patch('tempfile.mkdtemp')
def test_call_fails_salt_thin(self, mkdtemp, exist):
'''
Test execution of Salt functions in chroot.
'''
# Fail the inner command
exist.return_value = True
mkdtemp.return_value = '/chroot/tmp01'
utils_mock = {
'thin.gen_thin': MagicMock(return_value='/salt-thin.tgz'),
'files.rm_rf': MagicMock(),
}
salt_mock = {
'archive.tar': MagicMock(return_value=''),
'config.option': MagicMock(),
'cmd.run_chroot': MagicMock(return_value={
'retcode': 1,
'stderr': 'Error',
}),
}
with patch.dict(chroot.__utils__, utils_mock), \
patch.dict(chroot.__salt__, salt_mock):
self.assertRaises(CommandExecutionError, chroot.call, '/chroot',
'test.ping')
utils_mock['thin.gen_thin'].assert_called_once()
salt_mock['config.option'].assert_called()
salt_mock['archive.tar'].assert_called_once()
salt_mock['cmd.run_chroot'].assert_called_once()
utils_mock['files.rm_rf'].assert_called_once()

@patch('salt.modules.chroot.exist')
@patch('tempfile.mkdtemp')
def test_call_success(self, mkdtemp, exist):
'''
Test execution of Salt functions in chroot.
'''
# Success test
exist.return_value = True
mkdtemp.return_value = '/chroot/tmp01'
utils_mock = {
'thin.gen_thin': MagicMock(return_value='/salt-thin.tgz'),
'files.rm_rf': MagicMock(),
'json.find_json': MagicMock(return_value={'return': 'result'})
}
salt_mock = {
'archive.tar': MagicMock(return_value=''),
'config.option': MagicMock(),
'cmd.run_chroot': MagicMock(return_value={
'retcode': 0,
'stdout': '',
}),
}
with patch.dict(chroot.__utils__, utils_mock), \
patch.dict(chroot.__salt__, salt_mock):
self.assertEqual(chroot.call('/chroot', 'test.ping'), 'result')
utils_mock['thin.gen_thin'].assert_called_once()
salt_mock['config.option'].assert_called()
salt_mock['archive.tar'].assert_called_once()
salt_mock['cmd.run_chroot'].assert_called_once()
utils_mock['files.rm_rf'].assert_called_once()

0 comments on commit 984fb62

Please sign in to comment.