mirror of
https://github.com/mjl-/mox.git
synced 2025-07-14 18:14:38 +03:00
implement "requiretls", rfc 8689
with requiretls, the tls verification mode/rules for email deliveries can be changed by the sender/submitter. in two ways: 1. "requiretls" smtp extension to always enforce verified tls (with mta-sts or dnssec+dane), along the entire delivery path until delivery into the final destination mailbox (so entire transport is verified-tls-protected). 2. "tls-required: no" message header, to ignore any tls and tls verification errors even if the recipient domain has a policy that requires tls verification (mta-sts and/or dnssec+dane), allowing delivery of non-sensitive messages in case of misconfiguration/interoperability issues (at least useful for sending tls reports). we enable requiretls by default (only when tls is active), for smtp and submission. it can be disabled through the config. for each delivery attempt, we now store (per recipient domain, in the account of the sender) whether the smtp server supports starttls and requiretls. this support is shown (after having sent a first message) in the webmail when sending a message (the previous 3 bars under the address input field are now 5 bars, the first for starttls support, the last for requiretls support). when all recipient domains for a message are known to implement requiretls, requiretls is automatically selected for sending (instead of "default" tls behaviour). users can also select the "fallback to insecure" to add the "tls-required: no" header. new metrics are added for insight into requiretls errors and (some, not yet all) cases where tls-required-no ignored a tls/verification error. the admin can change the requiretls status for messages in the queue. so with default delivery attempts, when verified tls is required by failing, an admin could potentially change the field to "tls-required: no"-behaviour. messages received (over smtp) with the requiretls option, get a comment added to their Received header line, just before "id", after "with".
This commit is contained in:
Mechiel Lukkien
@ -16,6 +16,7 @@ import (
|
||||
"net/mail"
|
||||
"net/textproto"
|
||||
"os"
|
||||
"runtime/debug"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
@ -33,6 +34,7 @@ import (
|
||||
"github.com/mjl-/mox/dkim"
|
||||
"github.com/mjl-/mox/dns"
|
||||
"github.com/mjl-/mox/message"
|
||||
"github.com/mjl-/mox/metrics"
|
||||
"github.com/mjl-/mox/mlog"
|
||||
"github.com/mjl-/mox/mox-"
|
||||
"github.com/mjl-/mox/moxio"
|
||||
@ -162,6 +164,7 @@ type SubmitMessage struct {
|
||||
ResponseMessageID int64 // If set, this was a reply or forward, based on IsForward.
|
||||
ReplyTo string // If non-empty, Reply-To header to add to message.
|
||||
UserAgent string // User-Agent header added if not empty.
|
||||
RequireTLS *bool // For "Require TLS" extension during delivery.
|
||||
}
|
||||
|
||||
// ForwardAttachments references attachments by a list of message.Part paths.
|
||||
@ -522,6 +525,9 @@ func (w Webmail) MessageSubmit(ctx context.Context, m SubmitMessage) {
|
||||
if m.UserAgent != "" {
|
||||
header("User-Agent", m.UserAgent)
|
||||
}
|
||||
if m.RequireTLS != nil && !*m.RequireTLS {
|
||||
header("TLS-Required", "No")
|
||||
}
|
||||
header("MIME-Version", "1.0")
|
||||
|
||||
if len(m.Attachments) > 0 || len(m.ForwardAttachments.Paths) > 0 {
|
||||
@ -685,7 +691,7 @@ func (w Webmail) MessageSubmit(ctx context.Context, m SubmitMessage) {
|
||||
Localpart: rcpt.Localpart,
|
||||
IPDomain: dns.IPDomain{Domain: rcpt.Domain},
|
||||
}
|
||||
_, err := queue.Add(ctx, log, reqInfo.AccountName, fromPath, toPath, has8bit, smtputf8, msgSize, messageID, []byte(rcptMsgPrefix), dataFile, nil)
|
||||
_, err := queue.Add(ctx, log, reqInfo.AccountName, fromPath, toPath, has8bit, smtputf8, msgSize, messageID, []byte(rcptMsgPrefix), dataFile, nil, m.RequireTLS)
|
||||
if err != nil {
|
||||
metricSubmission.WithLabelValues("queueerror").Inc()
|
||||
}
|
||||
@ -1635,12 +1641,27 @@ const (
|
||||
SecurityResultUnknown SecurityResult = "unknown"
|
||||
)
|
||||
|
||||
// RecipientSecurity is a quick analysis of the security properties of delivery to the recipient (domain).
|
||||
// Fields are nil when an error occurred during analysis.
|
||||
// RecipientSecurity is a quick analysis of the security properties of delivery to
|
||||
// the recipient (domain).
|
||||
type RecipientSecurity struct {
|
||||
MTASTS SecurityResult // Whether we have a stored enforced MTA-STS policy, or domain has MTA-STS DNS record.
|
||||
DNSSEC SecurityResult // Whether MX lookup response was DNSSEC-signed.
|
||||
DANE SecurityResult // Whether first delivery destination has DANE records.
|
||||
// Whether recipient domain supports (opportunistic) STARTTLS, as seen during most
|
||||
// recent delivery attempt. Will be "unknown" if no delivery to the domain has been
|
||||
// attempted yet.
|
||||
STARTTLS SecurityResult
|
||||
|
||||
// Whether we have a stored enforced MTA-STS policy, or domain has MTA-STS DNS
|
||||
// record.
|
||||
MTASTS SecurityResult
|
||||
|
||||
// Whether MX lookup response was DNSSEC-signed.
|
||||
DNSSEC SecurityResult
|
||||
|
||||
// Whether first delivery destination has DANE records.
|
||||
DANE SecurityResult
|
||||
|
||||
// Whether recipient domain is known to implement the REQUIRETLS SMTP extension.
|
||||
// Will be "unknown" if no delivery to the domain has been attempted yet.
|
||||
RequireTLS SecurityResult
|
||||
}
|
||||
|
||||
// RecipientSecurity looks up security properties of the address in the
|
||||
@ -1650,6 +1671,18 @@ func (Webmail) RecipientSecurity(ctx context.Context, messageAddressee string) (
|
||||
return recipientSecurity(ctx, resolver, messageAddressee)
|
||||
}
|
||||
|
||||
// logPanic can be called with a defer from a goroutine to prevent the entire program from being shutdown in case of a panic.
|
||||
func logPanic(ctx context.Context) {
|
||||
x := recover()
|
||||
if x == nil {
|
||||
return
|
||||
}
|
||||
log := xlog.WithContext(ctx)
|
||||
log.Error("recover from panic", mlog.Field("panic", x))
|
||||
debug.PrintStack()
|
||||
metrics.PanicInc(metrics.Webmail)
|
||||
}
|
||||
|
||||
// separate function for testing with mocked resolver.
|
||||
func recipientSecurity(ctx context.Context, resolver dns.Resolver, messageAddressee string) (RecipientSecurity, error) {
|
||||
log := xlog.WithContext(ctx)
|
||||
@ -1658,6 +1691,8 @@ func recipientSecurity(ctx context.Context, resolver dns.Resolver, messageAddres
|
||||
SecurityResultUnknown,
|
||||
SecurityResultUnknown,
|
||||
SecurityResultUnknown,
|
||||
SecurityResultUnknown,
|
||||
SecurityResultUnknown,
|
||||
}
|
||||
|
||||
msgAddr, err := mail.ParseAddress(messageAddressee)
|
||||
@ -1675,6 +1710,7 @@ func recipientSecurity(ctx context.Context, resolver dns.Resolver, messageAddres
|
||||
// MTA-STS.
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer logPanic(ctx)
|
||||
defer wg.Done()
|
||||
|
||||
policy, _, err := mtastsdb.Get(ctx, resolver, addr.Domain)
|
||||
@ -1690,6 +1726,7 @@ func recipientSecurity(ctx context.Context, resolver dns.Resolver, messageAddres
|
||||
// DNSSEC and DANE.
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer logPanic(ctx)
|
||||
defer wg.Done()
|
||||
|
||||
_, origNextHopAuthentic, expandedNextHopAuthentic, _, hosts, _, err := smtpclient.GatherDestinations(ctx, log, resolver, dns.IPDomain{Domain: addr.Domain})
|
||||
@ -1737,7 +1774,51 @@ func recipientSecurity(ctx context.Context, resolver dns.Resolver, messageAddres
|
||||
}
|
||||
}()
|
||||
|
||||
// STARTTLS and RequireTLS
|
||||
reqInfo := ctx.Value(requestInfoCtxKey).(requestInfo)
|
||||
acc, err := store.OpenAccount(reqInfo.AccountName)
|
||||
xcheckf(ctx, err, "open account")
|
||||
defer func() {
|
||||
if acc != nil {
|
||||
err := acc.Close()
|
||||
log.Check(err, "closing account")
|
||||
}
|
||||
}()
|
||||
|
||||
err = acc.DB.Read(ctx, func(tx *bstore.Tx) error {
|
||||
q := bstore.QueryTx[store.RecipientDomainTLS](tx)
|
||||
q.FilterNonzero(store.RecipientDomainTLS{Domain: addr.Domain.Name()})
|
||||
rd, err := q.Get()
|
||||
if err == bstore.ErrAbsent {
|
||||
return nil
|
||||
} else if err != nil {
|
||||
rs.STARTTLS = SecurityResultError
|
||||
rs.RequireTLS = SecurityResultError
|
||||
log.Errorx("looking up recipient domain", err, mlog.Field("domain", addr.Domain))
|
||||
return nil
|
||||
}
|
||||
if rd.STARTTLS {
|
||||
rs.STARTTLS = SecurityResultYes
|
||||
} else {
|
||||
rs.STARTTLS = SecurityResultNo
|
||||
}
|
||||
if rd.RequireTLS {
|
||||
rs.RequireTLS = SecurityResultYes
|
||||
} else {
|
||||
rs.RequireTLS = SecurityResultNo
|
||||
}
|
||||
return nil
|
||||
})
|
||||
xcheckf(ctx, err, "lookup recipient domain")
|
||||
|
||||
// Close account as soon as possible, not after waiting for MTA-STS/DNSSEC/DANE
|
||||
// checks to complete, which can take a while.
|
||||
err = acc.Close()
|
||||
log.Check(err, "closing account")
|
||||
acc = nil
|
||||
|
||||
wg.Wait()
|
||||
|
||||
return rs, nil
|
||||
}
|
||||
|
||||
|
||||
@ -1090,6 +1090,14 @@
|
||||
"Typewords": [
|
||||
"string"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "RequireTLS",
|
||||
"Docs": "For \"Require TLS\" extension during delivery.",
|
||||
"Typewords": [
|
||||
"nullable",
|
||||
"bool"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -1256,8 +1264,15 @@
|
||||
},
|
||||
{
|
||||
"Name": "RecipientSecurity",
|
||||
"Docs": "RecipientSecurity is a quick analysis of the security properties of delivery to the recipient (domain).\nFields are nil when an error occurred during analysis.",
|
||||
"Docs": "RecipientSecurity is a quick analysis of the security properties of delivery to\nthe recipient (domain).",
|
||||
"Fields": [
|
||||
{
|
||||
"Name": "STARTTLS",
|
||||
"Docs": "Whether recipient domain supports (opportunistic) STARTTLS, as seen during most recent delivery attempt. Will be \"unknown\" if no delivery to the domain has been attempted yet.",
|
||||
"Typewords": [
|
||||
"SecurityResult"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "MTASTS",
|
||||
"Docs": "Whether we have a stored enforced MTA-STS policy, or domain has MTA-STS DNS record.",
|
||||
@ -1278,6 +1293,13 @@
|
||||
"Typewords": [
|
||||
"SecurityResult"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "RequireTLS",
|
||||
"Docs": "Whether recipient domain is known to implement the REQUIRETLS SMTP extension. Will be \"unknown\" if no delivery to the domain has been attempted yet.",
|
||||
"Typewords": [
|
||||
"SecurityResult"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -142,6 +142,7 @@ export interface SubmitMessage {
|
||||
ResponseMessageID: number // If set, this was a reply or forward, based on IsForward.
|
||||
ReplyTo: string // If non-empty, Reply-To header to add to message.
|
||||
UserAgent: string // User-Agent header added if not empty.
|
||||
RequireTLS?: boolean | null // For "Require TLS" extension during delivery.
|
||||
}
|
||||
|
||||
// File is a new attachment (not from an existing message that is being
|
||||
@ -177,12 +178,14 @@ export interface Mailbox {
|
||||
Size: number // Number of bytes for all messages.
|
||||
}
|
||||
|
||||
// RecipientSecurity is a quick analysis of the security properties of delivery to the recipient (domain).
|
||||
// Fields are nil when an error occurred during analysis.
|
||||
// RecipientSecurity is a quick analysis of the security properties of delivery to
|
||||
// the recipient (domain).
|
||||
export interface RecipientSecurity {
|
||||
STARTTLS: SecurityResult // Whether recipient domain supports (opportunistic) STARTTLS, as seen during most recent delivery attempt. Will be "unknown" if no delivery to the domain has been attempted yet.
|
||||
MTASTS: SecurityResult // Whether we have a stored enforced MTA-STS policy, or domain has MTA-STS DNS record.
|
||||
DNSSEC: SecurityResult // Whether MX lookup response was DNSSEC-signed.
|
||||
DANE: SecurityResult // Whether first delivery destination has DANE records.
|
||||
RequireTLS: SecurityResult // Whether recipient domain is known to implement the REQUIRETLS SMTP extension. Will be "unknown" if no delivery to the domain has been attempted yet.
|
||||
}
|
||||
|
||||
// EventStart is the first message sent on an SSE connection, giving the client
|
||||
@ -519,11 +522,11 @@ export const types: TypenameMap = {
|
||||
"Address": {"Name":"Address","Docs":"","Fields":[{"Name":"Name","Docs":"","Typewords":["string"]},{"Name":"User","Docs":"","Typewords":["string"]},{"Name":"Host","Docs":"","Typewords":["string"]}]},
|
||||
"MessageAddress": {"Name":"MessageAddress","Docs":"","Fields":[{"Name":"Name","Docs":"","Typewords":["string"]},{"Name":"User","Docs":"","Typewords":["string"]},{"Name":"Domain","Docs":"","Typewords":["Domain"]}]},
|
||||
"Domain": {"Name":"Domain","Docs":"","Fields":[{"Name":"ASCII","Docs":"","Typewords":["string"]},{"Name":"Unicode","Docs":"","Typewords":["string"]}]},
|
||||
"SubmitMessage": {"Name":"SubmitMessage","Docs":"","Fields":[{"Name":"From","Docs":"","Typewords":["string"]},{"Name":"To","Docs":"","Typewords":["[]","string"]},{"Name":"Cc","Docs":"","Typewords":["[]","string"]},{"Name":"Bcc","Docs":"","Typewords":["[]","string"]},{"Name":"Subject","Docs":"","Typewords":["string"]},{"Name":"TextBody","Docs":"","Typewords":["string"]},{"Name":"Attachments","Docs":"","Typewords":["[]","File"]},{"Name":"ForwardAttachments","Docs":"","Typewords":["ForwardAttachments"]},{"Name":"IsForward","Docs":"","Typewords":["bool"]},{"Name":"ResponseMessageID","Docs":"","Typewords":["int64"]},{"Name":"ReplyTo","Docs":"","Typewords":["string"]},{"Name":"UserAgent","Docs":"","Typewords":["string"]}]},
|
||||
"SubmitMessage": {"Name":"SubmitMessage","Docs":"","Fields":[{"Name":"From","Docs":"","Typewords":["string"]},{"Name":"To","Docs":"","Typewords":["[]","string"]},{"Name":"Cc","Docs":"","Typewords":["[]","string"]},{"Name":"Bcc","Docs":"","Typewords":["[]","string"]},{"Name":"Subject","Docs":"","Typewords":["string"]},{"Name":"TextBody","Docs":"","Typewords":["string"]},{"Name":"Attachments","Docs":"","Typewords":["[]","File"]},{"Name":"ForwardAttachments","Docs":"","Typewords":["ForwardAttachments"]},{"Name":"IsForward","Docs":"","Typewords":["bool"]},{"Name":"ResponseMessageID","Docs":"","Typewords":["int64"]},{"Name":"ReplyTo","Docs":"","Typewords":["string"]},{"Name":"UserAgent","Docs":"","Typewords":["string"]},{"Name":"RequireTLS","Docs":"","Typewords":["nullable","bool"]}]},
|
||||
"File": {"Name":"File","Docs":"","Fields":[{"Name":"Filename","Docs":"","Typewords":["string"]},{"Name":"DataURI","Docs":"","Typewords":["string"]}]},
|
||||
"ForwardAttachments": {"Name":"ForwardAttachments","Docs":"","Fields":[{"Name":"MessageID","Docs":"","Typewords":["int64"]},{"Name":"Paths","Docs":"","Typewords":["[]","[]","int32"]}]},
|
||||
"Mailbox": {"Name":"Mailbox","Docs":"","Fields":[{"Name":"ID","Docs":"","Typewords":["int64"]},{"Name":"Name","Docs":"","Typewords":["string"]},{"Name":"UIDValidity","Docs":"","Typewords":["uint32"]},{"Name":"UIDNext","Docs":"","Typewords":["UID"]},{"Name":"Archive","Docs":"","Typewords":["bool"]},{"Name":"Draft","Docs":"","Typewords":["bool"]},{"Name":"Junk","Docs":"","Typewords":["bool"]},{"Name":"Sent","Docs":"","Typewords":["bool"]},{"Name":"Trash","Docs":"","Typewords":["bool"]},{"Name":"Keywords","Docs":"","Typewords":["[]","string"]},{"Name":"HaveCounts","Docs":"","Typewords":["bool"]},{"Name":"Total","Docs":"","Typewords":["int64"]},{"Name":"Deleted","Docs":"","Typewords":["int64"]},{"Name":"Unread","Docs":"","Typewords":["int64"]},{"Name":"Unseen","Docs":"","Typewords":["int64"]},{"Name":"Size","Docs":"","Typewords":["int64"]}]},
|
||||
"RecipientSecurity": {"Name":"RecipientSecurity","Docs":"","Fields":[{"Name":"MTASTS","Docs":"","Typewords":["SecurityResult"]},{"Name":"DNSSEC","Docs":"","Typewords":["SecurityResult"]},{"Name":"DANE","Docs":"","Typewords":["SecurityResult"]}]},
|
||||
"RecipientSecurity": {"Name":"RecipientSecurity","Docs":"","Fields":[{"Name":"STARTTLS","Docs":"","Typewords":["SecurityResult"]},{"Name":"MTASTS","Docs":"","Typewords":["SecurityResult"]},{"Name":"DNSSEC","Docs":"","Typewords":["SecurityResult"]},{"Name":"DANE","Docs":"","Typewords":["SecurityResult"]},{"Name":"RequireTLS","Docs":"","Typewords":["SecurityResult"]}]},
|
||||
"EventStart": {"Name":"EventStart","Docs":"","Fields":[{"Name":"SSEID","Docs":"","Typewords":["int64"]},{"Name":"LoginAddress","Docs":"","Typewords":["MessageAddress"]},{"Name":"Addresses","Docs":"","Typewords":["[]","MessageAddress"]},{"Name":"DomainAddressConfigs","Docs":"","Typewords":["{}","DomainAddressConfig"]},{"Name":"MailboxName","Docs":"","Typewords":["string"]},{"Name":"Mailboxes","Docs":"","Typewords":["[]","Mailbox"]}]},
|
||||
"DomainAddressConfig": {"Name":"DomainAddressConfig","Docs":"","Fields":[{"Name":"LocalpartCatchallSeparator","Docs":"","Typewords":["string"]},{"Name":"LocalpartCaseSensitive","Docs":"","Typewords":["bool"]}]},
|
||||
"EventViewErr": {"Name":"EventViewErr","Docs":"","Fields":[{"Name":"ViewID","Docs":"","Typewords":["int64"]},{"Name":"RequestID","Docs":"","Typewords":["int64"]},{"Name":"Err","Docs":"","Typewords":["string"]}]},
|
||||
|
||||
@ -366,7 +366,12 @@ func TestAPI(t *testing.T) {
|
||||
|
||||
// RecipientSecurity
|
||||
resolver := dns.MockResolver{}
|
||||
rs, err := recipientSecurity(ctxbg, resolver, "mjl@a.mox.example")
|
||||
rs, err := recipientSecurity(ctx, resolver, "mjl@a.mox.example")
|
||||
tcompare(t, err, nil)
|
||||
tcompare(t, rs, RecipientSecurity{SecurityResultNo, SecurityResultNo, SecurityResultNo})
|
||||
tcompare(t, rs, RecipientSecurity{SecurityResultUnknown, SecurityResultNo, SecurityResultNo, SecurityResultNo, SecurityResultUnknown})
|
||||
err = acc.DB.Insert(ctx, &store.RecipientDomainTLS{Domain: "a.mox.example", STARTTLS: true, RequireTLS: false})
|
||||
tcheck(t, err, "insert recipient domain tls info")
|
||||
rs, err = recipientSecurity(ctx, resolver, "mjl@a.mox.example")
|
||||
tcompare(t, err, nil)
|
||||
tcompare(t, rs, RecipientSecurity{SecurityResultYes, SecurityResultNo, SecurityResultNo, SecurityResultNo, SecurityResultNo})
|
||||
}
|
||||
|
||||
@ -62,11 +62,11 @@ var api;
|
||||
"Address": { "Name": "Address", "Docs": "", "Fields": [{ "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "User", "Docs": "", "Typewords": ["string"] }, { "Name": "Host", "Docs": "", "Typewords": ["string"] }] },
|
||||
"MessageAddress": { "Name": "MessageAddress", "Docs": "", "Fields": [{ "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "User", "Docs": "", "Typewords": ["string"] }, { "Name": "Domain", "Docs": "", "Typewords": ["Domain"] }] },
|
||||
"Domain": { "Name": "Domain", "Docs": "", "Fields": [{ "Name": "ASCII", "Docs": "", "Typewords": ["string"] }, { "Name": "Unicode", "Docs": "", "Typewords": ["string"] }] },
|
||||
"SubmitMessage": { "Name": "SubmitMessage", "Docs": "", "Fields": [{ "Name": "From", "Docs": "", "Typewords": ["string"] }, { "Name": "To", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Cc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Bcc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Subject", "Docs": "", "Typewords": ["string"] }, { "Name": "TextBody", "Docs": "", "Typewords": ["string"] }, { "Name": "Attachments", "Docs": "", "Typewords": ["[]", "File"] }, { "Name": "ForwardAttachments", "Docs": "", "Typewords": ["ForwardAttachments"] }, { "Name": "IsForward", "Docs": "", "Typewords": ["bool"] }, { "Name": "ResponseMessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "ReplyTo", "Docs": "", "Typewords": ["string"] }, { "Name": "UserAgent", "Docs": "", "Typewords": ["string"] }] },
|
||||
"SubmitMessage": { "Name": "SubmitMessage", "Docs": "", "Fields": [{ "Name": "From", "Docs": "", "Typewords": ["string"] }, { "Name": "To", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Cc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Bcc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Subject", "Docs": "", "Typewords": ["string"] }, { "Name": "TextBody", "Docs": "", "Typewords": ["string"] }, { "Name": "Attachments", "Docs": "", "Typewords": ["[]", "File"] }, { "Name": "ForwardAttachments", "Docs": "", "Typewords": ["ForwardAttachments"] }, { "Name": "IsForward", "Docs": "", "Typewords": ["bool"] }, { "Name": "ResponseMessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "ReplyTo", "Docs": "", "Typewords": ["string"] }, { "Name": "UserAgent", "Docs": "", "Typewords": ["string"] }, { "Name": "RequireTLS", "Docs": "", "Typewords": ["nullable", "bool"] }] },
|
||||
"File": { "Name": "File", "Docs": "", "Fields": [{ "Name": "Filename", "Docs": "", "Typewords": ["string"] }, { "Name": "DataURI", "Docs": "", "Typewords": ["string"] }] },
|
||||
"ForwardAttachments": { "Name": "ForwardAttachments", "Docs": "", "Fields": [{ "Name": "MessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Paths", "Docs": "", "Typewords": ["[]", "[]", "int32"] }] },
|
||||
"Mailbox": { "Name": "Mailbox", "Docs": "", "Fields": [{ "Name": "ID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "UIDValidity", "Docs": "", "Typewords": ["uint32"] }, { "Name": "UIDNext", "Docs": "", "Typewords": ["UID"] }, { "Name": "Archive", "Docs": "", "Typewords": ["bool"] }, { "Name": "Draft", "Docs": "", "Typewords": ["bool"] }, { "Name": "Junk", "Docs": "", "Typewords": ["bool"] }, { "Name": "Sent", "Docs": "", "Typewords": ["bool"] }, { "Name": "Trash", "Docs": "", "Typewords": ["bool"] }, { "Name": "Keywords", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "HaveCounts", "Docs": "", "Typewords": ["bool"] }, { "Name": "Total", "Docs": "", "Typewords": ["int64"] }, { "Name": "Deleted", "Docs": "", "Typewords": ["int64"] }, { "Name": "Unread", "Docs": "", "Typewords": ["int64"] }, { "Name": "Unseen", "Docs": "", "Typewords": ["int64"] }, { "Name": "Size", "Docs": "", "Typewords": ["int64"] }] },
|
||||
"RecipientSecurity": { "Name": "RecipientSecurity", "Docs": "", "Fields": [{ "Name": "MTASTS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DNSSEC", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DANE", "Docs": "", "Typewords": ["SecurityResult"] }] },
|
||||
"RecipientSecurity": { "Name": "RecipientSecurity", "Docs": "", "Fields": [{ "Name": "STARTTLS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "MTASTS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DNSSEC", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DANE", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "RequireTLS", "Docs": "", "Typewords": ["SecurityResult"] }] },
|
||||
"EventStart": { "Name": "EventStart", "Docs": "", "Fields": [{ "Name": "SSEID", "Docs": "", "Typewords": ["int64"] }, { "Name": "LoginAddress", "Docs": "", "Typewords": ["MessageAddress"] }, { "Name": "Addresses", "Docs": "", "Typewords": ["[]", "MessageAddress"] }, { "Name": "DomainAddressConfigs", "Docs": "", "Typewords": ["{}", "DomainAddressConfig"] }, { "Name": "MailboxName", "Docs": "", "Typewords": ["string"] }, { "Name": "Mailboxes", "Docs": "", "Typewords": ["[]", "Mailbox"] }] },
|
||||
"DomainAddressConfig": { "Name": "DomainAddressConfig", "Docs": "", "Fields": [{ "Name": "LocalpartCatchallSeparator", "Docs": "", "Typewords": ["string"] }, { "Name": "LocalpartCaseSensitive", "Docs": "", "Typewords": ["bool"] }] },
|
||||
"EventViewErr": { "Name": "EventViewErr", "Docs": "", "Fields": [{ "Name": "ViewID", "Docs": "", "Typewords": ["int64"] }, { "Name": "RequestID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Err", "Docs": "", "Typewords": ["string"] }] },
|
||||
|
||||
@ -62,11 +62,11 @@ var api;
|
||||
"Address": { "Name": "Address", "Docs": "", "Fields": [{ "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "User", "Docs": "", "Typewords": ["string"] }, { "Name": "Host", "Docs": "", "Typewords": ["string"] }] },
|
||||
"MessageAddress": { "Name": "MessageAddress", "Docs": "", "Fields": [{ "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "User", "Docs": "", "Typewords": ["string"] }, { "Name": "Domain", "Docs": "", "Typewords": ["Domain"] }] },
|
||||
"Domain": { "Name": "Domain", "Docs": "", "Fields": [{ "Name": "ASCII", "Docs": "", "Typewords": ["string"] }, { "Name": "Unicode", "Docs": "", "Typewords": ["string"] }] },
|
||||
"SubmitMessage": { "Name": "SubmitMessage", "Docs": "", "Fields": [{ "Name": "From", "Docs": "", "Typewords": ["string"] }, { "Name": "To", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Cc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Bcc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Subject", "Docs": "", "Typewords": ["string"] }, { "Name": "TextBody", "Docs": "", "Typewords": ["string"] }, { "Name": "Attachments", "Docs": "", "Typewords": ["[]", "File"] }, { "Name": "ForwardAttachments", "Docs": "", "Typewords": ["ForwardAttachments"] }, { "Name": "IsForward", "Docs": "", "Typewords": ["bool"] }, { "Name": "ResponseMessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "ReplyTo", "Docs": "", "Typewords": ["string"] }, { "Name": "UserAgent", "Docs": "", "Typewords": ["string"] }] },
|
||||
"SubmitMessage": { "Name": "SubmitMessage", "Docs": "", "Fields": [{ "Name": "From", "Docs": "", "Typewords": ["string"] }, { "Name": "To", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Cc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Bcc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Subject", "Docs": "", "Typewords": ["string"] }, { "Name": "TextBody", "Docs": "", "Typewords": ["string"] }, { "Name": "Attachments", "Docs": "", "Typewords": ["[]", "File"] }, { "Name": "ForwardAttachments", "Docs": "", "Typewords": ["ForwardAttachments"] }, { "Name": "IsForward", "Docs": "", "Typewords": ["bool"] }, { "Name": "ResponseMessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "ReplyTo", "Docs": "", "Typewords": ["string"] }, { "Name": "UserAgent", "Docs": "", "Typewords": ["string"] }, { "Name": "RequireTLS", "Docs": "", "Typewords": ["nullable", "bool"] }] },
|
||||
"File": { "Name": "File", "Docs": "", "Fields": [{ "Name": "Filename", "Docs": "", "Typewords": ["string"] }, { "Name": "DataURI", "Docs": "", "Typewords": ["string"] }] },
|
||||
"ForwardAttachments": { "Name": "ForwardAttachments", "Docs": "", "Fields": [{ "Name": "MessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Paths", "Docs": "", "Typewords": ["[]", "[]", "int32"] }] },
|
||||
"Mailbox": { "Name": "Mailbox", "Docs": "", "Fields": [{ "Name": "ID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "UIDValidity", "Docs": "", "Typewords": ["uint32"] }, { "Name": "UIDNext", "Docs": "", "Typewords": ["UID"] }, { "Name": "Archive", "Docs": "", "Typewords": ["bool"] }, { "Name": "Draft", "Docs": "", "Typewords": ["bool"] }, { "Name": "Junk", "Docs": "", "Typewords": ["bool"] }, { "Name": "Sent", "Docs": "", "Typewords": ["bool"] }, { "Name": "Trash", "Docs": "", "Typewords": ["bool"] }, { "Name": "Keywords", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "HaveCounts", "Docs": "", "Typewords": ["bool"] }, { "Name": "Total", "Docs": "", "Typewords": ["int64"] }, { "Name": "Deleted", "Docs": "", "Typewords": ["int64"] }, { "Name": "Unread", "Docs": "", "Typewords": ["int64"] }, { "Name": "Unseen", "Docs": "", "Typewords": ["int64"] }, { "Name": "Size", "Docs": "", "Typewords": ["int64"] }] },
|
||||
"RecipientSecurity": { "Name": "RecipientSecurity", "Docs": "", "Fields": [{ "Name": "MTASTS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DNSSEC", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DANE", "Docs": "", "Typewords": ["SecurityResult"] }] },
|
||||
"RecipientSecurity": { "Name": "RecipientSecurity", "Docs": "", "Fields": [{ "Name": "STARTTLS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "MTASTS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DNSSEC", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DANE", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "RequireTLS", "Docs": "", "Typewords": ["SecurityResult"] }] },
|
||||
"EventStart": { "Name": "EventStart", "Docs": "", "Fields": [{ "Name": "SSEID", "Docs": "", "Typewords": ["int64"] }, { "Name": "LoginAddress", "Docs": "", "Typewords": ["MessageAddress"] }, { "Name": "Addresses", "Docs": "", "Typewords": ["[]", "MessageAddress"] }, { "Name": "DomainAddressConfigs", "Docs": "", "Typewords": ["{}", "DomainAddressConfig"] }, { "Name": "MailboxName", "Docs": "", "Typewords": ["string"] }, { "Name": "Mailboxes", "Docs": "", "Typewords": ["[]", "Mailbox"] }] },
|
||||
"DomainAddressConfig": { "Name": "DomainAddressConfig", "Docs": "", "Fields": [{ "Name": "LocalpartCatchallSeparator", "Docs": "", "Typewords": ["string"] }, { "Name": "LocalpartCaseSensitive", "Docs": "", "Typewords": ["bool"] }] },
|
||||
"EventViewErr": { "Name": "EventViewErr", "Docs": "", "Fields": [{ "Name": "ViewID", "Docs": "", "Typewords": ["int64"] }, { "Name": "RequestID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Err", "Docs": "", "Typewords": ["string"] }] },
|
||||
|
||||
@ -62,11 +62,11 @@ var api;
|
||||
"Address": { "Name": "Address", "Docs": "", "Fields": [{ "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "User", "Docs": "", "Typewords": ["string"] }, { "Name": "Host", "Docs": "", "Typewords": ["string"] }] },
|
||||
"MessageAddress": { "Name": "MessageAddress", "Docs": "", "Fields": [{ "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "User", "Docs": "", "Typewords": ["string"] }, { "Name": "Domain", "Docs": "", "Typewords": ["Domain"] }] },
|
||||
"Domain": { "Name": "Domain", "Docs": "", "Fields": [{ "Name": "ASCII", "Docs": "", "Typewords": ["string"] }, { "Name": "Unicode", "Docs": "", "Typewords": ["string"] }] },
|
||||
"SubmitMessage": { "Name": "SubmitMessage", "Docs": "", "Fields": [{ "Name": "From", "Docs": "", "Typewords": ["string"] }, { "Name": "To", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Cc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Bcc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Subject", "Docs": "", "Typewords": ["string"] }, { "Name": "TextBody", "Docs": "", "Typewords": ["string"] }, { "Name": "Attachments", "Docs": "", "Typewords": ["[]", "File"] }, { "Name": "ForwardAttachments", "Docs": "", "Typewords": ["ForwardAttachments"] }, { "Name": "IsForward", "Docs": "", "Typewords": ["bool"] }, { "Name": "ResponseMessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "ReplyTo", "Docs": "", "Typewords": ["string"] }, { "Name": "UserAgent", "Docs": "", "Typewords": ["string"] }] },
|
||||
"SubmitMessage": { "Name": "SubmitMessage", "Docs": "", "Fields": [{ "Name": "From", "Docs": "", "Typewords": ["string"] }, { "Name": "To", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Cc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Bcc", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "Subject", "Docs": "", "Typewords": ["string"] }, { "Name": "TextBody", "Docs": "", "Typewords": ["string"] }, { "Name": "Attachments", "Docs": "", "Typewords": ["[]", "File"] }, { "Name": "ForwardAttachments", "Docs": "", "Typewords": ["ForwardAttachments"] }, { "Name": "IsForward", "Docs": "", "Typewords": ["bool"] }, { "Name": "ResponseMessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "ReplyTo", "Docs": "", "Typewords": ["string"] }, { "Name": "UserAgent", "Docs": "", "Typewords": ["string"] }, { "Name": "RequireTLS", "Docs": "", "Typewords": ["nullable", "bool"] }] },
|
||||
"File": { "Name": "File", "Docs": "", "Fields": [{ "Name": "Filename", "Docs": "", "Typewords": ["string"] }, { "Name": "DataURI", "Docs": "", "Typewords": ["string"] }] },
|
||||
"ForwardAttachments": { "Name": "ForwardAttachments", "Docs": "", "Fields": [{ "Name": "MessageID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Paths", "Docs": "", "Typewords": ["[]", "[]", "int32"] }] },
|
||||
"Mailbox": { "Name": "Mailbox", "Docs": "", "Fields": [{ "Name": "ID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Name", "Docs": "", "Typewords": ["string"] }, { "Name": "UIDValidity", "Docs": "", "Typewords": ["uint32"] }, { "Name": "UIDNext", "Docs": "", "Typewords": ["UID"] }, { "Name": "Archive", "Docs": "", "Typewords": ["bool"] }, { "Name": "Draft", "Docs": "", "Typewords": ["bool"] }, { "Name": "Junk", "Docs": "", "Typewords": ["bool"] }, { "Name": "Sent", "Docs": "", "Typewords": ["bool"] }, { "Name": "Trash", "Docs": "", "Typewords": ["bool"] }, { "Name": "Keywords", "Docs": "", "Typewords": ["[]", "string"] }, { "Name": "HaveCounts", "Docs": "", "Typewords": ["bool"] }, { "Name": "Total", "Docs": "", "Typewords": ["int64"] }, { "Name": "Deleted", "Docs": "", "Typewords": ["int64"] }, { "Name": "Unread", "Docs": "", "Typewords": ["int64"] }, { "Name": "Unseen", "Docs": "", "Typewords": ["int64"] }, { "Name": "Size", "Docs": "", "Typewords": ["int64"] }] },
|
||||
"RecipientSecurity": { "Name": "RecipientSecurity", "Docs": "", "Fields": [{ "Name": "MTASTS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DNSSEC", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DANE", "Docs": "", "Typewords": ["SecurityResult"] }] },
|
||||
"RecipientSecurity": { "Name": "RecipientSecurity", "Docs": "", "Fields": [{ "Name": "STARTTLS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "MTASTS", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DNSSEC", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "DANE", "Docs": "", "Typewords": ["SecurityResult"] }, { "Name": "RequireTLS", "Docs": "", "Typewords": ["SecurityResult"] }] },
|
||||
"EventStart": { "Name": "EventStart", "Docs": "", "Fields": [{ "Name": "SSEID", "Docs": "", "Typewords": ["int64"] }, { "Name": "LoginAddress", "Docs": "", "Typewords": ["MessageAddress"] }, { "Name": "Addresses", "Docs": "", "Typewords": ["[]", "MessageAddress"] }, { "Name": "DomainAddressConfigs", "Docs": "", "Typewords": ["{}", "DomainAddressConfig"] }, { "Name": "MailboxName", "Docs": "", "Typewords": ["string"] }, { "Name": "Mailboxes", "Docs": "", "Typewords": ["[]", "Mailbox"] }] },
|
||||
"DomainAddressConfig": { "Name": "DomainAddressConfig", "Docs": "", "Fields": [{ "Name": "LocalpartCatchallSeparator", "Docs": "", "Typewords": ["string"] }, { "Name": "LocalpartCaseSensitive", "Docs": "", "Typewords": ["bool"] }] },
|
||||
"EventViewErr": { "Name": "EventViewErr", "Docs": "", "Fields": [{ "Name": "ViewID", "Docs": "", "Typewords": ["int64"] }, { "Name": "RequestID", "Docs": "", "Typewords": ["int64"] }, { "Name": "Err", "Docs": "", "Typewords": ["string"] }] },
|
||||
@ -1039,7 +1039,7 @@ To simulate slow API calls and SSE events:
|
||||
|
||||
Show additional headers of messages:
|
||||
|
||||
settingsPut({...settings, showHeaders: ['User-Agent', 'X-Mailer', 'Message-Id', 'List-Id', 'List-Post', 'X-Mox-Reason']})
|
||||
settingsPut({...settings, showHeaders: ['User-Agent', 'X-Mailer', 'Message-Id', 'List-Id', 'List-Post', 'X-Mox-Reason', 'TLS-Required']})
|
||||
|
||||
Enable logging and reload afterwards:
|
||||
|
||||
@ -1987,6 +1987,7 @@ const compose = (opts) => {
|
||||
let subject;
|
||||
let body;
|
||||
let attachments;
|
||||
let requiretls;
|
||||
let toBtn, ccBtn, bccBtn, replyToBtn, customFromBtn;
|
||||
let replyToCell, toCell, ccCell, bccCell; // Where we append new address views.
|
||||
let toRow, replyToRow, ccRow, bccRow; // We show/hide rows as needed.
|
||||
@ -2035,6 +2036,7 @@ const compose = (opts) => {
|
||||
ForwardAttachments: forwardAttachmentPaths.length === 0 ? { MessageID: 0, Paths: [] } : { MessageID: opts.attachmentsMessageItem.Message.ID, Paths: forwardAttachmentPaths },
|
||||
IsForward: opts.isForward || false,
|
||||
ResponseMessageID: opts.responseMessageID || 0,
|
||||
RequireTLS: requiretls.value === '' ? null : requiretls.value === 'yes',
|
||||
};
|
||||
await client.MessageSubmit(message);
|
||||
cmdCancel();
|
||||
@ -2042,10 +2044,10 @@ const compose = (opts) => {
|
||||
const cmdSend = async () => {
|
||||
await withStatus('Sending email', submit(), fieldset);
|
||||
};
|
||||
const cmdAddTo = async () => { newAddrView('', toViews, toBtn, toCell, toRow); };
|
||||
const cmdAddCc = async () => { newAddrView('', ccViews, ccBtn, ccCell, ccRow); };
|
||||
const cmdAddBcc = async () => { newAddrView('', bccViews, bccBtn, bccCell, bccRow); };
|
||||
const cmdReplyTo = async () => { newAddrView('', replytoViews, replyToBtn, replyToCell, replyToRow, true); };
|
||||
const cmdAddTo = async () => { newAddrView('', true, toViews, toBtn, toCell, toRow); };
|
||||
const cmdAddCc = async () => { newAddrView('', true, ccViews, ccBtn, ccCell, ccRow); };
|
||||
const cmdAddBcc = async () => { newAddrView('', true, bccViews, bccBtn, bccCell, bccRow); };
|
||||
const cmdReplyTo = async () => { newAddrView('', false, replytoViews, replyToBtn, replyToCell, replyToRow, true); };
|
||||
const cmdCustomFrom = async () => {
|
||||
if (customFrom) {
|
||||
return;
|
||||
@ -2063,7 +2065,7 @@ const compose = (opts) => {
|
||||
'ctrl Y': cmdReplyTo,
|
||||
// ctrl - and ctrl = (+) not included, they are handled by keydown handlers on in the inputs they remove/add.
|
||||
};
|
||||
const newAddrView = (addr, views, btn, cell, row, single) => {
|
||||
const newAddrView = (addr, isRecipient, views, btn, cell, row, single) => {
|
||||
if (single && views.length !== 0) {
|
||||
return;
|
||||
}
|
||||
@ -2096,11 +2098,13 @@ const compose = (opts) => {
|
||||
}
|
||||
return '#aaa';
|
||||
};
|
||||
const setBar = (c0, c1, c2) => {
|
||||
const setBar = (c0, c1, c2, c3, c4) => {
|
||||
const stops = [
|
||||
c0 + ' 0%', c0 + ' 32%', 'white 32%', 'white 33%',
|
||||
c1 + ' 33%', c1 + ' 66%', 'white 66%', 'white 67%',
|
||||
c2 + ' 67%', c2 + ' 100%',
|
||||
c0 + ' 0%', c0 + ' 19%', 'white 19%', 'white 20%',
|
||||
c1 + ' 20%', c1 + ' 39%', 'white 39%', 'white 40%',
|
||||
c2 + ' 40%', c2 + ' 59%', 'white 59%', 'white 60%',
|
||||
c3 + ' 60%', c3 + ' 79%', 'white 79%', 'white 80%',
|
||||
c4 + ' 80%', c4 + ' 100%',
|
||||
].join(', ');
|
||||
securityBar.style.borderImage = 'linear-gradient(to right, ' + stops + ') 1';
|
||||
};
|
||||
@ -2108,19 +2112,56 @@ const compose = (opts) => {
|
||||
rcptSecAborter = aborter;
|
||||
rcptSecPromise = client.withOptions({ aborter: aborter }).RecipientSecurity(inputElem.value);
|
||||
rcptSecPromise.then((rs) => {
|
||||
setBar(color(rs.MTASTS), color(rs.DNSSEC), color(rs.DANE));
|
||||
setBar(color(rs.STARTTLS), color(rs.MTASTS), color(rs.DNSSEC), color(rs.DANE), color(rs.RequireTLS));
|
||||
const implemented = [];
|
||||
const check = (v, s) => {
|
||||
if (v) {
|
||||
implemented.push(s);
|
||||
}
|
||||
};
|
||||
check(rs.STARTTLS === api.SecurityResult.SecurityResultYes, 'STARTTLS');
|
||||
check(rs.MTASTS === api.SecurityResult.SecurityResultYes, 'MTASTS');
|
||||
check(rs.DNSSEC === api.SecurityResult.SecurityResultYes, 'DNSSEC');
|
||||
check(rs.DANE === api.SecurityResult.SecurityResultYes, 'DANE');
|
||||
check(rs.RequireTLS === api.SecurityResult.SecurityResultYes, 'RequireTLS');
|
||||
const status = 'Security mechanisms known to be implemented by the recipient domain: ' + (implemented.length === 0 ? '(none)' : implemented.join(', ')) + '.';
|
||||
inputElem.setAttribute('title', status + '\n\n' + recipientSecurityTitle);
|
||||
aborter.abort = undefined;
|
||||
v.recipientSecurity = rs;
|
||||
if (isRecipient) {
|
||||
// If all recipients implement REQUIRETLS, we can enable it.
|
||||
let reqtls = true;
|
||||
const walk = (l) => {
|
||||
for (const v of l) {
|
||||
if (v.recipientSecurity?.RequireTLS !== api.SecurityResult.SecurityResultYes) {
|
||||
reqtls = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
walk(toViews);
|
||||
walk(ccViews);
|
||||
walk(bccViews);
|
||||
if (requiretls.value === '' || requiretls.value === 'yes') {
|
||||
requiretls.value = reqtls ? 'yes' : '';
|
||||
}
|
||||
}
|
||||
}, () => {
|
||||
setBar('#888', '#888', '#888');
|
||||
setBar('#888', '#888', '#888', '#888', '#888');
|
||||
inputElem.setAttribute('title', 'Error fetching security mechanisms known to be implemented by the recipient domain...\n\n' + recipientSecurityTitle);
|
||||
aborter.abort = undefined;
|
||||
if (requiretls.value === 'yes') {
|
||||
requiretls.value = '';
|
||||
}
|
||||
});
|
||||
};
|
||||
const root = dom.span(autosizeElem = dom.span(dom._class('autosize'), inputElem = dom.input(focusPlaceholder('Jane <jane@example.org>'), style({ width: 'auto' }), attr.value(addr), newAddressComplete(), attr.title('The bars below the input field indicate security features of the recipient (domain):\n1. Delivery with STARTTLS and MTA-STS (PKIX/WebPKI) enforced.\n2. MX lookup resulted in DNSSEC-signed response.\n3. First delivery destination host has DANE, so STARTTLS is required.\n\nColors:\n- Red, not implemented/unsupported\n- Green, implemented/supported\n- Gray, error while determining\n- Absent/white, unknown or skipped (e.g. dane check skipped due to dnssec-lookup error)'), function keydown(e) {
|
||||
const recipientSecurityTitle = 'Description of security mechanisms recipient domains may implement:\n1. STARTTLS: Opportunistic (unverified) TLS with STARTTLS, successfully negotiated during the most recent delivery attempt.\n2. MTA-STS: For PKIX/WebPKI-verified TLS.\n3. DNSSEC: MX DNS records are DNSSEC-signed.\n4. DANE: First delivery destination host implements DANE for verified TLS.\n5. RequireTLS: SMTP extension for verified TLS delivery into recipient mailbox, support detected during the most recent delivery attempt.\n\nChecks STARTTLS, DANE and RequireTLS cover the most recently used delivery path, not necessarily all possible delivery paths.\n\nThe bars below the input field indicate implementation status by the recipient domain:\n- Red, not implemented/unsupported\n- Green, implemented/supported\n- Gray, error while determining\n- Absent/white, unknown or skipped (e.g. no previous delivery attempt, or DANE check skipped due to DNSSEC-lookup error)';
|
||||
const root = dom.span(autosizeElem = dom.span(dom._class('autosize'), inputElem = dom.input(focusPlaceholder('Jane <jane@example.org>'), style({ width: 'auto' }), attr.value(addr), newAddressComplete(), attr.title(recipientSecurityTitle), function keydown(e) {
|
||||
if (e.key === '-' && e.ctrlKey) {
|
||||
remove();
|
||||
}
|
||||
else if (e.key === '=' && e.ctrlKey) {
|
||||
newAddrView('', views, btn, cell, row, single);
|
||||
newAddrView('', isRecipient, views, btn, cell, row, single);
|
||||
}
|
||||
else {
|
||||
return;
|
||||
@ -2143,7 +2184,6 @@ const compose = (opts) => {
|
||||
}
|
||||
}), ' ');
|
||||
autosizeElem.dataset.value = inputElem.value;
|
||||
fetchRecipientSecurity();
|
||||
const remove = () => {
|
||||
const i = views.indexOf(v);
|
||||
views.splice(i, 1);
|
||||
@ -2170,7 +2210,8 @@ const compose = (opts) => {
|
||||
next.focus();
|
||||
}
|
||||
};
|
||||
const v = { root: root, input: inputElem };
|
||||
const v = { root: root, input: inputElem, isRecipient: isRecipient, recipientSecurity: null };
|
||||
fetchRecipientSecurity();
|
||||
views.push(v);
|
||||
cell.appendChild(v.root);
|
||||
row.style.display = '';
|
||||
@ -2255,16 +2296,16 @@ const compose = (opts) => {
|
||||
return v;
|
||||
}), dom.label(style({ color: '#666' }), dom.input(attr.type('checkbox'), function change(e) {
|
||||
forwardAttachmentViews.forEach(v => v.checkbox.checked = e.target.checked);
|
||||
}), ' (Toggle all)')), noAttachmentsWarning = dom.div(style({ display: 'none', backgroundColor: '#fcd284', padding: '0.15em .25em', margin: '.5em 0' }), 'Message mentions attachments, but no files are attached.'), dom.div(style({ margin: '1ex 0' }), 'Attachments ', attachments = dom.input(attr.type('file'), attr.multiple(''), function change() { checkAttachments(); })), dom.submitbutton('Send')), async function submit(e) {
|
||||
}), ' (Toggle all)')), noAttachmentsWarning = dom.div(style({ display: 'none', backgroundColor: '#fcd284', padding: '0.15em .25em', margin: '.5em 0' }), 'Message mentions attachments, but no files are attached.'), dom.label(style({ margin: '1ex 0', display: 'block' }), 'Attachments ', attachments = dom.input(attr.type('file'), attr.multiple(''), function change() { checkAttachments(); })), dom.label(style({ margin: '1ex 0', display: 'block' }), attr.title('How to use TLS for message delivery over SMTP:\n\nDefault: Delivery attempts follow the policies published by the recipient domain: Verification with MTA-STS and/or DANE, or optional opportunistic unverified STARTTLS if the domain does not specify a policy.\n\nWith RequireTLS: For sensitive messages, you may want to require verified TLS. The recipient destination domain SMTP server must support the REQUIRETLS SMTP extension for delivery to succeed. It is automatically chosen when the destination domain mail servers of all recipients are known to support it.\n\nFallback to insecure: If delivery fails due to MTA-STS and/or DANE policies specified by the recipient domain, and the content is not sensitive, you may choose to ignore the recipient domain TLS policies so delivery can succeed.'), 'TLS ', requiretls = dom.select(dom.option(attr.value(''), 'Default'), dom.option(attr.value('yes'), 'With RequireTLS'), dom.option(attr.value('no'), 'Fallback to insecure'))), dom.div(style({ margin: '3ex 0 1ex 0', display: 'block' }), dom.submitbutton('Send'))), async function submit(e) {
|
||||
e.preventDefault();
|
||||
shortcutCmd(cmdSend, shortcuts);
|
||||
}));
|
||||
subjectAutosize.dataset.value = subject.value;
|
||||
(opts.to && opts.to.length > 0 ? opts.to : ['']).forEach(s => newAddrView(s, toViews, toBtn, toCell, toRow));
|
||||
(opts.cc || []).forEach(s => newAddrView(s, ccViews, ccBtn, ccCell, ccRow));
|
||||
(opts.bcc || []).forEach(s => newAddrView(s, bccViews, bccBtn, bccCell, bccRow));
|
||||
(opts.to && opts.to.length > 0 ? opts.to : ['']).forEach(s => newAddrView(s, true, toViews, toBtn, toCell, toRow));
|
||||
(opts.cc || []).forEach(s => newAddrView(s, true, ccViews, ccBtn, ccCell, ccRow));
|
||||
(opts.bcc || []).forEach(s => newAddrView(s, true, bccViews, bccBtn, bccCell, bccRow));
|
||||
if (opts.replyto) {
|
||||
newAddrView(opts.replyto, replytoViews, replyToBtn, replyToCell, replyToRow, true);
|
||||
newAddrView(opts.replyto, false, replytoViews, replyToBtn, replyToCell, replyToRow, true);
|
||||
}
|
||||
if (!opts.cc || !opts.cc.length) {
|
||||
ccRow.style.display = 'none';
|
||||
|
||||
@ -52,7 +52,7 @@ To simulate slow API calls and SSE events:
|
||||
|
||||
Show additional headers of messages:
|
||||
|
||||
settingsPut({...settings, showHeaders: ['User-Agent', 'X-Mailer', 'Message-Id', 'List-Id', 'List-Post', 'X-Mox-Reason']})
|
||||
settingsPut({...settings, showHeaders: ['User-Agent', 'X-Mailer', 'Message-Id', 'List-Id', 'List-Post', 'X-Mox-Reason', 'TLS-Required']})
|
||||
|
||||
Enable logging and reload afterwards:
|
||||
|
||||
@ -1154,6 +1154,8 @@ const compose = (opts: ComposeOptions) => {
|
||||
type AddrView = {
|
||||
root: HTMLElement
|
||||
input: HTMLInputElement
|
||||
isRecipient: boolean
|
||||
recipientSecurity: null | api.RecipientSecurity
|
||||
}
|
||||
|
||||
let fieldset: HTMLFieldSetElement
|
||||
@ -1163,6 +1165,7 @@ const compose = (opts: ComposeOptions) => {
|
||||
let subject: HTMLInputElement
|
||||
let body: HTMLTextAreaElement
|
||||
let attachments: HTMLInputElement
|
||||
let requiretls: HTMLSelectElement
|
||||
|
||||
let toBtn: HTMLButtonElement, ccBtn: HTMLButtonElement, bccBtn: HTMLButtonElement, replyToBtn: HTMLButtonElement, customFromBtn: HTMLButtonElement
|
||||
let replyToCell: HTMLElement, toCell: HTMLElement, ccCell: HTMLElement, bccCell: HTMLElement // Where we append new address views.
|
||||
@ -1217,6 +1220,7 @@ const compose = (opts: ComposeOptions) => {
|
||||
ForwardAttachments: forwardAttachmentPaths.length === 0 ? {MessageID: 0, Paths: []} : {MessageID: opts.attachmentsMessageItem!.Message.ID, Paths: forwardAttachmentPaths},
|
||||
IsForward: opts.isForward || false,
|
||||
ResponseMessageID: opts.responseMessageID || 0,
|
||||
RequireTLS: requiretls.value === '' ? null : requiretls.value === 'yes',
|
||||
}
|
||||
await client.MessageSubmit(message)
|
||||
cmdCancel()
|
||||
@ -1226,10 +1230,10 @@ const compose = (opts: ComposeOptions) => {
|
||||
await withStatus('Sending email', submit(), fieldset)
|
||||
}
|
||||
|
||||
const cmdAddTo = async () => { newAddrView('', toViews, toBtn, toCell, toRow) }
|
||||
const cmdAddCc = async () => { newAddrView('', ccViews, ccBtn, ccCell, ccRow) }
|
||||
const cmdAddBcc = async () => { newAddrView('', bccViews, bccBtn, bccCell, bccRow) }
|
||||
const cmdReplyTo = async () => { newAddrView('', replytoViews, replyToBtn, replyToCell, replyToRow, true) }
|
||||
const cmdAddTo = async () => { newAddrView('', true, toViews, toBtn, toCell, toRow) }
|
||||
const cmdAddCc = async () => { newAddrView('', true, ccViews, ccBtn, ccCell, ccRow) }
|
||||
const cmdAddBcc = async () => { newAddrView('', true, bccViews, bccBtn, bccCell, bccRow) }
|
||||
const cmdReplyTo = async () => { newAddrView('', false, replytoViews, replyToBtn, replyToCell, replyToRow, true) }
|
||||
const cmdCustomFrom = async () => {
|
||||
if (customFrom) {
|
||||
return
|
||||
@ -1249,7 +1253,7 @@ const compose = (opts: ComposeOptions) => {
|
||||
// ctrl - and ctrl = (+) not included, they are handled by keydown handlers on in the inputs they remove/add.
|
||||
}
|
||||
|
||||
const newAddrView = (addr: string, views: AddrView[], btn: HTMLButtonElement, cell: HTMLElement, row: HTMLElement, single?: boolean) => {
|
||||
const newAddrView = (addr: string, isRecipient: boolean, views: AddrView[], btn: HTMLButtonElement, cell: HTMLElement, row: HTMLElement, single?: boolean) => {
|
||||
if (single && views.length !== 0) {
|
||||
return
|
||||
}
|
||||
@ -1285,11 +1289,13 @@ const compose = (opts: ComposeOptions) => {
|
||||
}
|
||||
return '#aaa'
|
||||
}
|
||||
const setBar = (c0: string, c1: string, c2: string) => {
|
||||
const setBar = (c0: string, c1: string, c2: string, c3: string, c4: string) => {
|
||||
const stops = [
|
||||
c0 + ' 0%', c0 + ' 32%', 'white 32%', 'white 33%',
|
||||
c1 + ' 33%', c1 + ' 66%', 'white 66%', 'white 67%',
|
||||
c2 + ' 67%', c2 + ' 100%',
|
||||
c0 + ' 0%', c0 + ' 19%', 'white 19%', 'white 20%',
|
||||
c1 + ' 20%', c1 + ' 39%', 'white 39%', 'white 40%',
|
||||
c2 + ' 40%', c2 + ' 59%', 'white 59%', 'white 60%',
|
||||
c3 + ' 60%', c3 + ' 79%', 'white 79%', 'white 80%',
|
||||
c4 + ' 80%', c4 + ' 100%',
|
||||
].join(', ')
|
||||
securityBar.style.borderImage = 'linear-gradient(to right, ' + stops + ') 1'
|
||||
}
|
||||
@ -1298,14 +1304,53 @@ const compose = (opts: ComposeOptions) => {
|
||||
rcptSecAborter = aborter
|
||||
rcptSecPromise = client.withOptions({aborter: aborter}).RecipientSecurity(inputElem.value)
|
||||
rcptSecPromise.then((rs) => {
|
||||
setBar(color(rs.MTASTS), color(rs.DNSSEC), color(rs.DANE))
|
||||
setBar(color(rs.STARTTLS), color(rs.MTASTS), color(rs.DNSSEC), color(rs.DANE), color(rs.RequireTLS))
|
||||
|
||||
const implemented: string[] = []
|
||||
const check = (v: boolean, s: string) => {
|
||||
if (v) {
|
||||
implemented.push(s)
|
||||
}
|
||||
}
|
||||
check(rs.STARTTLS === api.SecurityResult.SecurityResultYes, 'STARTTLS')
|
||||
check(rs.MTASTS === api.SecurityResult.SecurityResultYes, 'MTASTS')
|
||||
check(rs.DNSSEC === api.SecurityResult.SecurityResultYes, 'DNSSEC')
|
||||
check(rs.DANE === api.SecurityResult.SecurityResultYes, 'DANE')
|
||||
check(rs.RequireTLS === api.SecurityResult.SecurityResultYes, 'RequireTLS')
|
||||
const status = 'Security mechanisms known to be implemented by the recipient domain: '+ (implemented.length === 0 ? '(none)' : implemented.join(', ')) + '.'
|
||||
inputElem.setAttribute('title', status+'\n\n'+recipientSecurityTitle)
|
||||
|
||||
aborter.abort = undefined
|
||||
v.recipientSecurity = rs
|
||||
if (isRecipient) {
|
||||
// If all recipients implement REQUIRETLS, we can enable it.
|
||||
let reqtls = true
|
||||
const walk = (l: AddrView[]) => {
|
||||
for (const v of l) {
|
||||
if (v.recipientSecurity?.RequireTLS !== api.SecurityResult.SecurityResultYes) {
|
||||
reqtls = false
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
walk(toViews)
|
||||
walk(ccViews)
|
||||
walk(bccViews)
|
||||
if (requiretls.value === '' || requiretls.value === 'yes') {
|
||||
requiretls.value = reqtls ? 'yes' : ''
|
||||
}
|
||||
}
|
||||
}, () => {
|
||||
setBar('#888', '#888', '#888')
|
||||
setBar('#888', '#888', '#888', '#888', '#888')
|
||||
inputElem.setAttribute('title', 'Error fetching security mechanisms known to be implemented by the recipient domain...\n\n'+recipientSecurityTitle)
|
||||
aborter.abort = undefined
|
||||
if (requiretls.value === 'yes') {
|
||||
requiretls.value = ''
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const recipientSecurityTitle = 'Description of security mechanisms recipient domains may implement:\n1. STARTTLS: Opportunistic (unverified) TLS with STARTTLS, successfully negotiated during the most recent delivery attempt.\n2. MTA-STS: For PKIX/WebPKI-verified TLS.\n3. DNSSEC: MX DNS records are DNSSEC-signed.\n4. DANE: First delivery destination host implements DANE for verified TLS.\n5. RequireTLS: SMTP extension for verified TLS delivery into recipient mailbox, support detected during the most recent delivery attempt.\n\nChecks STARTTLS, DANE and RequireTLS cover the most recently used delivery path, not necessarily all possible delivery paths.\n\nThe bars below the input field indicate implementation status by the recipient domain:\n- Red, not implemented/unsupported\n- Green, implemented/supported\n- Gray, error while determining\n- Absent/white, unknown or skipped (e.g. no previous delivery attempt, or DANE check skipped due to DNSSEC-lookup error)'
|
||||
const root = dom.span(
|
||||
autosizeElem=dom.span(
|
||||
dom._class('autosize'),
|
||||
@ -1314,12 +1359,12 @@ const compose = (opts: ComposeOptions) => {
|
||||
style({width: 'auto'}),
|
||||
attr.value(addr),
|
||||
newAddressComplete(),
|
||||
attr.title('The bars below the input field indicate security features of the recipient (domain):\n1. Delivery with STARTTLS and MTA-STS (PKIX/WebPKI) enforced.\n2. MX lookup resulted in DNSSEC-signed response.\n3. First delivery destination host has DANE, so STARTTLS is required.\n\nColors:\n- Red, not implemented/unsupported\n- Green, implemented/supported\n- Gray, error while determining\n- Absent/white, unknown or skipped (e.g. dane check skipped due to dnssec-lookup error)'),
|
||||
attr.title(recipientSecurityTitle),
|
||||
function keydown(e: KeyboardEvent) {
|
||||
if (e.key === '-' && e.ctrlKey) {
|
||||
remove()
|
||||
} else if (e.key === '=' && e.ctrlKey) {
|
||||
newAddrView('', views, btn, cell, row, single)
|
||||
newAddrView('', isRecipient, views, btn, cell, row, single)
|
||||
} else {
|
||||
return
|
||||
}
|
||||
@ -1353,7 +1398,6 @@ const compose = (opts: ComposeOptions) => {
|
||||
' ',
|
||||
)
|
||||
autosizeElem.dataset.value = inputElem.value
|
||||
fetchRecipientSecurity()
|
||||
|
||||
const remove = () => {
|
||||
const i = views.indexOf(v)
|
||||
@ -1383,7 +1427,10 @@ const compose = (opts: ComposeOptions) => {
|
||||
}
|
||||
}
|
||||
|
||||
const v: AddrView = {root: root, input: inputElem}
|
||||
const v: AddrView = {root: root, input: inputElem, isRecipient: isRecipient, recipientSecurity: null}
|
||||
|
||||
fetchRecipientSecurity()
|
||||
|
||||
views.push(v)
|
||||
cell.appendChild(v.root)
|
||||
row.style.display = ''
|
||||
@ -1541,8 +1588,21 @@ const compose = (opts: ComposeOptions) => {
|
||||
}), ' (Toggle all)')
|
||||
),
|
||||
noAttachmentsWarning=dom.div(style({display: 'none', backgroundColor: '#fcd284', padding: '0.15em .25em', margin: '.5em 0'}), 'Message mentions attachments, but no files are attached.'),
|
||||
dom.div(style({margin: '1ex 0'}), 'Attachments ', attachments=dom.input(attr.type('file'), attr.multiple(''), function change() { checkAttachments() })),
|
||||
dom.submitbutton('Send'),
|
||||
dom.label(style({margin: '1ex 0', display: 'block'}), 'Attachments ', attachments=dom.input(attr.type('file'), attr.multiple(''), function change() { checkAttachments() })),
|
||||
dom.label(
|
||||
style({margin: '1ex 0', display: 'block'}),
|
||||
attr.title('How to use TLS for message delivery over SMTP:\n\nDefault: Delivery attempts follow the policies published by the recipient domain: Verification with MTA-STS and/or DANE, or optional opportunistic unverified STARTTLS if the domain does not specify a policy.\n\nWith RequireTLS: For sensitive messages, you may want to require verified TLS. The recipient destination domain SMTP server must support the REQUIRETLS SMTP extension for delivery to succeed. It is automatically chosen when the destination domain mail servers of all recipients are known to support it.\n\nFallback to insecure: If delivery fails due to MTA-STS and/or DANE policies specified by the recipient domain, and the content is not sensitive, you may choose to ignore the recipient domain TLS policies so delivery can succeed.'),
|
||||
'TLS ',
|
||||
requiretls=dom.select(
|
||||
dom.option(attr.value(''), 'Default'),
|
||||
dom.option(attr.value('yes'), 'With RequireTLS'),
|
||||
dom.option(attr.value('no'), 'Fallback to insecure'),
|
||||
),
|
||||
),
|
||||
dom.div(
|
||||
style({margin: '3ex 0 1ex 0', display: 'block'}),
|
||||
dom.submitbutton('Send'),
|
||||
),
|
||||
),
|
||||
async function submit(e: SubmitEvent) {
|
||||
e.preventDefault()
|
||||
@ -1553,11 +1613,11 @@ const compose = (opts: ComposeOptions) => {
|
||||
|
||||
subjectAutosize.dataset.value = subject.value
|
||||
|
||||
;(opts.to && opts.to.length > 0 ? opts.to : ['']).forEach(s => newAddrView(s, toViews, toBtn, toCell, toRow))
|
||||
;(opts.cc || []).forEach(s => newAddrView(s, ccViews, ccBtn, ccCell, ccRow))
|
||||
;(opts.bcc || []).forEach(s => newAddrView(s, bccViews, bccBtn, bccCell, bccRow))
|
||||
;(opts.to && opts.to.length > 0 ? opts.to : ['']).forEach(s => newAddrView(s, true, toViews, toBtn, toCell, toRow))
|
||||
;(opts.cc || []).forEach(s => newAddrView(s,true, ccViews, ccBtn, ccCell, ccRow))
|
||||
;(opts.bcc || []).forEach(s => newAddrView(s, true, bccViews, bccBtn, bccCell, bccRow))
|
||||
if (opts.replyto) {
|
||||
newAddrView(opts.replyto, replytoViews, replyToBtn, replyToCell, replyToRow, true)
|
||||
newAddrView(opts.replyto, false, replytoViews, replyToBtn, replyToCell, replyToRow, true)
|
||||
}
|
||||
if (!opts.cc || !opts.cc.length) {
|
||||
ccRow.style.display = 'none'
|
||||
|
||||
Reference in New Issue
Block a user