use full paths for invoked commands

This commit is contained in:
Jan Dittberner 2014-12-25 23:53:58 +01:00
parent ea278eeb35
commit 7aee6c8838

View file

@ -19,6 +19,10 @@ from gvafile.exceptions import GVAFileException
_logger = get_task_logger(__name__) _logger = get_task_logger(__name__)
SUDO_CMD = '/usr/bin/sudo'
INSTALL_CMD = '/usr/bin/install'
SETFACL_CMD = '/usr/bin/setfacl'
def _build_sftp_directory_name(username): def _build_sftp_directory_name(username):
""" """
@ -53,11 +57,11 @@ def setup_file_sftp_userdir(username):
sftp_directory = _build_sftp_directory_name(username) sftp_directory = _build_sftp_directory_name(username)
try: try:
subprocess.check_output([ subprocess.check_output([
'sudo', 'install', '-o', username, '-g', username, '-m', '0750', SUDO_CMD, INSTALL_CMD, '-o', username, '-g', username,
'-d', sftp_directory], stderr=subprocess.STDOUT) '-m', '0750', '-d', sftp_directory], stderr=subprocess.STDOUT)
subprocess.check_output([ subprocess.check_output([
'sudo' 'setfacl', '-r', '-m', 'www-data:--x', sftp_directory], SUDO_CMD, SETFACL_CMD, '-r', '-m', 'www-data:--x',
stderr=subprocess.STDOUT) sftp_directory], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
_logger.exception( _logger.exception(
'could not create SFTP directory for user %s', username) 'could not create SFTP directory for user %s', username)