X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fguestfsd.c;h=99055a92e2ad703a78df80fa589b3f0f6d4be4fa;hp=810d9d0e8162c1f2cfee5aa0cf2e3d1ace92731f;hb=e118c14b9552de311cbc1734e03a3226b484c1e8;hpb=99bd425a0a8fb02c27e0c22b32dafa804773a7b1 diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 810d9d0..99055a9 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -32,17 +32,19 @@ #include #include #include +#include +#include #include "daemon.h" -void xwrite (int sock, const void *buf, size_t len); - static void usage (void); /* Also in guestfs.c */ #define VMCHANNEL_PORT "6666" #define VMCHANNEL_ADDR "10.0.2.4" +int verbose = 0; + int main (int argc, char *argv[]) { @@ -65,7 +67,8 @@ main (int argc, char *argv[]) struct addrinfo *res, *rr; struct addrinfo hints; XDR xdr; - unsigned len; + uint32_t len; + struct sigaction sa; for (;;) { c = getopt_long (argc, argv, options, long_options, NULL); @@ -110,6 +113,14 @@ main (int argc, char *argv[]) fclose (fp); buf[n] = '\0'; + /* Set the verbose flag. Not quite right because this will only + * set the flag if host and port aren't set on the command line. + * Don't worry about this for now. (XXX) + */ + verbose = strstr (buf, "guestfs_verbose=1") != NULL; + if (verbose) + printf ("verbose daemon enabled\n"); + p = strstr (buf, "guestfs="); if (p) { @@ -132,6 +143,13 @@ main (int argc, char *argv[]) port = VMCHANNEL_PORT; } + /* Make sure SIGPIPE doesn't kill us. */ + memset (&sa, 0, sizeof sa); + sa.sa_handler = SIG_IGN; + sa.sa_flags = 0; + if (sigaction (SIGPIPE, &sa, NULL) == -1) + perror ("sigaction SIGPIPE"); /* but try to continue anyway ... */ + /* Resolve the hostname. */ memset (&hints, 0, sizeof hints); hints.ai_socktype = SOCK_STREAM; @@ -165,14 +183,14 @@ main (int argc, char *argv[]) /* Send the magic length message which indicates that * userspace is up inside the guest. */ - len = 0xf5f55ff5; + len = GUESTFS_LAUNCH_FLAG; xdrmem_create (&xdr, buf, sizeof buf, XDR_ENCODE); if (!xdr_uint32_t (&xdr, &len)) { fprintf (stderr, "xdr_uint32_t failed\n"); exit (1); } - xwrite (sock, buf, xdr_getpos (&xdr)); + (void) xwrite (sock, buf, xdr_getpos (&xdr)); xdr_destroy (&xdr); @@ -190,7 +208,7 @@ main (int argc, char *argv[]) exit (0); } -void +int xwrite (int sock, const void *buf, size_t len) { int r; @@ -199,14 +217,16 @@ xwrite (int sock, const void *buf, size_t len) r = write (sock, buf, len); if (r == -1) { perror ("write"); - exit (1); + return -1; } buf += r; len -= r; } + + return 0; } -void +int xread (int sock, void *buf, size_t len) { int r; @@ -215,15 +235,17 @@ xread (int sock, void *buf, size_t len) r = read (sock, buf, len); if (r == -1) { perror ("read"); - exit (1); + return -1; } if (r == 0) { - fprintf (stderr, "read: unexpected end of file on comms socket\n"); - exit (1); + fprintf (stderr, "read: unexpected end of file on fd %d\n", sock); + return -1; } buf += r; len -= r; } + + return 0; } static void @@ -232,6 +254,82 @@ usage (void) fprintf (stderr, "guestfsd [-f] [-h host -p port]\n"); } +int +add_string (char ***argv, int *size, int *alloc, const char *str) +{ + char **new_argv; + char *new_str; + + if (*size >= *alloc) { + *alloc += 64; + new_argv = realloc (*argv, *alloc * sizeof (char *)); + if (new_argv == NULL) { + reply_with_perror ("realloc"); + free_strings (*argv); + return -1; + } + *argv = new_argv; + } + + if (str) { + new_str = strdup (str); + if (new_str == NULL) { + reply_with_perror ("strdup"); + free_strings (*argv); + } + } else + new_str = NULL; + + (*argv)[*size] = new_str; + + (*size)++; + return 0; +} + +int +count_strings (char * const* const argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + ; + return argc; +} + +static int +compare (const void *vp1, const void *vp2) +{ + char * const *p1 = (char * const *) vp1; + char * const *p2 = (char * const *) vp2; + return strcmp (*p1, *p2); +} + +void +sort_strings (char **argv, int len) +{ + qsort (argv, len, sizeof (char *), compare); +} + +void +free_strings (char **argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + free (argv[argc]); + free (argv); +} + +void +free_stringslen (char **argv, int len) +{ + int i; + + for (i = 0; i < len; ++i) + free (argv[i]); + free (argv); +} + /* This is a more sane version of 'system(3)' for running external * commands. It uses fork/execvp, so we don't need to worry about * quoting of parameters, and it allows us to capture any error @@ -240,15 +338,125 @@ usage (void) int command (char **stdoutput, char **stderror, const char *name, ...) { + va_list args; + char **argv, **p; + char *s; + int i, r; + + /* Collect the command line arguments into an array. */ + i = 2; + argv = malloc (sizeof (char *) * i); + if (argv == NULL) { + perror ("malloc"); + return -1; + } + argv[0] = (char *) name; + argv[1] = NULL; + + va_start (args, name); + + while ((s = va_arg (args, char *)) != NULL) { + p = realloc (argv, sizeof (char *) * (++i)); + if (p == NULL) { + perror ("realloc"); + free (argv); + va_end (args); + return -1; + } + argv = p; + argv[i-2] = s; + argv[i-1] = NULL; + } + + va_end (args); + + r = commandv (stdoutput, stderror, argv); + + /* NB: Mustn't free the strings which are on the stack. */ + free (argv); + + return r; +} + +/* Same as 'command', but we allow the status code from the + * subcommand to be non-zero, and return that status code. + * We still return -1 if there was some other error. + */ +int +commandr (char **stdoutput, char **stderror, const char *name, ...) +{ + va_list args; + char **argv, **p; + char *s; + int i, r; + + /* Collect the command line arguments into an array. */ + i = 2; + argv = malloc (sizeof (char *) * i); + if (argv == NULL) { + perror ("malloc"); + return -1; + } + argv[0] = (char *) name; + argv[1] = NULL; + + va_start (args, name); + + while ((s = va_arg (args, char *)) != NULL) { + p = realloc (argv, sizeof (char *) * (++i)); + if (p == NULL) { + perror ("realloc"); + free (argv); + va_end (args); + return -1; + } + argv = p; + argv[i-2] = s; + argv[i-1] = NULL; + } + + va_end (args); + + r = commandrv (stdoutput, stderror, argv); + + /* NB: Mustn't free the strings which are on the stack. */ + free (argv); + + return r; +} + +/* Same as 'command', but passing an argv. */ +int +commandv (char **stdoutput, char **stderror, char * const* const argv) +{ + int r; + + r = commandrv (stdoutput, stderror, argv); + if (r == 0) + return 0; + else + return -1; +} + +int +commandrv (char **stdoutput, char **stderror, char * const* const argv) +{ int so_size = 0, se_size = 0; int so_fd[2], se_fd[2]; - int pid, r, quit; + int pid, r, quit, i; fd_set rset, rset2; char buf[256]; if (stdoutput) *stdoutput = NULL; if (stderror) *stderror = NULL; + if (verbose) { + printf ("%s", argv[0]); + for (i = 1; argv[i] != NULL; ++i) + printf (" %s", argv[i]); + printf ("\n"); + } + if (pipe (so_fd) == -1 || pipe (se_fd) == -1) { perror ("pipe"); return -1; @@ -257,29 +465,14 @@ command (char **stdoutput, char **stderror, const char *name, ...) pid = fork (); if (pid == -1) { perror ("fork"); + close (so_fd[0]); + close (so_fd[1]); + close (se_fd[0]); + close (se_fd[1]); return -1; } if (pid == 0) { /* Child process. */ - va_list args; - char **argv; - char *s; - int i; - - /* Collect the command line arguments into an array. */ - va_start (args, name); - - i = 2; - argv = malloc (sizeof (char *) * i); - argv[0] = (char *) name; - argv[1] = NULL; - - while ((s = va_arg (args, char *)) != NULL) { - argv = realloc (argv, sizeof (char *) * (++i)); - argv[i-2] = s; - argv[i-1] = NULL; - } - close (0); close (so_fd[0]); close (se_fd[0]); @@ -288,8 +481,8 @@ command (char **stdoutput, char **stderror, const char *name, ...) close (so_fd[1]); close (se_fd[1]); - execvp (name, argv); - perror (name); + execvp (argv[0], argv); + perror (argv[0]); _exit (1); } @@ -302,11 +495,13 @@ command (char **stdoutput, char **stderror, const char *name, ...) FD_SET (se_fd[0], &rset); quit = 0; - while (!quit) { + while (quit < 2) { rset2 = rset; r = select (MAX (so_fd[0], se_fd[0]) + 1, &rset2, NULL, NULL, NULL); if (r == -1) { perror ("select"); + close (so_fd[0]); + close (se_fd[0]); waitpid (pid, NULL, 0); return -1; } @@ -315,10 +510,12 @@ command (char **stdoutput, char **stderror, const char *name, ...) r = read (so_fd[0], buf, sizeof buf); if (r == -1) { perror ("read"); + close (so_fd[0]); + close (se_fd[0]); waitpid (pid, NULL, 0); return -1; } - if (r == 0) quit = 1; + if (r == 0) { FD_CLR (so_fd[0], &rset); quit++; } if (r > 0 && stdoutput) { so_size += r; @@ -336,10 +533,12 @@ command (char **stdoutput, char **stderror, const char *name, ...) r = read (se_fd[0], buf, sizeof buf); if (r == -1) { perror ("read"); + close (so_fd[0]); + close (se_fd[0]); waitpid (pid, NULL, 0); return -1; } - if (r == 0) quit = 1; + if (r == 0) { FD_CLR (se_fd[0], &rset); quit++; } if (r > 0 && stderror) { se_size += r; @@ -354,20 +553,19 @@ command (char **stdoutput, char **stderror, const char *name, ...) } } + close (so_fd[0]); + close (se_fd[0]); + /* Make sure the output buffers are \0-terminated. Also remove any - * trailing \n characters. + * trailing \n characters from the error buffer (not from stdout). */ if (stdoutput) { *stdoutput = realloc (*stdoutput, so_size+1); if (*stdoutput == NULL) { perror ("realloc"); *stdoutput = NULL; - } else { + } else (*stdoutput)[so_size] = '\0'; - so_size--; - while (so_size >= 0 && (*stdoutput)[so_size] == '\n') - (*stdoutput)[so_size--] = '\0'; - } } if (stderror) { *stderror = realloc (*stderror, se_size+1); @@ -386,10 +584,44 @@ command (char **stdoutput, char **stderror, const char *name, ...) waitpid (pid, &r, 0); if (WIFEXITED (r)) { - if (WEXITSTATUS (r) == 0) - return 0; - else - return -1; + return WEXITSTATUS (r); } else return -1; } + +/* Quote 'in' for the shell, and write max len-1 bytes to out. The + * result will be NUL-terminated, even if it is truncated. + * + * Returns number of bytes needed, so if result >= len then the buffer + * should have been longer. + * + * XXX This doesn't quote \n correctly (but is still safe). + */ +int +shell_quote (char *out, int len, const char *in) +{ +#define SAFE(c) (isalnum((c)) || \ + (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.') + int i, j; + int outlen = strlen (in); + + /* Calculate how much output space this really needs. */ + for (i = 0; in[i]; ++i) + if (!SAFE (in[i])) outlen++; + + /* Now copy the string, but only up to len-1 bytes. */ + for (i = 0, j = 0; in[i]; ++i) { + int is_safe = SAFE (in[i]); + + /* Enough space left to write this character? */ + if (j >= len-1 || (!is_safe && j >= len-2)) + break; + + if (!is_safe) out[j++] = '\\'; + out[j++] = in[i]; + } + + out[j] = '\0'; + + return outlen; +}