New API: debug-upload (not a formal part of the API/ABI).

Allow arbitrary files to be uploaded into the appliance, but
only when --enable-debug-command is enabled.  This lets you
run shell scripts, like this:

  ><fs> debug-upload -<<EOF /tmp/script.sh 0700
  #!/bin/sh -
  # ...
  EOF
  ><fs> debug sh "/tmp/script.sh"

diff --git a/daemon/debug.c b/daemon/debug.c
index 5d26c4e..0867ccd 100644 (file)
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

+#include <fcntl.h>

 #include <dirent.h>
 
 #include "../src/guestfs_protocol.h"
 #include <dirent.h>
 
 #include "../src/guestfs_protocol.h"


@@ -203,22 +204,18 @@ debug_segv (const char *subcmd, int argc, char *const *const argv)
  *
  * Note this is somewhat different from the ordinary guestfs_sh command
  * because it's not using the guest shell, and is not chrooted.
  *
  * Note this is somewhat different from the ordinary guestfs_sh command
  * because it's not using the guest shell, and is not chrooted.

- *
- * Also we ignore any errors and you can see the full output if you
- * add 2>&1 to the end of the command string.

  */
 static char *
 debug_sh (const char *subcmd, int argc, char *const *const argv)
 {
  */
 static char *
 debug_sh (const char *subcmd, int argc, char *const *const argv)
 {

-  char *cmd;
-  int len, i, j;
-  char *out;
-

   if (argc < 1) {
     reply_with_error ("sh: expecting a command to run");
     return NULL;
   }
 
   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
    */
   /* guestfish splits the parameter(s) into a list of strings,
    * and we have to reassemble them here.  Not ideal. XXX
    */


@@ -238,9 +235,27 @@ debug_sh (const char *subcmd, int argc, char *const *const argv)
   }
   cmd[j-1] = '\0';
 
   }
   cmd[j-1] = '\0';
 

-  command (&out, NULL, "/bin/sh", "-c", cmd, NULL);
+  /* 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);
   free (cmd);

-  return out;
+
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return NULL;
+  }
+
+  return err;

 }
 
 /* Print the environment that commands get (by running external printenv). */
 }
 
 /* Print the environment that commands get (by running external printenv). */


@@ -324,3 +339,61 @@ debug_ll (const char *subcmd, int argc, char *const *const argv)
 }
 
 #endif /* ENABLE_DEBUG_COMMAND */
 }
 
 #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
+}

diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index eb08bc0..f06fa6c 100644 (file)
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-240
+241

diff --git a/src/generator.ml b/src/generator.ml
index 580cb14..77fa053 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -4509,6 +4509,17 @@ is the same as the L<augtool(1)> C<clear> command.");
 Return the current umask.  By default the umask is C<022>
 unless it has been set by calling C<guestfs_umask>.");
 
 Return the current umask.  By default the umask is C<022>
 unless it has been set by calling C<guestfs_umask>.");
 

+  ("debug_upload", (RErr, [FileIn "filename"; String "tmpname"; Int "mode"]), 241, [],
+   [],
+   "upload a file to the appliance (internal use only)",
+   "\
+The C<guestfs_debug_upload> command uploads a file to
+the libguestfs appliance.
+
+There is no comprehensive help for this command.  You have
+to look at the file C<daemon/debug.c> in the libguestfs source
+to find out what it is for.");
+

 ]
 
 let all_functions = non_daemon_functions @ daemon_functions
 ]
 
 let all_functions = non_daemon_functions @ daemon_functions