mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-22 09:57:34 +00:00
Code Issues Releases Wiki Activity

postfix-3.7-20211113

Browse Source
This commit is contained in:
Wietse Venema 2021-11-13 00:00:00 -05:00 committed by Viktor Dukhovni
parent a57e142945
commit 3f519af4f1
9 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
postfix/HISTORY
View File

@ -25919,3 +25919,13 @@ Apologies for any names omitted.
Additional postcat flags for debuging a corrupted queue
file (-s: skip to offset; -r: don't follow pointer records).
File: postcat/postcat.c.
20211110
Minor edits of 20211107 postcat changes. File: postcat.c.
Regression prevention: added sanity check in the queue file
editing code. File: cleanup/cleanup_body_edit.c
Regression prevention: copied a queue file record typecheck
from the pickup daemon. Files: *qmgr/qmgr_message.c.

4
postfix/WISHLIST
View File

@ -1,7 +1,7 @@
Wish list:
Fix the body_edit_lockout safety: turn it on when editing,
and turn if off when done.
proxy_read_maps needs a dedicated matcher that looks
inside pipemap:{}. Maybe steal some code from postconf.
Add a pointer to
http://mmogilvi.users.sourceforge.net/software/oauthbearer.html

20
postfix/html/postcat.1.html
View File

@ -55,12 +55,14 @@ POSTCAT(1) POSTCAT(1)
<b>-r</b> Print records in file order, don't follow pointer records.
This feature is available in Postfix 3.7 and later. IP "<b>-s</b> <i>off-</i>
<i>set</i>" Skip to the specified queue file offset.
This feature is available in Postfix 3.7 and later.
This feature is available in Postfix 2.0 and later.
<b>-s</b> <i>offset</i>
Skip to the specified queue file offset.
<b>-v</b> Enable verbose logging for debugging purposes. Multiple <b>-v</b>
This feature is available in Postfix 3.7 and later.
<b>-v</b> Enable verbose logging for debugging purposes. Multiple <b>-v</b>
options make the software increasingly verbose.
<b>DIAGNOSTICS</b>
@ -71,19 +73,19 @@ POSTCAT(1) POSTCAT(1)
Directory with Postfix configuration files.
<b>CONFIGURATION PARAMETERS</b>
The following <a href="postconf.5.html"><b>main.cf</b></a> parameters are especially relevant to this pro-
The following <a href="postconf.5.html"><b>main.cf</b></a> parameters are especially relevant to this pro-
gram.
The text below provides only a parameter summary. See <a href="postconf.5.html"><b>postconf</b>(5)</a> for
The text below provides only a parameter summary. See <a href="postconf.5.html"><b>postconf</b>(5)</a> for
more details including examples.
<b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
The default location of the Postfix <a href="postconf.5.html">main.cf</a> and <a href="master.5.html">master.cf</a> con-
The default location of the Postfix <a href="postconf.5.html">main.cf</a> and <a href="master.5.html">master.cf</a> con-
figuration files.
<b><a href="postconf.5.html#import_environment">import_environment</a> (see 'postconf -d' output)</b>
The list of environment parameters that a privileged Postfix
process will import from a non-Postfix parent process, or
The list of environment parameters that a privileged Postfix
process will import from a non-Postfix parent process, or
name=value environment overrides.
<b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b>

4
postfix/man/man1/postcat.1
View File

@ -56,10 +56,10 @@ This feature is available in Postfix 2.0 and later.
Print records in file order, don't follow pointer records.
This feature is available in Postfix 3.7 and later.
IP "\fB-s \fIoffset\fR"
.IP "\fB\-s \fIoffset\fR"
Skip to the specified queue file offset.
This feature is available in Postfix 2.0 and later.
This feature is available in Postfix 3.7 and later.
.IP \fB\-v\fR
Enable verbose logging for debugging purposes. Multiple \fB\-v\fR
options make the software increasingly verbose.

7
postfix/src/cleanup/cleanup_body_edit.c
View File

@ -210,6 +210,13 @@ int cleanup_body_edit_write(CLEANUP_STATE *state, int rec_type,
CLEANUP_OUT_BUF(state, rec_type, buf);
curr_rp->write_offs = vstream_ftell(state->dst);
/*
* Sanity check.
*/
if (curr_rp->len > 0
&& curr_rp->write_offs > curr_rp->start + curr_rp->len)
msg_panic("%s: write past end of body segment", myname);
return (0);
}

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
#define MAIL_RELEASE_DATE "20211107"
#define MAIL_RELEASE_DATE "20211113"
#define MAIL_VERSION_NUMBER "3.7"
#ifdef SNAPSHOT

13
postfix/src/oqmgr/qmgr_message.c
View File

@ -324,6 +324,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
char *dsn_orcpt = 0;
int n;
int have_log_client_attr = 0;
static const char env_rec_types[] = REC_TYPE_ENVELOPE REC_TYPE_EXTRACT;
static const char extra_rec_type[] = {REC_TYPE_XTRA, 0};
const char *expected_rec_types;
/*
* Initialize. No early returns or we have a memory leak.
@ -371,12 +374,14 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
* mailing lists.
*/
for (;;) {
expected_rec_types = env_rec_types;
if ((curr_offset = vstream_ftell(message->fp)) < 0)
msg_fatal("vstream_ftell %s: %m", VSTREAM_PATH(message->fp));
if (curr_offset == message->data_offset && curr_offset > 0) {
if (vstream_fseek(message->fp, message->data_size, SEEK_CUR) < 0)
msg_fatal("seek file %s: %m", VSTREAM_PATH(message->fp));
curr_offset += message->data_size;
expected_rec_types = extra_rec_type;
}
rec_type = rec_get_raw(message->fp, buf, 0, REC_FLAG_NONE);
start = vstring_str(buf);
@ -393,6 +398,12 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
message->queue_id);
break;
}
if (strchr(expected_rec_types, rec_type) == 0) {
msg_warn("Unexpected record type '%c' at offset %ld",
rec_type, (long) curr_offset);
rec_type = REC_TYPE_ERROR;
break;
}
if (rec_type == REC_TYPE_END) {
message->rflags |= QMGR_READ_FLAG_SEEN_ALL_NON_RCPT;
break;
@ -406,7 +417,7 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
*/
if (rec_type == REC_TYPE_ATTR) {
if ((error_text = split_nameval(start, &name, &value)) != 0) {
msg_warn("%s: ignoring bad attribute: %s: %.200s",
msg_warn("%s: bad attribute record: %s: %.200s",
message->queue_id, error_text, start);
rec_type = REC_TYPE_ERROR;
break;

11
postfix/src/postcat/postcat.c
View File

@ -46,14 +46,14 @@
/* of taking the names literally.
/*
/* This feature is available in Postfix 2.0 and later.
/*.IP \fB-r\fR
/* .IP \fB-r\fR
/* Print records in file order, don't follow pointer records.
/*
/* This feature is available in Postfix 3.7 and later.
/* IP "\fB-s \fIoffset\fR"
/* .IP "\fB-s \fIoffset\fR"
/* Skip to the specified queue file offset.
/*
/* This feature is available in Postfix 2.0 and later.
/* This feature is available in Postfix 3.7 and later.
/* .IP \fB-v\fR
/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR
/* options make the software increasingly verbose.
@ -204,8 +204,7 @@ static void postcat(VSTREAM *fp, VSTRING *buffer, int flags)
/*
* See if this is a plausible file.
*/
if (start_offset == 0 && (flags & PC_FLAG_RAW) == 0
&& (ch = VSTREAM_GETC(fp)) != VSTREAM_EOF) {
if (start_offset == 0 && (ch = VSTREAM_GETC(fp)) != VSTREAM_EOF) {
if (!strchr(REC_TYPE_ENVELOPE, ch)) {
msg_warn("%s: input is not a valid queue file", VSTREAM_PATH(fp));
return;
@ -519,7 +518,7 @@ int main(int argc, char **argv)
flags |= PC_FLAG_RAW;
break;
case 's':
if (!alldig(optarg) || (start_offset = atol(optarg)) <= 0)
if (!alldig(optarg) || (start_offset = atol(optarg)) < 0)
msg_fatal("bad offset: %s", optarg);
break;
case 'v':

13
postfix/src/qmgr/qmgr_message.c
View File

@ -347,6 +347,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
char *dsn_orcpt = 0;
int n;
int have_log_client_attr = 0;
static const char env_rec_types[] = REC_TYPE_ENVELOPE REC_TYPE_EXTRACT;
static const char extra_rec_type[] = {REC_TYPE_XTRA, 0};
const char *expected_rec_types;
/*
* Initialize. No early returns or we have a memory leak.
@ -411,12 +414,14 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
* mailing lists.
*/
for (;;) {
expected_rec_types = env_rec_types;
if ((curr_offset = vstream_ftell(message->fp)) < 0)
msg_fatal("vstream_ftell %s: %m", VSTREAM_PATH(message->fp));
if (curr_offset == message->data_offset && curr_offset > 0) {
if (vstream_fseek(message->fp, message->data_size, SEEK_CUR) < 0)
msg_fatal("seek file %s: %m", VSTREAM_PATH(message->fp));
curr_offset += message->data_size;
expected_rec_types = extra_rec_type;
}
rec_type = rec_get_raw(message->fp, buf, 0, REC_FLAG_NONE);
start = vstring_str(buf);
@ -433,6 +438,12 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
message->queue_id);
break;
}
if (strchr(expected_rec_types, rec_type) == 0) {
msg_warn("Unexpected record type '%c' at offset %ld",
rec_type, (long) curr_offset);
rec_type = REC_TYPE_ERROR;
break;
}
if (rec_type == REC_TYPE_END) {
message->rflags |= QMGR_READ_FLAG_SEEN_ALL_NON_RCPT;
break;
@ -446,7 +457,7 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
*/
if (rec_type == REC_TYPE_ATTR) {
if ((error_text = split_nameval(start, &name, &value)) != 0) {
msg_warn("%s: ignoring bad attribute: %s: %.200s",
msg_warn("%s: bad attribute record: %s: %.200s",
message->queue_id, error_text, start);
rec_type = REC_TYPE_ERROR;
break;