X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9242a7e8cfa94bbc9dd7eca6bd651b569b871c4e..a85c067ba6c6940512cf57ec213277a370d87e70:/src/src/transports/queuefile.c diff --git a/src/src/transports/queuefile.c b/src/src/transports/queuefile.c index 4a74c752a..3a2bae22f 100644 --- a/src/src/transports/queuefile.c +++ b/src/src/transports/queuefile.c @@ -4,13 +4,21 @@ /* Copyright (c) Andrew Colin Kissa 2016 */ /* Copyright (c) University of Cambridge 2016 */ -/* Copyright (c) The Exim Maintainers 2017 */ +/* Copyright (c) The Exim Maintainers 1995 - 2021 */ /* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include "../exim.h" + +#ifdef EXPERIMENTAL_QUEUEFILE /* whole file */ #include "queuefile.h" +#ifndef EXIM_HAVE_OPENAT +# error queuefile transport reqires openat() support +#endif + /* Options specific to the appendfile transport. They must be in alphabetic order (note that "_" comes before the lower case letters). Some of them are stored in the publicly visible instance block - these are flagged with the @@ -18,7 +26,7 @@ opt_public flag. */ optionlist queuefile_transport_options[] = { { "directory", opt_stringptr, - (void *)offsetof(queuefile_transport_options_block, dirname) }, + OPT_OFF(queuefile_transport_options_block, dirname) }, }; @@ -74,14 +82,13 @@ copy_spool_file(int dst, int src) { int i, j; uschar buffer[16384]; -uschar * s; if (lseek(src, 0, SEEK_SET) != 0) return FALSE; do if ((j = read(src, buffer, sizeof(buffer))) > 0) - for (s = buffer; (i = write(dst, s, j)) != j; s += i, j -= i) + for (uschar * s = buffer; (i = write(dst, s, j)) != j; s += i, j -= i) if (i < 0) return FALSE; else if (j < 0) @@ -96,6 +103,7 @@ and data files to the destination directory Arguments: tb the transport block addr address_item being processed + dstpath destination directory name sdfd int Source directory fd ddfd int Destination directory fd link_file BOOL use linkat instead of data copy @@ -106,18 +114,16 @@ Returns: TRUE if all went well, FALSE otherwise static BOOL copy_spool_files(transport_instance * tb, address_item * addr, - int sdfd, int ddfd, BOOL link_file, int srcfd) + const uschar * dstpath, int sdfd, int ddfd, BOOL link_file, int srcfd) { BOOL is_hdr_file = srcfd < 0; const uschar * suffix = srcfd < 0 ? US"H" : US"D"; int dstfd; const uschar * filename = string_sprintf("%s-%s", message_id, suffix); const uschar * srcpath = spool_fname(US"input", message_subdir, message_id, suffix); -const uschar * dstpath = string_sprintf("%s/%s-%s", - ((queuefile_transport_options_block *) tb->options_block)->dirname, - message_id, suffix); -const uschar * s; -const uschar * op; +const uschar * s, * op; + +dstpath = string_sprintf("%s/%s-%s", dstpath, message_id, suffix); if (link_file) { @@ -136,11 +142,11 @@ else /* use data copy */ tb->name, srcpath, dstpath); if ( (s = dstpath, - (dstfd = openat(ddfd, CCS filename, O_RDWR|O_CREAT|O_EXCL, SPOOL_MODE)) + (dstfd = exim_openat4(ddfd, CCS filename, O_RDWR|O_CREAT|O_EXCL, SPOOL_MODE)) < 0 ) || is_hdr_file - && (s = srcpath, (srcfd = openat(sdfd, CCS filename, O_RDONLY)) < 0) + && (s = srcpath, (srcfd = exim_openat(sdfd, CCS filename, O_RDONLY)) < 0) ) op = US"opening"; @@ -175,7 +181,7 @@ queuefile_transport_options_block * ob = (queuefile_transport_options_block *) tblock->options_block; BOOL can_link; uschar * sourcedir = spool_dname(US"input", message_subdir); -uschar * s; +uschar * s, * dstdir; struct stat dstatbuf, sstatbuf; int ddfd = -1, sdfd = -1; @@ -189,18 +195,25 @@ DEBUG(D_transport) # define O_NOFOLLOW 0 #endif -if (ob->dirname[0] != '/') +if (!(dstdir = expand_string(ob->dirname))) + { + addr->message = string_sprintf("%s transport: failed to expand dirname option", + tblock->name); + addr->transport_return = DEFER; + return FALSE; + } +if (*dstdir != '/') { addr->transport_return = PANIC; addr->message = string_sprintf("%s transport directory: " - "%s is not absolute", tblock->name, ob->dirname); + "%s is not absolute", tblock->name, dstdir); return FALSE; } /* Open the source and destination directories and check if they are on the same filesystem, so we can hard-link files rather than copying. */ -if ( (s = ob->dirname, +if ( (s = dstdir, (ddfd = Uopen(s, O_RDONLY | O_DIRECTORY | O_NOFOLLOW, 0)) < 0) || (s = sourcedir, (sdfd = Uopen(sourcedir, O_RDONLY | O_DIRECTORY | O_NOFOLLOW, 0)) < 0) @@ -214,8 +227,8 @@ if ( (s = ob->dirname, return FALSE; } -if ( (s = ob->dirname, fstat(ddfd, &dstatbuf) < 0) - || (s = sourcedir, fstat(sdfd, &sstatbuf) < 0) +if ( (s = dstdir, fstat(ddfd, &dstatbuf) < 0) + || (s = sourcedir, fstat(sdfd, &sstatbuf) < 0) ) { addr->transport_return = PANIC; @@ -226,7 +239,7 @@ if ( (s = ob->dirname, fstat(ddfd, &dstatbuf) < 0) } can_link = (dstatbuf.st_dev == sstatbuf.st_dev); -if (dont_deliver) +if (f.dont_deliver) { DEBUG(D_transport) debug_printf("*** delivery by %s transport bypassed by -N option\n", @@ -240,18 +253,19 @@ if (dont_deliver) DEBUG(D_transport) debug_printf("%s transport, copying header file\n", tblock->name); -if (!copy_spool_files(tblock, addr, sdfd, ddfd, can_link, -1)) +if (!copy_spool_files(tblock, addr, dstdir, sdfd, ddfd, can_link, -1)) goto RETURN; DEBUG(D_transport) debug_printf("%s transport, copying data file\n", tblock->name); -if (!copy_spool_files(tblock, addr, sdfd, ddfd, can_link, deliver_datafile)) +if (!copy_spool_files(tblock, addr, dstdir, sdfd, ddfd, can_link, + deliver_datafile)) { DEBUG(D_transport) debug_printf("%s transport, copying data file failed, " "unlinking the header file\n", tblock->name); - Uunlink(string_sprintf("%s/%s-H", ob->dirname, message_id)); + Uunlink(string_sprintf("%s/%s-H", dstdir, message_id)); goto RETURN; } @@ -270,3 +284,4 @@ return FALSE; } #endif /*!MACRO_PREDEF*/ +#endif /*EXPERIMENTAL_QUEUEFILE*/