git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle a v4mapped sender address given us by a proxy. Bug 2855
[exim.git]
/
src
/
src
/
spool_out.c
diff --git
a/src/src/spool_out.c
b/src/src/spool_out.c
index 4539e3c697f0f8d5149024d3b08e55db5f554c44..510eda6c1e9ab6ea976bf60c9d107fe28a7790bb 100644
(file)
--- a/
src/src/spool_out.c
+++ b/
src/src/spool_out.c
@@
-2,8
+2,8
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing spool files, and moving them about. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing spool files, and moving them about. */
@@
-105,11
+105,29
@@
return fd;
+static const uschar *
+zap_newlines(const uschar *s)
+{
+uschar *z, *p;
+
+if (Ustrchr(s, '\n') == NULL) return s;
+
+p = z = string_copy(s);
+while ((p = Ustrchr(p, '\n')) != NULL) *p++ = ' ';
+return z;
+}
+
static void
spool_var_write(FILE * fp, const uschar * name, const uschar * val)
{
static void
spool_var_write(FILE * fp, const uschar * name, const uschar * val)
{
-if (is_tainted(val)) putc('-', fp);
-fprintf(fp, "-%s %s\n", name, val);
+putc('-', fp);
+if (is_tainted(val))
+ {
+ int q = quoter_for_address(val);
+ putc('-', fp);
+ if (is_real_quoter(q)) fprintf(fp, "(%s)", lookup_list[q]->name);
+ }
+fprintf(fp, "%s %s\n", name, val);
}
/*************************************************
}
/*************************************************
@@
-162,6
+180,8
@@
fprintf(fp, "<%s>\n", sender_address);
fprintf(fp, "%d %d\n", (int)received_time.tv_sec, warning_count);
fprintf(fp, "-received_time_usec .%06d\n", (int)received_time.tv_usec);
fprintf(fp, "%d %d\n", (int)received_time.tv_sec, warning_count);
fprintf(fp, "-received_time_usec .%06d\n", (int)received_time.tv_usec);
+fprintf(fp, "-received_time_complete %d.%06d\n",
+ (int)received_time_complete.tv_sec, (int)received_time_complete.tv_usec);
/* If there is information about a sending host, remember it. The HELO
data can be set for local SMTP as well as remote. */
/* If there is information about a sending host, remember it. The HELO
data can be set for local SMTP as well as remote. */
@@
-171,19
+191,21
@@
if (sender_helo_name) spool_var_write(fp, US"helo_name", sender_helo_name);
if (sender_host_address)
{
if (is_tainted(sender_host_address)) putc('-', fp);
if (sender_host_address)
{
if (is_tainted(sender_host_address)) putc('-', fp);
- fprintf(fp, "-host_address
%s.
%d\n", sender_host_address, sender_host_port);
+ fprintf(fp, "-host_address
[%s]:
%d\n", sender_host_address, sender_host_port);
if (sender_host_name)
spool_var_write(fp, US"host_name", sender_host_name);
if (sender_host_name)
spool_var_write(fp, US"host_name", sender_host_name);
- if (sender_host_authenticated)
- spool_var_write(fp, US"host_auth", sender_host_authenticated);
}
}
+if (sender_host_authenticated)
+ spool_var_write(fp, US"host_auth", sender_host_authenticated);
+if (sender_host_auth_pubname)
+ spool_var_write(fp, US"host_auth_pubname", sender_host_auth_pubname);
/* Also about the interface a message came in on */
if (interface_address)
{
if (is_tainted(interface_address)) putc('-', fp);
/* Also about the interface a message came in on */
if (interface_address)
{
if (is_tainted(interface_address)) putc('-', fp);
- fprintf(fp, "-interface_address
%s.
%d\n", interface_address, interface_port);
+ fprintf(fp, "-interface_address
[%s]:
%d\n", interface_address, interface_port);
}
if (smtp_active_hostname != primary_hostname)
}
if (smtp_active_hostname != primary_hostname)
@@
-208,6
+230,12
@@
tree_walk(acl_var_m, &acl_var_write, fp);
/* Now any other data that needs to be remembered. */
/* Now any other data that needs to be remembered. */
+if (*debuglog_name)
+ {
+ fprintf(fp, "-debug_selector 0x%x\n", debug_selector);
+ fprintf(fp, "-debuglog_name %s\n", debuglog_name);
+ }
+
if (f.spool_file_wireformat)
fprintf(fp, "-spool_file_wireformat\n");
else
if (f.spool_file_wireformat)
fprintf(fp, "-spool_file_wireformat\n");
else
@@
-219,7
+247,7
@@
if (body_zerocount > 0) fprintf(fp, "-body_zerocount %d\n", body_zerocount);
if (authenticated_id)
spool_var_write(fp, US"auth_id", authenticated_id);
if (authenticated_sender)
if (authenticated_id)
spool_var_write(fp, US"auth_id", authenticated_id);
if (authenticated_sender)
- spool_var_write(fp, US"auth_sender",
authenticated_sender
);
+ spool_var_write(fp, US"auth_sender",
zap_newlines(authenticated_sender)
);
if (f.allow_unqualified_recipient) fprintf(fp, "-allow_unqualified_recipient\n");
if (f.allow_unqualified_sender) fprintf(fp, "-allow_unqualified_sender\n");
if (f.allow_unqualified_recipient) fprintf(fp, "-allow_unqualified_recipient\n");
if (f.allow_unqualified_sender) fprintf(fp, "-allow_unqualified_sender\n");
@@
-292,19
+320,20
@@
fprintf(fp, "%d\n", recipients_count);
for (int i = 0; i < recipients_count; i++)
{
recipient_item *r = recipients_list + i;
for (int i = 0; i < recipients_count; i++)
{
recipient_item *r = recipients_list + i;
+ const uschar *address = zap_newlines(r->address);
/* DEBUG(D_deliver) debug_printf("DSN: Flags: 0x%x\n", r->dsn_flags); */
if (r->pno < 0 && !r->errors_to && r->dsn_flags == 0)
/* DEBUG(D_deliver) debug_printf("DSN: Flags: 0x%x\n", r->dsn_flags); */
if (r->pno < 0 && !r->errors_to && r->dsn_flags == 0)
- fprintf(fp, "%s\n",
r->
address);
+ fprintf(fp, "%s\n", address);
else
{
else
{
-
uschar * errors_to = r->errors_to ? r->errors_to :
US"";
+
const uschar *errors_to = r->errors_to ? zap_newlines(r->errors_to) : C
US"";
/* for DSN SUPPORT extend exim 4 spool in a compatible way by
adding new values upfront and add flag 0x02 */
/* for DSN SUPPORT extend exim 4 spool in a compatible way by
adding new values upfront and add flag 0x02 */
-
uschar * orcpt = r->orcpt ? r->orcpt :
US"";
+
const uschar *orcpt = r->orcpt ? zap_newlines(r->orcpt) : C
US"";
- fprintf(fp, "%s %s %d,%d %s %d,%d#3\n",
r->
address, orcpt, Ustrlen(orcpt),
+ fprintf(fp, "%s %s %d,%d %s %d,%d#3\n", address, orcpt, Ustrlen(orcpt),
r->dsn_flags, errors_to, Ustrlen(errors_to), r->pno);
}
r->dsn_flags, errors_to, Ustrlen(errors_to), r->pno);
}
@@
-506,7
+535,7
@@
spool_move_message(uschar *id, uschar *subdir, uschar *from, uschar *to)
uschar * dest_qname = queue_name_dest ? queue_name_dest : queue_name;
/* Since we are working within the spool, de-taint the dest queue name */
uschar * dest_qname = queue_name_dest ? queue_name_dest : queue_name;
/* Since we are working within the spool, de-taint the dest queue name */
-dest_qname = string_copy_taint(dest_qname,
FALSE
);
+dest_qname = string_copy_taint(dest_qname,
GET_UNTAINTED
);
/* Create any output directories that do not exist. */
/* Create any output directories that do not exist. */