mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
dc706a639e
During a FileIn command (eg. upload, tar-in) if both sides
experience errors, then both sides could send cancel messages,
the result being lost synchronization.
The reason for the lost synch was because the daemon was ignoring
this case and sending an error message back which the library side
(which had cancelled) was not expecting.
Fix this by checking in the daemon for the case where the library
also cancels during daemon cancellation, and not sending an error
messages.
This also includes an enhanced regression test which checks for this
case.
This extends the original fix in
commit 5922d7084d.
More details can be found here:
https://bugzilla.redhat.com/show_bug.cgi?id=576879#c5
297 lines
6.3 KiB
C
297 lines
6.3 KiB
C
/* libguestfs - the guestfsd daemon
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "../src/guestfs_protocol.h"
|
|
#include "daemon.h"
|
|
#include "actions.h"
|
|
|
|
static int
|
|
write_cb (void *fd_ptr, const void *buf, size_t len)
|
|
{
|
|
int fd = *(int *)fd_ptr;
|
|
return xwrite (fd, buf, len);
|
|
}
|
|
|
|
/* Has one FileIn parameter. */
|
|
int
|
|
do_tar_in (const char *dir)
|
|
{
|
|
int err, r;
|
|
FILE *fp;
|
|
char *cmd;
|
|
|
|
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
|
|
if (asprintf_nowarn (&cmd, "tar -C %R -xf -", dir) == -1) {
|
|
err = errno;
|
|
r = cancel_receive ();
|
|
errno = err;
|
|
if (r != -2) reply_with_perror ("asprintf");
|
|
return -1;
|
|
}
|
|
|
|
if (verbose)
|
|
fprintf (stderr, "%s\n", cmd);
|
|
|
|
fp = popen (cmd, "w");
|
|
if (fp == NULL) {
|
|
err = errno;
|
|
r = cancel_receive ();
|
|
errno = err;
|
|
if (r != -2) reply_with_perror ("%s", cmd);
|
|
free (cmd);
|
|
return -1;
|
|
}
|
|
free (cmd);
|
|
|
|
/* The semantics of fwrite are too undefined, so write to the
|
|
* file descriptor directly instead.
|
|
*/
|
|
int fd = fileno (fp);
|
|
|
|
r = receive_file (write_cb, &fd);
|
|
if (r == -1) { /* write error */
|
|
if (cancel_receive () != -2)
|
|
reply_with_error ("write error on directory: %s", dir);
|
|
pclose (fp);
|
|
return -1;
|
|
}
|
|
if (r == -2) { /* cancellation from library */
|
|
pclose (fp);
|
|
/* Do NOT send any error. */
|
|
return -1;
|
|
}
|
|
|
|
if (pclose (fp) != 0) {
|
|
if (r == -1) /* if r == 0, file transfer ended already */
|
|
r = cancel_receive ();
|
|
if (r != -2)
|
|
reply_with_error ("tar subcommand failed on directory: %s", dir);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Has one FileOut parameter. */
|
|
int
|
|
do_tar_out (const char *dir)
|
|
{
|
|
int r;
|
|
FILE *fp;
|
|
char *cmd;
|
|
char buf[GUESTFS_MAX_CHUNK_SIZE];
|
|
|
|
/* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */
|
|
if (asprintf_nowarn (&cmd, "tar -C %R -cf - .", dir) == -1) {
|
|
reply_with_perror ("asprintf");
|
|
return -1;
|
|
}
|
|
|
|
if (verbose)
|
|
fprintf (stderr, "%s\n", cmd);
|
|
|
|
fp = popen (cmd, "r");
|
|
if (fp == NULL) {
|
|
reply_with_perror ("%s", cmd);
|
|
free (cmd);
|
|
return -1;
|
|
}
|
|
free (cmd);
|
|
|
|
/* Now we must send the reply message, before the file contents. After
|
|
* this there is no opportunity in the protocol to send any error
|
|
* message back. Instead we can only cancel the transfer.
|
|
*/
|
|
reply (NULL, NULL);
|
|
|
|
while ((r = fread (buf, 1, sizeof buf, fp)) > 0) {
|
|
if (send_file_write (buf, r) < 0) {
|
|
pclose (fp);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if (ferror (fp)) {
|
|
perror (dir);
|
|
send_file_end (1); /* Cancel. */
|
|
pclose (fp);
|
|
return -1;
|
|
}
|
|
|
|
if (pclose (fp) != 0) {
|
|
perror (dir);
|
|
send_file_end (1); /* Cancel. */
|
|
return -1;
|
|
}
|
|
|
|
if (send_file_end (0)) /* Normal end of file. */
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Has one FileIn parameter. */
|
|
static int
|
|
do_tXz_in (const char *dir, char filter)
|
|
{
|
|
int err, r;
|
|
FILE *fp;
|
|
char *cmd;
|
|
|
|
/* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
|
|
if (asprintf_nowarn (&cmd, "tar -C %R -%cxf -", dir, filter) == -1) {
|
|
err = errno;
|
|
r = cancel_receive ();
|
|
errno = err;
|
|
if (r != -2) reply_with_perror ("asprintf");
|
|
return -1;
|
|
}
|
|
|
|
if (verbose)
|
|
fprintf (stderr, "%s\n", cmd);
|
|
|
|
fp = popen (cmd, "w");
|
|
if (fp == NULL) {
|
|
err = errno;
|
|
r = cancel_receive ();
|
|
errno = err;
|
|
if (r != -2) reply_with_perror ("%s", cmd);
|
|
free (cmd);
|
|
return -1;
|
|
}
|
|
free (cmd);
|
|
|
|
int fd = fileno (fp);
|
|
|
|
r = receive_file (write_cb, &fd);
|
|
if (r == -1) { /* write error */
|
|
r = cancel_receive ();
|
|
if (r != -2) reply_with_error ("write error on directory: %s", dir);
|
|
pclose (fp);
|
|
return -1;
|
|
}
|
|
if (r == -2) { /* cancellation from library */
|
|
pclose (fp);
|
|
/* Do NOT send any error. */
|
|
return -1;
|
|
}
|
|
|
|
if (pclose (fp) != 0) {
|
|
if (r == -1) /* if r == 0, file transfer ended already */
|
|
r = cancel_receive ();
|
|
if (r != -2)
|
|
reply_with_error ("tar subcommand failed on directory: %s", dir);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Has one FileIn parameter. */
|
|
int
|
|
do_tgz_in (const char *dir)
|
|
{
|
|
return do_tXz_in (dir, 'z');
|
|
}
|
|
|
|
/* Has one FileIn parameter. */
|
|
int
|
|
do_txz_in (const char *dir)
|
|
{
|
|
return do_tXz_in (dir, 'J');
|
|
}
|
|
|
|
/* Has one FileOut parameter. */
|
|
static int
|
|
do_tXz_out (const char *dir, char filter)
|
|
{
|
|
int r;
|
|
FILE *fp;
|
|
char *cmd;
|
|
char buf[GUESTFS_MAX_CHUNK_SIZE];
|
|
|
|
/* "tar -C /sysroot%s -zcf - ." but we have to quote the dir. */
|
|
if (asprintf_nowarn (&cmd, "tar -C %R -%ccf - .", dir, filter) == -1) {
|
|
reply_with_perror ("asprintf");
|
|
return -1;
|
|
}
|
|
|
|
if (verbose)
|
|
fprintf (stderr, "%s\n", cmd);
|
|
|
|
fp = popen (cmd, "r");
|
|
if (fp == NULL) {
|
|
reply_with_perror ("%s", cmd);
|
|
free (cmd);
|
|
return -1;
|
|
}
|
|
free (cmd);
|
|
|
|
/* Now we must send the reply message, before the file contents. After
|
|
* this there is no opportunity in the protocol to send any error
|
|
* message back. Instead we can only cancel the transfer.
|
|
*/
|
|
reply (NULL, NULL);
|
|
|
|
while ((r = fread (buf, 1, sizeof buf, fp)) > 0) {
|
|
if (send_file_write (buf, r) < 0) {
|
|
pclose (fp);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if (ferror (fp)) {
|
|
perror (dir);
|
|
send_file_end (1); /* Cancel. */
|
|
pclose (fp);
|
|
return -1;
|
|
}
|
|
|
|
if (pclose (fp) != 0) {
|
|
perror (dir);
|
|
send_file_end (1); /* Cancel. */
|
|
return -1;
|
|
}
|
|
|
|
if (send_file_end (0)) /* Normal end of file. */
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Has one FileOut parameter. */
|
|
int
|
|
do_tgz_out (const char *dir)
|
|
{
|
|
return do_tXz_out (dir, 'z');
|
|
}
|
|
|
|
/* Has one FileOut parameter. */
|
|
int
|
|
do_txz_out (const char *dir)
|
|
{
|
|
return do_tXz_out (dir, 'J');
|
|
}
|