Drop first header requirement for qmail/Postfix

pull/194/merge
M66B 3 years ago
parent cbb272b787
commit bfe1d1fbad

@ -4497,8 +4497,8 @@ To show shields, the option *Show authentication status indicator* in the displa
A message will be consired safely transported if *every* [Received](https://datatracker.ietf.org/doc/html/rfc2821#section-4.4) header: A message will be consired safely transported if *every* [Received](https://datatracker.ietf.org/doc/html/rfc2821#section-4.4) header:
* contains the phrase 'using TLS', 'via HTTP', 'version=TLS' * contains the phrase 'using TLS', 'via HTTP', 'version=TLS'
* contains the phrase '(qmail <nnn> invoked by uid <nnn>)' in the first added header * contains the phrase '(qmail <nnn> invoked by uid <nnn>)'
* contains the phrase '(Postfix, from userid nnn)' in the first added header * contains the phrase '(Postfix, from userid nnn)'
* has a *by* with a local address * has a *by* with a local address
* has a *by* xxx.google.com * has a *by* xxx.google.com
* has a *from* with a local address * has a *from* with a local address

@ -2185,9 +2185,8 @@ public class MessageHelper {
// (qmail nnn invoked by uid nnn); 1 Jan 2022 00:00:00 -0000 // (qmail nnn invoked by uid nnn); 1 Jan 2022 00:00:00 -0000
// by <host name> (Postfix, from userid nnn) // by <host name> (Postfix, from userid nnn)
if (first && if (header.matches(".*\\(qmail \\d+ invoked by uid \\d+\\).*") ||
(header.matches(".*\\(qmail \\d+ invoked by uid \\d+\\).*") || header.matches(".*\\(Postfix, from userid \\d+\\).*")) {
header.matches(".*\\(Postfix, from userid \\d+\\).*"))) {
Log.i("--- phrase"); Log.i("--- phrase");
return true; return true;
} }

Loading…
Cancel
Save