X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdebug.c;h=0867ccd7575589333608341d2f398cc957bf9b8f;hp=fc1053164b4364f02cc43d412492e468e7d45cdc;hb=da4812ab6b44c29cb3cf181c7aa896420ecb8aa6;hpb=012a2ec1acf7a7a2d859f78ea4932ae9fb30522d diff --git a/daemon/debug.c b/daemon/debug.c index fc10531..0867ccd 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "../src/guestfs_protocol.h" @@ -45,19 +46,33 @@ struct cmd { }; static char *debug_help (const char *subcmd, int argc, char *const *const argv); +static char *debug_env (const char *subcmd, int argc, char *const *const argv); static char *debug_fds (const char *subcmd, int argc, char *const *const argv); +static char *debug_ls (const char *subcmd, int argc, char *const *const argv); +static char *debug_ll (const char *subcmd, int argc, char *const *const argv); +static char *debug_segv (const char *subcmd, int argc, char *const *const argv); static char *debug_sh (const char *subcmd, int argc, char *const *const argv); static struct cmd cmds[] = { { "help", debug_help }, + { "env", debug_env }, { "fds", debug_fds }, + { "ls", debug_ls }, + { "ll", debug_ll }, + { "segv", debug_segv }, { "sh", debug_sh }, { NULL, NULL } }; #endif +#if ! ENABLE_DEBUG_COMMAND +# define MAYBE_UNUSED ATTRIBUTE_UNUSED +#else +# define MAYBE_UNUSED /* empty */ +#endif + char * -do_debug (const char *subcmd, char *const *const argv) +do_debug (const char *subcmd MAYBE_UNUSED, char *const *argv MAYBE_UNUSED) { #if ENABLE_DEBUG_COMMAND int argc, i; @@ -66,7 +81,7 @@ do_debug (const char *subcmd, char *const *const argv) argc++; for (i = 0; cmds[i].cmd != NULL; ++i) { - if (strcasecmp (subcmd, cmds[i].cmd) == 0) + if (STRCASEEQ (subcmd, cmds[i].cmd)) return cmds[i].f (subcmd, argc, argv); } @@ -114,20 +129,29 @@ static char * debug_fds (const char *subcmd, int argc, char *const *const argv) { int r; - char *out = NULL; + char *out; + size_t size; + FILE *fp; DIR *dir; struct dirent *d; char fname[256], link[256]; struct stat statbuf; + fp = open_memstream (&out, &size); + if (!fp) { + reply_with_perror ("open_memstream"); + return NULL; + } + dir = opendir ("/proc/self/fd"); if (!dir) { reply_with_perror ("opendir: /proc/self/fd"); + fclose (fp); return NULL; } while ((d = readdir (dir)) != NULL) { - if (strcmp (d->d_name, ".") == 0 || strcmp (d->d_name, "..") == 0) + if (STREQ (d->d_name, ".") || STREQ (d->d_name, "..")) continue; snprintf (fname, sizeof fname, "/proc/self/fd/%s", d->d_name); @@ -135,6 +159,7 @@ debug_fds (const char *subcmd, int argc, char *const *const argv) r = lstat (fname, &statbuf); if (r == -1) { reply_with_perror ("stat: %s", fname); + fclose (fp); free (out); closedir (dir); return NULL; @@ -143,25 +168,21 @@ debug_fds (const char *subcmd, int argc, char *const *const argv) if (S_ISLNK (statbuf.st_mode)) { r = readlink (fname, link, sizeof link - 1); if (r == -1) { - reply_with_perror ("readline: %s", fname); - free (out); - closedir (dir); - return NULL; + reply_with_perror ("readline: %s", fname); + fclose (fp); + free (out); + closedir (dir); + return NULL; } link[r] = '\0'; - r = catprintf (&out, "%2s %s\n", d->d_name, link); + fprintf (fp, "%2s %s\n", d->d_name, link); } else - r = catprintf (&out, "%2s 0%o\n", d->d_name, statbuf.st_mode); - - if (r == -1) { - reply_with_perror ("catprintf"); - free (out); - closedir (dir); - return NULL; - } + fprintf (fp, "%2s 0%o\n", d->d_name, statbuf.st_mode); } + fclose (fp); + if (closedir (dir) == -1) { reply_with_perror ("closedir"); free (out); @@ -171,16 +192,142 @@ debug_fds (const char *subcmd, int argc, char *const *const argv) return out; } -/* Run an arbitrary shell command. */ +/* Force a segfault in the daemon. */ +static char * +debug_segv (const char *subcmd, int argc, char *const *const argv) +{ + *(int*)0 = 0; + return NULL; +} + +/* Run an arbitrary shell command using /bin/sh from the appliance. + * + * Note this is somewhat different from the ordinary guestfs_sh command + * because it's not using the guest shell, and is not chrooted. + */ static char * debug_sh (const char *subcmd, int argc, char *const *const argv) { + if (argc < 1) { + reply_with_error ("sh: expecting a command to run"); + return NULL; + } + + char *cmd; + int len, i, j; + + /* guestfish splits the parameter(s) into a list of strings, + * and we have to reassemble them here. Not ideal. XXX + */ + for (i = len = 0; i < argc; ++i) + len += strlen (argv[i]) + 1; + cmd = malloc (len); + if (!cmd) { + reply_with_perror ("malloc"); + return NULL; + } + for (i = j = 0; i < argc; ++i) { + len = strlen (argv[i]); + memcpy (&cmd[j], argv[i], len); + j += len; + cmd[j] = ' '; + j++; + } + cmd[j-1] = '\0'; + + /* Set up some environment variables. */ + setenv ("root", sysroot, 1); + if (access ("/sys/block/sda", F_OK) == 0) + setenv ("sd", "sd", 1); + else if (access ("/sys/block/hda", F_OK) == 0) + setenv ("sd", "hd", 1); + else if (access ("/sys/block/vda", F_OK) == 0) + setenv ("sd", "vd", 1); + + char *err; + int r = commandf (NULL, &err, COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, + "/bin/sh", "-c", cmd, NULL); + free (cmd); + + if (r == -1) { + reply_with_error ("%s", err); + free (err); + return NULL; + } + + return err; +} + +/* Print the environment that commands get (by running external printenv). */ +static char * +debug_env (const char *subcmd, int argc, char *const *const argv) +{ + int r; + char *out, *err; + + r = command (&out, &err, "printenv", NULL); + if (r == -1) { + reply_with_error ("printenv: %s", err); + free (out); + free (err); + return NULL; + } + + free (err); + + return out; +} + +/* List files in the appliance. */ +static char * +debug_ls (const char *subcmd, int argc, char *const *const argv) +{ + int len = count_strings (argv); + const char *cargv[len+3]; + int i; + + cargv[0] = "ls"; + cargv[1] = "-a"; + for (i = 0; i < len; ++i) + cargv[2+i] = argv[i]; + cargv[2+len] = NULL; + + int r; + char *out, *err; + + r = commandv (&out, &err, (void *) cargv); + if (r == -1) { + reply_with_error ("ls: %s", err); + free (out); + free (err); + return NULL; + } + + free (err); + + return out; +} + +/* List files in the appliance. */ +static char * +debug_ll (const char *subcmd, int argc, char *const *const argv) +{ + int len = count_strings (argv); + const char *cargv[len+3]; + int i; + + cargv[0] = "ls"; + cargv[1] = "-la"; + for (i = 0; i < len; ++i) + cargv[2+i] = argv[i]; + cargv[2+len] = NULL; + int r; char *out, *err; - r = commandv (&out, &err, argv); + r = commandv (&out, &err, (void *) cargv); if (r == -1) { - reply_with_error ("ps: %s", err); + reply_with_error ("ll: %s", err); free (out); free (err); return NULL; @@ -192,3 +339,61 @@ debug_sh (const char *subcmd, int argc, char *const *const argv) } #endif /* ENABLE_DEBUG_COMMAND */ + +#if ENABLE_DEBUG_COMMAND +static int +write_cb (void *fd_ptr, const void *buf, size_t len) +{ + int fd = *(int *)fd_ptr; + return xwrite (fd, buf, len); +} +#endif + +/* Has one FileIn parameter. */ +int +do_debug_upload (const char *filename MAYBE_UNUSED, int mode MAYBE_UNUSED) +{ +#if ENABLE_DEBUG_COMMAND + /* Not chrooted - this command lets you upload a file to anywhere + * in the appliance. + */ + int fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, mode); + + if (fd == -1) { + int err = errno; + cancel_receive (); + errno = err; + reply_with_perror ("%s", filename); + return -1; + } + + int r = receive_file (write_cb, &fd); + if (r == -1) { /* write error */ + int err = errno; + cancel_receive (); + errno = err; + reply_with_error ("write error: %s", filename); + close (fd); + return -1; + } + if (r == -2) { /* cancellation from library */ + close (fd); + /* Do NOT send any error. */ + return -1; + } + + if (close (fd) == -1) { + int err = errno; + if (r == -1) /* if r == 0, file transfer ended already */ + cancel_receive (); + errno = err; + reply_with_perror ("close: %s", filename); + return -1; + } + + return 0; +#else + reply_with_error ("guestfsd was not configured with --enable-debug-command"); + return NULL; +#endif +}