mirror of
https://github.com/mjl-/mox.git
synced 2025-07-12 18:24:35 +03:00
new feature: when delivering messages from the queue, make it possible to use a "transport"
the default transport is still just "direct delivery", where we connect to the destination domain's MX servers. other transports are: - regular smtp without authentication, this is relaying to a smarthost. - submission with authentication, e.g. to a third party email sending service. - direct delivery, but with with connections going through a socks proxy. this can be helpful if your ip is blocked, you need to get email out, and you have another IP that isn't blocked. keep in mind that for all of the above, appropriate SPF/DKIM settings have to be configured. the "dnscheck" for a domain does a check for any SOCKS IP in the SPF record. SPF for smtp/submission (ranges? includes?) and any DKIM requirements cannot really be checked. which transport is used can be configured through routes. routes can be set on an account, a domain, or globally. the routes are evaluated in that order, with the first match selecting the transport. these routes are evaluated for each delivery attempt. common selection criteria are recipient domain and sender domain, but also which delivery attempt this is. you could configured mox to attempt sending through a 3rd party from the 4th attempt onwards. routes and transports are optional. if no route matches, or an empty/zero transport is selected, normal direct delivery is done. we could already "submit" emails with 3rd party accounts with "sendmail". but we now support more SASL authentication mechanisms with SMTP (not only PLAIN, but also SCRAM-SHA-256, SCRAM-SHA-1 and CRAM-MD5), which sendmail now also supports. sendmail will use the most secure mechanism supported by the server, or the explicitly configured mechanism. for issue #36 by dmikushin. also based on earlier discussion on hackernews.
This commit is contained in:
@ -195,9 +195,9 @@ const formatSize = n => {
|
||||
|
||||
const index = async () => {
|
||||
const [domains, queueSize, checkUpdatesEnabled] = await Promise.all([
|
||||
await api.Domains(),
|
||||
await api.QueueSize(),
|
||||
await api.CheckUpdatesEnabled(),
|
||||
api.Domains(),
|
||||
api.QueueSize(),
|
||||
api.CheckUpdatesEnabled(),
|
||||
])
|
||||
|
||||
let fieldset, domain, account, localpart
|
||||
@ -265,6 +265,7 @@ const index = async () => {
|
||||
dom.div(dom.a('MTA-STS policies', attr({href: '#mtasts'}))),
|
||||
// todo: outgoing DMARC findings
|
||||
// todo: outgoing TLSRPT findings
|
||||
// todo: routing, globally, per domain and per account
|
||||
dom.br(),
|
||||
dom.h2('DNS blocklist status'),
|
||||
dom.div(dom.a('DNSBL status', attr({href: '#dnsbl'}))),
|
||||
@ -1525,9 +1526,13 @@ const dnsbl = async () => {
|
||||
}
|
||||
|
||||
const queueList = async () => {
|
||||
const msgs = await api.QueueList()
|
||||
const [msgs, transports] = await Promise.all([
|
||||
api.QueueList(),
|
||||
api.Transports(),
|
||||
])
|
||||
|
||||
const nowSecs = new Date().getTime()/1000
|
||||
let transport
|
||||
|
||||
const page = document.getElementById('page')
|
||||
dom._kids(page,
|
||||
@ -1550,7 +1555,8 @@ const queueList = async () => {
|
||||
dom.th('Next attempt'),
|
||||
dom.th('Last attempt'),
|
||||
dom.th('Last error'),
|
||||
dom.th('Action'),
|
||||
dom.th('Transport/Retry'),
|
||||
dom.th('Remove'),
|
||||
),
|
||||
),
|
||||
dom.tbody(
|
||||
@ -1565,11 +1571,17 @@ const queueList = async () => {
|
||||
dom.td(m.LastAttempt ? age(new Date(m.LastAttempt), false, nowSecs) : '-'),
|
||||
dom.td(m.LastError || '-'),
|
||||
dom.td(
|
||||
dom.button('Try now', async function click(e) {
|
||||
transport=dom.select(
|
||||
attr({title: 'Transport to use for delivery attempts. The default is direct delivery, connecting to the MX hosts of the domain.'}),
|
||||
dom.option('(default)', attr({value: ''})),
|
||||
Object.keys(transports).sort().map(t => dom.option(t, m.Transport === t ? attr({checked: ''}) : [])),
|
||||
),
|
||||
' ',
|
||||
dom.button('Retry now', async function click(e) {
|
||||
e.preventDefault()
|
||||
try {
|
||||
e.target.disabled = true
|
||||
await api.QueueKick(m.ID)
|
||||
await api.QueueKick(m.ID, transport.value)
|
||||
} catch (err) {
|
||||
console.log({err})
|
||||
window.alert('Error: ' + err.message)
|
||||
@ -1579,7 +1591,8 @@ const queueList = async () => {
|
||||
}
|
||||
window.location.reload() // todo: only refresh the list
|
||||
}),
|
||||
' ',
|
||||
),
|
||||
dom.td(
|
||||
dom.button('Remove', async function click(e) {
|
||||
e.preventDefault()
|
||||
if (!window.confirm('Are you sure you want to remove this message? It will be removed completely.')) {
|
||||
|
Reference in New Issue
Block a user