forked from Mirror/pmbootstrap
Properly escape commands in pmb.chroot.user() (#1316)
## Introduction In #1302 we noticed that `pmb.chroot.user()` does not escape commands properly: When passing one string with spaces, it would pass them as two strings to the chroot. The use case is passing a description with a space inside to `newapkbuild` with `pmboostrap newapkbuild`. This is not a security issue, as we don't pass strings from untrusted input to this function. ## Functions for running commands in pmbootstrap To put the rest of the description in context: We have four high level functions that run commands: * `pmb.helpers.run.user()` * `pmb.helpers.run.root()` * `pmb.chroot.root()` * `pmb.chroot.user()` In addition, one low level function that the others invoke: * `pmb.helpers.run.core()` ## Flawed test case The issue described above did not get detected for so long, because we have a test case in place since day one, which verifies that all of the functions above escape everything properly: * `test/test_shell_escape.py` So the test case ran a given command through all these functions, and compared the result each time. However, `pmb.chroot.root()` modified the command variable (passed by reference) and did the escaping already, which means `pmb.chroot.user()` running directly afterwards only returns the right output when *not* doing any escaping. Without questioning the accuracy of the test case, I've escaped commands and environment variables with `shlex.quote()` *before* passing them to `pmb.chroot.user()`. In retrospective this does not make sense at all and is reverted with this commit. ## Environment variables By coincidence, we have only passed custom environment variables to `pmb.chroot.user()`, never to the other high level functions. This only worked, because we did not do any escaping and the passed line gets executed as shell command: ``` $ MYENV=test echo test2 test 2 ``` If it was properly escaped as one shell command: ``` $ 'MYENV=test echo test2' sh: MYENV=test echo test2: not found ``` So doing that clearly doesn't work anymore. I have added a new `env` parameter to `pmb.chroot.user()` (and to all other high level functions for consistency), where environment variables can be passed as a dictionary. Then the function knows what to do and we end up with properly escaped commands and environment variables. ## Details * Add new `env` parameter to all high level command execution functions * New `pmb.helpers.run.flat_cmd()` function, that takes a command as list and environment variables as dict, and creates a properly escaped flat string from the input. * Use that function for proper escaping in all high level exec funcs * Don't escape commands *before* passing them to `pmb.chroot.user()` * Describe parameters of the command execution functions * `pmbootstrap -v` writes the exact command to the log that was executed (in addition to the simplified form we always write down for readability) * `test_shell_escape.py`: verify that the command passed by reference has not been modified, add a new test for strings with spaces, add tests for new function `pmb.helpers.run.flat_cmd()` * Remove obsolete commend in `pmb.chroot.distccd` about environment variables, because we don't use any there anymore * Add `TERM=xterm` to default environment variables in the chroot, so running ncurses applications like `menuconfig` and `nano` works out of the box
This commit is contained in:
parent
571ddf741a
commit
3666388619
10 changed files with 236 additions and 87 deletions
|
@ -18,7 +18,6 @@ along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
|
|||
"""
|
||||
import os
|
||||
import shutil
|
||||
import shlex
|
||||
|
||||
import pmb.config
|
||||
import pmb.chroot
|
||||
|
@ -41,46 +40,54 @@ def executables_absolute_path():
|
|||
|
||||
|
||||
def root(args, cmd, suffix="native", working_dir="/", log=True,
|
||||
auto_init=True, return_stdout=False, check=True):
|
||||
auto_init=True, return_stdout=False, check=True, env={}):
|
||||
"""
|
||||
Run a command inside a chroot as root.
|
||||
|
||||
:param log: When set to true, redirect all output to the logfile
|
||||
:param auto_init: Automatically initialize the chroot
|
||||
:param cmd: command as list, e.g. ["echo", "string with spaces"]
|
||||
:param suffix: of the chroot to execute code in
|
||||
:param working_dir: path inside chroot where the command should run
|
||||
:param log: when set to true, redirect all output to the logfile
|
||||
:param auto_init: automatically initialize the chroot
|
||||
:param return_stdout: write stdout to a buffer and return it as string when
|
||||
the command is through
|
||||
:param check: raise an exception, when the command fails
|
||||
:param env: dict of environment variables to be passed to the command, e.g.
|
||||
{"JOBS": "5"}
|
||||
:returns: * stdout when return_stdout is True
|
||||
* None otherwise
|
||||
"""
|
||||
# Get and verify chroot folder
|
||||
# Initialize chroot
|
||||
chroot = args.work + "/chroot_" + suffix
|
||||
if not auto_init and not os.path.islink(chroot + "/bin/sh"):
|
||||
raise RuntimeError("Chroot does not exist: " + chroot)
|
||||
|
||||
if auto_init:
|
||||
pmb.chroot.init(args, suffix)
|
||||
|
||||
# Run the args with sudo chroot, and with cleaned environment
|
||||
# variables
|
||||
executables = executables_absolute_path()
|
||||
for i in range(len(cmd)):
|
||||
cmd[i] = shlex.quote(cmd[i])
|
||||
cmd_inner_shell = ("cd " + shlex.quote(working_dir) + ";" +
|
||||
" ".join(cmd))
|
||||
|
||||
cmd_full = ["sudo", executables["sh"], "-c",
|
||||
"env -i" + # unset all
|
||||
" CHARSET=UTF-8" +
|
||||
" PATH=" + pmb.config.chroot_path +
|
||||
" SHELL=/bin/ash" +
|
||||
" HISTFILE=~/.ash_history" +
|
||||
" " + executables["chroot"] +
|
||||
" " + chroot +
|
||||
" sh -c " + shlex.quote(cmd_inner_shell)
|
||||
]
|
||||
|
||||
# Generate log message
|
||||
log_message = "(" + suffix + ") % "
|
||||
# Readable log message (without all the escaping)
|
||||
msg = "(" + suffix + ") % "
|
||||
for key, value in env.items():
|
||||
msg += key + "=" + value + " "
|
||||
if working_dir != "/":
|
||||
log_message += "cd " + working_dir + " && "
|
||||
log_message += " ".join(cmd)
|
||||
msg += "cd " + working_dir + "; "
|
||||
msg += " ".join(cmd)
|
||||
|
||||
# Run the command
|
||||
return pmb.helpers.run.core(args, cmd_full, log_message, log,
|
||||
return_stdout, check)
|
||||
# Merge env with defaults into env_all
|
||||
env_all = {"CHARSET": "UTF-8",
|
||||
"HISTFILE": "~/.ash_history",
|
||||
"PATH": pmb.config.chroot_path,
|
||||
"SHELL": "/bin/ash",
|
||||
"TERM": "xterm"}
|
||||
for key, value in env.items():
|
||||
env_all[key] = value
|
||||
|
||||
# Build the command in steps and run it, e.g.:
|
||||
# cmd: ["echo", "test"]
|
||||
# cmd_chroot: ["/sbin/chroot", "/..._native", "/bin/sh", "-c", "echo test"]
|
||||
# cmd_sudo: ["sudo", "env", "-i", "sh", "-c", "PATH=... /sbin/chroot ..."]
|
||||
executables = executables_absolute_path()
|
||||
cmd_chroot = [executables["chroot"], chroot, "/bin/sh", "-c",
|
||||
pmb.helpers.run.flat_cmd(cmd, working_dir)]
|
||||
cmd_sudo = ["sudo", "env", "-i", executables["sh"], "-c",
|
||||
pmb.helpers.run.flat_cmd(cmd_chroot, env=env_all)]
|
||||
return pmb.helpers.run.core(args, cmd_sudo, msg, log, return_stdout, check)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue