search for: shell_quote

At the moment the daemon code contains an incredibly hairy function called shell_quote for safely quoting strings passed to the shell. The patch replaces that with a glibc custom printf format (actually two, but very closely related), %Q and %R. %Q is like %s but it safely shell quotes the string. %R is like %Q but it prefixes the path with /sysroot. Example usage (w/o error chec...

...4 --- a/server/captive.c +++ b/server/captive.c @@ -72,7 +72,7 @@ run_command (void) /* Construct $uri. */ fprintf (fp, "uri="); if (port) { - fprintf (fp, "nbd://localhost:"); + fprintf (fp, vsock ? "nbd+vsock://1:" : "nbd://localhost:"); shell_quote (port, fp); if (strcmp (exportname, "") != 0) { putc ('/', fp); @@ -99,29 +99,31 @@ run_command (void) * different syntax, so try to guess which one we need. */ fprintf (fp, "nbd="); - if (strstr (run, "guestfish")) { - if (port) { -...

Here is an update to the patch posted yesterday. The changes are: (1) Don't use inline (for mdbooth). (2) Added a comment to HACKING (for mdbooth). (3) Check for old-style and new-style glibc functions and use whatever is available (for danpb). (4) Removed the old shell_quote function instead of just commenting it out. Can anyone decode from Uli's message[1] whether these new functions are going to be added to POSIX 2008? It's not very clear to me. Rich. [1] http://udrepper.livejournal.com/20948.html -- Richard Jones, Emerging Technologies, Red Hat http:/...

Since v1: - new patch to add uri_quote() - rebase on top of other recent patches needed while auditing shell_quote() - use uri_quote() instead of shell_quote() for producing $uri Eric Blake (2): common/utils: Add uri_quote and tests captive: Support $uri in --run docs/nbdkit-captive.pod | 8 ++- common/utils/utils.h | 1 + common/utils/test-quotes.c | 108 ++++++++++++++++++++++++++++++++++++...

...+++ b/server/captive.c @@ -66,7 +66,19 @@ run_command (void) exit (EXIT_FAILURE); } - /* Construct $nbd "URL". Unfortunately guestfish and qemu take + /* Construct $uri. */ + fprintf (fp, "uri="); + if (port) { + fprintf (fp, "nbd://localhost:"); + shell_quote (port, fp); + } + else if (unixsocket) { + fprintf (fp, "nbd+unix://\\?socket="); + shell_quote (unixsocket, fp); + } + fprintf (fp, "\n"); + + /* Construct older $nbd "URL". Unfortunately guestfish and qemu take * different syntax, so try to guess whic...

...ry commands rather than exec()ing them directly. This patch also doesn't resolve the fact that we are also passing params= through shell parsing (if we don't like that, we should consider changing the interface to make the user write param='-V' param='My Disk Image' and use shell_quote() over each param, rather than the current params='-V "My Disk Image"'), but does try to enhance the docs to point it out with more clarity. Signed-off-by: Eric Blake <eblake@redhat.com> --- I'm pushing this now, but we may want to reconsider the iso plugin exposing pa...

An evolution of v1 here: https://www.redhat.com/archives/libguestfs/2020-April/msg00035.html I want to generalize the tmpdisk plugin, particularly so you can use commands like ‘qemu-img create’ or even ‘virt-builder’. (Actually virt-builder really works - I tested it - but of course it causes a 30+ second delay when connecting to the server.) You can now use commands such as: nbdkit tmpdisk

From: "Richard W.M. Jones" <rjones@redhat.com> The shell_quote function is moved to a new common/utils directory. Eventually more utility functions can be created here. This change is pure refactoring. --- Makefile.am | 1 + common/utils/Makefile.am | 41 ++++++++++++++++++++++++++++ common/utils/utils.c | 70 +++++++++++++++++++++++++++++++...

...) { @@ -173,21 +198,26 @@ run_command (const char *disk) /* Avoid stdin/stdout leaking (because of nbdkit -s). */ fprintf (fp, "exec </dev/null >/dev/null\n"); - /* Set the shell variables. */ + /* Set the standard shell variables. */ fprintf (fp, "disk="); shell_quote (disk, fp); putc ('\n', fp); - if (label) { - fprintf (fp, "label="); - shell_quote (label, fp); - putc ('\n', fp); - } fprintf (fp, "size=%" PRIi64 "\n", size); - fprintf (fp, "type="); - shell_quote (type, fp); putc (...

...) { @@ -173,21 +202,26 @@ run_command (const char *disk) /* Avoid stdin/stdout leaking (because of nbdkit -s). */ fprintf (fp, "exec </dev/null >/dev/null\n"); - /* Set the shell variables. */ + /* Set the standard shell variables. */ fprintf (fp, "disk="); shell_quote (disk, fp); putc ('\n', fp); - if (label) { - fprintf (fp, "label="); - shell_quote (label, fp); + fprintf (fp, "size=%" PRIi64 "\n", requested_size); + putc ('\n', fp); + + /* The other parameters/shell variables. */ + for (v = vars; v !=...

...modify * it under the terms of the GNU General Public License as published by @@ -66,6 +66,7 @@ static void cmdline (char *argv[], int optind, int argc); static void initialize_readline (void); static void cleanup_readline (void); static void add_history_line (const char *); +static int print_shell_quote (FILE *stream, const char *str); /* Currently open libguestfs handle. */ guestfs_h *g; @@ -362,9 +363,6 @@ main (int argc, char *argv[]) /* Inspector mode invalidates most of the other arguments. */ if (inspector) { - char cmd[1024]; - int r; - if (drvs || mps || remote_contr...

...) { @@ -173,21 +215,26 @@ run_command (const char *disk) /* Avoid stdin/stdout leaking (because of nbdkit -s). */ fprintf (fp, "exec </dev/null >/dev/null\n"); - /* Set the shell variables. */ + /* Set the standard shell variables. */ fprintf (fp, "disk="); shell_quote (disk, fp); putc ('\n', fp); - if (label) { - fprintf (fp, "label="); - shell_quote (label, fp); + fprintf (fp, "size=%" PRIi64 "\n", requested_size); + putc ('\n', fp); + + /* The other parameters/shell variables. */ + for (v = vars; v !=...

...n_command (void) > exit (EXIT_FAILURE); > } > > - /* Construct $nbd "URL". Unfortunately guestfish and qemu take > + /* Construct $uri. */ > + fprintf (fp, "uri="); > + if (port) { > + fprintf (fp, "nbd://localhost:"); > + shell_quote (port, fp); > + } > + else if (unixsocket) { > + fprintf (fp, "nbd+unix://\\?socket="); > + shell_quote (unixsocket, fp); > + } > + fprintf (fp, "\n"); > + > + /* Construct older $nbd "URL". Unfortunately guestfish and qemu take >...

v2 was here: https://www.redhat.com/archives/libguestfs/2020-April/msg00075.html In v3: - Add [VAR=VALUE ...] to manual. - Various minor improvements to the manual. - Work (at least, in theory - not tested) with block devices or symlinks. I didn't document this because it's hard to ensure these files or block devices would be cleaned up, so here be dragons. - Remove O_NOCTTY. -

...gt; - assert (exportname != NULL); > - > fp = open_memstream (&cmd, &len); > if (fp == NULL) { > perror ("open_memstream"); > @@ -74,27 +72,13 @@ run_command (void) > if (port) { > fprintf (fp, "nbd://localhost:"); > shell_quote (port, fp); > - if (strcmp (exportname, "") != 0) { > - putc ('/', fp); > - uri_quote (exportname, fp); > - } > } > else if (unixsocket) { > - fprintf (fp, "nbd+unix://"); > - if (strcmp (exportname, "") !=...

Patch 1/2 is uncontroversial. Patch 2/2 is an interesting idea I had to generalize this plugin. It already uses a complete embedded shell script to do most of the work. What if, instead of making special cases for "type" and "label" params, we simply turn any other plugin parameters into script variables? This part of it works fine. However there is another problem which is

...+ size_t len = 0; > + int r; > + > + fp = open_memstream (&cmd, &len); > + if (fp == NULL) { > + nbdkit_error ("open_memstream: %m"); > + return -1; > + } > + > + /* Set the shell variables. */ > + fprintf (fp, "disk="); > + shell_quote (disk, fp); [1]...here you are correctly quoting the definition of disk, and...[2] > + putc ('\n', fp); > + if (label) { > + fprintf (fp, "label="); > + shell_quote (label, fp); > + putc ('\n', fp); > + } > + fprintf (fp, "size=%&qu...

...t;); > + return -1; > + } > + fprintf (fp, "LANG=C tar --no-auto-compress -tRvf "); Use of --no-auto-compress is specific to GNU tar, do we care? Should we allow a 'tar=/path/to/tar' parameter during .config to allow a user to point to an alternative tar? > + shell_quote (tarfile, fp); > + fputc (' ', fp); > + shell_quote (file, fp); > + if (fclose (fp) == EOF) { > + nbdkit_error ("memstream failed: %m"); > + return -1; > + } > + > + /* Run the command and read the first line of the output. */ > + nbdkit_debu...

...is also not supported by non-GNU tar. > Should we allow a 'tar=/path/to/tar' parameter during .config to > allow a user to point to an alternative tar? Yes, this is a potential enhancement, especially where GNU tar might be called "gtar" (as it is on FreeBSD). > >+ shell_quote (tarfile, fp); > >+ fputc (' ', fp); > >+ shell_quote (file, fp); > >+ if (fclose (fp) == EOF) { > >+ nbdkit_error ("memstream failed: %m"); > >+ return -1; > >+ } > >+ > >+ /* Run the command and read the first line of th...

...@@ run_command (void) if (!run) return; - assert (exportname != NULL); - fp = open_memstream (&cmd, &len); if (fp == NULL) { perror ("open_memstream"); @@ -74,27 +72,13 @@ run_command (void) if (port) { fprintf (fp, "nbd://localhost:"); shell_quote (port, fp); - if (strcmp (exportname, "") != 0) { - putc ('/', fp); - uri_quote (exportname, fp); - } } else if (unixsocket) { - fprintf (fp, "nbd+unix://"); - if (strcmp (exportname, "") != 0) { - putc ('/', fp); -...