Skip to content

Commit

Permalink
More fixes/tweaks for Bug#4035.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Castaglia
Castaglia committed Oct 6, 2014
1 parent 644f803 commit daf72cc
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 18 deletions.
8 changes: 5 additions & 3 deletions contrib/mod_sftp/fxp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2751,9 +2751,11 @@ static int fxp_handle_abort(const void *key_data, size_t key_datasz,
"removing aborted uploaded file '%s'", curr_path);

if (pr_fsio_unlink(curr_path) < 0) {
(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
"error unlinking file '%s': %s", curr_path,
strerror(errno));
if (errno != ENOENT) {
(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
"error unlinking file '%s': %s", curr_path,
strerror(errno));
}
}
}
}
Expand Down
12 changes: 9 additions & 3 deletions modules/mod_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,24 @@ static unsigned long core_exceeded_cmd_rate(cmd_rec *cmd) {
}

static int core_idle_timeout_cb(CALLBACK_FRAME) {
int timeout;

timeout = pr_data_get_timeout(PR_DATA_TIMEOUT_IDLE);

/* We don't want to quit in the middle of a transfer */
if (session.sf_flags & SF_XFER) {

pr_trace_msg("timer", 4,
"TimeoutIdle (%d %s) reached, but data transfer in progress, ignoring",
timeout, timeout != 1 ? "seconds" : "second");

/* Restart the timer. */
return 1;
}

pr_event_generate("core.timeout-idle", NULL);

pr_response_send_async(R_421,
_("Idle timeout (%d seconds): closing control connection"),
pr_data_get_timeout(PR_DATA_TIMEOUT_IDLE));
_("Idle timeout (%d seconds): closing control connection"), timeout);

pr_timer_remove(PR_TIMER_LOGIN, ANY_MODULE);
pr_timer_remove(PR_TIMER_NOXFER, ANY_MODULE);
Expand Down
70 changes: 58 additions & 12 deletions modules/mod_xfer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,8 +956,9 @@ static void stor_abort(void) {
stor_fh = NULL;
}

delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);

if (session.xfer.xfer_type == STOR_HIDDEN) {
delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);
if (delete_stores == NULL ||
*delete_stores == TRUE) {
/* If a hidden store was aborted, remove only hidden file, not real
Expand All @@ -966,16 +967,24 @@ static void stor_abort(void) {
if (session.xfer.path_hidden) {
pr_log_debug(DEBUG5, "removing aborted HiddenStores file '%s'",
session.xfer.path_hidden);
pr_fsio_unlink(session.xfer.path_hidden);
if (pr_fsio_unlink(session.xfer.path_hidden) < 0) {
if (errno != ENOENT) {
pr_log_debug(DEBUG0, "error deleting HiddenStores file '%s': %s",
session.xfer.path_hidden, strerror(errno));
}
}
}
}
}

} else if (session.xfer.path) {
delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);
if (session.xfer.path) {
if (delete_stores == NULL ||
*delete_stores == TRUE) {
pr_log_debug(DEBUG5, "removing aborted file '%s'", session.xfer.path);
pr_fsio_unlink(session.xfer.path);
if (pr_fsio_unlink(session.xfer.path) < 0) {
pr_log_debug(DEBUG0, "error deleting aborted file '%s': %s",
session.xfer.path, strerror(errno));
}
}
}

Expand All @@ -998,7 +1007,12 @@ static int stor_complete(void) {
if (session.xfer.path_hidden) {
pr_log_debug(DEBUG5, "failed to close HiddenStores file '%s', removing",
session.xfer.path_hidden);
pr_fsio_unlink(session.xfer.path_hidden);
if (pr_fsio_unlink(session.xfer.path_hidden) < 0) {
if (errno != ENOENT) {
pr_log_debug(DEBUG0, "error deleting HiddenStores file '%s': %s",
session.xfer.path_hidden, strerror(errno));
}
}
}
}

Expand Down Expand Up @@ -1863,7 +1877,7 @@ MODRET xfer_stor(cmd_rec *cmd) {

if (session.xfer.path &&
session.xfer.path_hidden) {
if (pr_fsio_rename(session.xfer.path_hidden, session.xfer.path) != 0) {
if (pr_fsio_rename(session.xfer.path_hidden, session.xfer.path) < 0) {
int xerrno = errno;

/* This should only fail on a race condition with a chmod/chown
Expand All @@ -1877,11 +1891,19 @@ MODRET xfer_stor(cmd_rec *cmd) {
pr_response_add_err(R_550, _("%s: Rename of hidden file %s failed: %s"),
session.xfer.path, session.xfer.path_hidden, strerror(xerrno));

pr_fsio_unlink(session.xfer.path_hidden);
if (pr_fsio_unlink(session.xfer.path_hidden) < 0) {
if (errno != ENOENT) {
pr_log_debug(DEBUG0, "failed to delete HiddenStores file '%s': %s",
session.xfer.path_hidden, strerror(errno));
}
}

errno = xerrno;
return PR_ERROR(cmd);
}

/* One way or another, we've dealt with the HiddenStores file. */
session.xfer.path_hidden = NULL;
}

if (xfer_displayfile() < 0) {
Expand Down Expand Up @@ -2464,6 +2486,27 @@ MODRET xfer_smnt(cmd_rec *cmd) {
}

MODRET xfer_err_cleanup(cmd_rec *cmd) {

/* If a hidden store was aborted, remove it. */
if (session.xfer.xfer_type == STOR_HIDDEN) {
unsigned char *delete_stores = NULL;

delete_stores = get_param_ptr(CURRENT_CONF, "DeleteAbortedStores", FALSE);
if (delete_stores == NULL ||
*delete_stores == TRUE) {
if (session.xfer.path_hidden) {
pr_log_debug(DEBUG5, "removing aborted HiddenStores file '%s'",
session.xfer.path_hidden);
if (pr_fsio_unlink(session.xfer.path_hidden) < 0) {
if (errno != ENOENT) {
pr_log_debug(DEBUG0, "error deleting HiddenStores file '%s': %s",
session.xfer.path_hidden, strerror(errno));
}
}
}
}
}

pr_data_clear_xfer_pool();

memset(&session.xfer, '\0', sizeof(session.xfer));
Expand Down Expand Up @@ -2511,17 +2554,20 @@ static int noxfer_timeout_cb(CALLBACK_FRAME) {
int timeout;
const char *proto;

timeout = pr_data_get_timeout(PR_DATA_TIMEOUT_NO_TRANSFER);

if (session.sf_flags & SF_XFER) {
pr_trace_msg("timer", 4,
"TimeoutNoTransfer (%d %s) reached, but data transfer in progress, "
"ignoring", timeout, timeout != 1 ? "seconds" : "second");

/* Transfer in progress, ignore this timeout */
return 1;
}

timeout = pr_data_get_timeout(PR_DATA_TIMEOUT_NO_TRANSFER);

pr_event_generate("core.timeout-no-transfer", NULL);
pr_response_send_async(R_421,
_("No transfer timeout (%d %s): closing control connection"),
timeout, timeout != 1 ? "seconds" : "second");
_("No transfer timeout (%d seconds): closing control connection"), timeout);

pr_timer_remove(PR_TIMER_IDLE, ANY_MODULE);
pr_timer_remove(PR_TIMER_LOGIN, ANY_MODULE);
Expand Down

0 comments on commit daf72cc

Please sign in to comment.