mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 05:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename modules and introduce namespace-aware module name lookups

Browse source 
See #248.
This commit is contained in:
fox.cpp 2020-07-14 19:42:17 +03:00
parent 4ea9f1eef7
commit 03d9e52627
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
44 changed files with 184 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

24
docs/man/maddy-auth.5.scd
View file

@ -16,7 +16,7 @@ that contains all usernames known to the module. Exceptions are extauth and
pam as underlying interfaces do not define a way to check credentials pam as underlying interfaces do not define a way to check credentials
existence. existence.
# External authentication module (extauth) # External authentication module (auth.external)
Module for authentication using external helper binary. It looks for binary Module for authentication using external helper binary. It looks for binary
named maddy-auth-helper in $PATH and libexecdir and uses it for authentication named maddy-auth-helper in $PATH and libexecdir and uses it for authentication
@ -30,7 +30,7 @@ authentication is failed. If the status code is 2 - another unrelated error has
happened. Additional information should be written to stderr. happened. Additional information should be written to stderr.
``` ```
extauth { auth.external {
helper /usr/bin/ldap-helper helper /usr/bin/ldap-helper
perdomain no perdomain no
domains example.org domains example.org
@ -63,7 +63,7 @@ If used without 'perdomain', domain part will be removed from login before
check with underlying auth. mechanism. If 'perdomain' is set, then check with underlying auth. mechanism. If 'perdomain' is set, then
domains must be also set and domain part WILL NOT be removed before check. domains must be also set and domain part WILL NOT be removed before check.
# PAM module (pam) # PAM module (auth.pam)
Implements authentication using libpam. Alternatively it can be configured to Implements authentication using libpam. Alternatively it can be configured to
use helper binary like extauth module does. use helper binary like extauth module does.
@ -75,7 +75,7 @@ go get -tags 'libpam' ...
``` ```
``` ```
pam { auth.pam {
debug no debug no
use_helper no use_helper no
} }
@ -107,13 +107,13 @@ chown root:maddy /usr/lib/maddy/maddy-pam-helper
chmod u+xs,g+x,o-x /usr/lib/maddy/maddy-pam-helper chmod u+xs,g+x,o-x /usr/lib/maddy/maddy-pam-helper
``` ```
# Shadow database authentication module (shadow) # Shadow database authentication module (auth.shadow)
Implements authentication by reading /etc/shadow. Alternatively it can be Implements authentication by reading /etc/shadow. Alternatively it can be
configured to use helper binary like extauth does. configured to use helper binary like extauth does.
``` ```
shadow { auth.shadow {
debug no debug no
use_helper no use_helper no
} }
@ -143,7 +143,7 @@ chown root:maddy /usr/lib/maddy/maddy-shadow-helper
chmod u+xs,g+x,o-x /usr/lib/maddy/maddy-shadow-helper chmod u+xs,g+x,o-x /usr/lib/maddy/maddy-shadow-helper
``` ```
# Table-based password hash lookup (pass_table) # Table-based password hash lookup (auth.pass_table)
This module implements username:password authentication by looking up the This module implements username:password authentication by looking up the
password hash using a table module (maddy-tables(5)). It can be used password hash using a table module (maddy-tables(5)). It can be used
@ -153,7 +153,7 @@ to load user credentials from text file (file module) or SQL query
Definition: Definition:
``` ```
pass_table [block name] { auth.pass_table [block name] {
table <table config> table <table config>
} }
@ -188,14 +188,14 @@ the 'maddyctl creds' command can be used to modify the underlying tables
via pass_table module. It will act a "local credentials store" and will write via pass_table module. It will act a "local credentials store" and will write
appropriate hash values to the table. appropriate hash values to the table.
# Separate username and password lookup (plain_separate) # Separate username and password lookup (auth.plain_separate)
This module implements authentication using username:password pairs but can This module implements authentication using username:password pairs but can
use zero or more "table modules" (maddy-tables(5)) and one or more use zero or more "table modules" (maddy-tables(5)) and one or more
authentication providers to verify credentials. authentication providers to verify credentials.
``` ```
plain_separate { auth.plain_separate {
user ... user ...
user ... user ...
... ...
@ -231,7 +231,7 @@ Configuration block for any auth. provider module can be used here, even
The used auth. provider must provide username:password pair-based The used auth. provider must provide username:password pair-based
authentication. authentication.
# Dovecot authentication client (dovecot_sasl) # Dovecot authentication client (auth.dovecot_sasl)
The 'dovecot_sasl' module implements the client side of the Dovecot The 'dovecot_sasl' module implements the client side of the Dovecot
authentication protocol, allowing maddy to use it as a credentials source. authentication protocol, allowing maddy to use it as a credentials source.
@ -240,7 +240,7 @@ Currently SASL mechanisms support is limited to mechanisms supported by maddy
so you cannot get e.g. SCRAM-MD5 this way. so you cannot get e.g. SCRAM-MD5 this way.
``` ```
dovecot_sasl { auth.dovecot_sasl {
endpoint unix://socket_path endpoint unix://socket_path
} }

34
docs/man/maddy-filters.5.scd
View file

@ -87,13 +87,13 @@ the STARTTLS command.
By default, rejects messages coming from unencrypted servers. Use the By default, rejects messages coming from unencrypted servers. Use the
'fail_action' directive to change that. 'fail_action' directive to change that.
# DKIM authentication module (verify_dkim) # DKIM authentication module (check.dkim)
This is the check module that performs verification of the DKIM signatures This is the check module that performs verification of the DKIM signatures
present on the incoming messages. present on the incoming messages.
``` ```
verify_dkim { check.dkim {
debug no debug no
required_fields From Subject required_fields From Subject
allow_body_subset no allow_body_subset no
@ -152,13 +152,13 @@ Whether to accept the message if a temporary error occurs during DKIM
verification. Rejecting the message with a 4xx code will require the sender verification. Rejecting the message with a 4xx code will require the sender
to resend it later in a hope that the problem will be resolved. to resend it later in a hope that the problem will be resolved.
# SPF policy enforcement module (apply_spf) # SPF policy enforcement module (check.spf)
This is the check module that verifies whether IP address of the client is This is the check module that verifies whether IP address of the client is
authorized to send messages for domain in MAIL FROM address. authorized to send messages for domain in MAIL FROM address.
``` ```
apply_spf { check.spf {
debug no debug no
enforce_early no enforce_early no
fail_action quarantine fail_action quarantine
@ -173,7 +173,7 @@ apply_spf {
It is recommended by the DMARC standard to don't fail delivery based solely on It is recommended by the DMARC standard to don't fail delivery based solely on
SPF policy and always check DMARC policy and take action based on it. SPF policy and always check DMARC policy and take action based on it.
If enforce_early is no, apply_spf module will not take any action on SPF If enforce_early is no, check.spf module will not take any action on SPF
policy failure if sender domain does have a DMARC record with 'quarantine' or policy failure if sender domain does have a DMARC record with 'quarantine' or
'reject' policy. Instead it will rely on DMARC support to take necesary 'reject' policy. Instead it will rely on DMARC support to take necesary
actions using SPF results as an input. actions using SPF results as an input.
@ -186,7 +186,7 @@ no-op and is considered insecure.
*Syntax*: debug _boolean_ ++ *Syntax*: debug _boolean_ ++
*Default*: global directive value *Default*: global directive value
Enable verbose logging for apply_spf. Enable verbose logging for check.spf.
*Syntax*: enforce_early _boolean_ ++ *Syntax*: enforce_early _boolean_ ++
*Default*: no *Default*: no
@ -230,7 +230,7 @@ Action to take when SPF policy evaluates to a 'permerror' result.
Action to take when SPF policy evaluates to a 'temperror' result. Action to take when SPF policy evaluates to a 'temperror' result.
# DNSBL lookup module (dnsbl) # DNSBL lookup module (check.dnsbl)
The dnsbl module implements checking of source IP and hostnames against a set The dnsbl module implements checking of source IP and hostnames against a set
of DNS-based Blackhole lists (DNSBLs). of DNS-based Blackhole lists (DNSBLs).
@ -239,7 +239,7 @@ Its configuration consists of module configuration directives and a set
of blocks specifing lists to use and kind of lookups to perform on them. of blocks specifing lists to use and kind of lookups to perform on them.
``` ```
dnsbl { check.dnsbl {
debug no debug no
check_early no check_early no
@ -387,13 +387,13 @@ will be rejected.
It is possible to specify a negative value to make list act like a whitelist It is possible to specify a negative value to make list act like a whitelist
and override results of other blocklists. and override results of other blocklists.
# DKIM signing module (sign_dkim) # DKIM signing module (modify.dkim)
sign_dkim module is a modifier that signs messages using DKIM sign_dkim module is a modifier that signs messages using DKIM
protocol (RFC 6376). protocol (RFC 6376).
``` ```
sign_dkim { modify.dkim {
debug no debug no
domains example.org example.com domains example.org example.com
selector default selector default
@ -414,7 +414,7 @@ domains and selector can be specified in arguments, so actual sign_dkim use can
be shortened to the following: be shortened to the following:
``` ```
modify { modify {
sign_dkim example.org selector dkim example.org selector
} }
``` ```
@ -574,7 +574,7 @@ Sign emails from subdomains using a top domain key.
Allows only one domain to be specified (can be workarounded using sign_dkim Allows only one domain to be specified (can be workarounded using sign_dkim
multiple times). multiple times).
# Envelope sender / recipient rewriting (replace_sender, replace_rcpt) # Envelope sender / recipient rewriting (modify.replace_sender, modify.replace_rcpt)
'replace_sender' and 'replace_rcpt' modules replace SMTP envelope addresses 'replace_sender' and 'replace_rcpt' modules replace SMTP envelope addresses
based on the mapping defined by the table module (maddy-tables(5)). Currently, based on the mapping defined by the table module (maddy-tables(5)). Currently,
@ -625,7 +625,7 @@ cat: dog
cat@example.org: cat@example.com cat@example.org: cat@example.com
``` ```
# System command filter (command) # System command filter (check.command)
This module executes an arbitrary system command during a specified stage of This module executes an arbitrary system command during a specified stage of
checks execution. checks execution.
@ -756,7 +756,7 @@ Two codes are defined implicitly, exit code 1 causes the message to be rejected
with a permanent error, exit code 2 causes the message to be quarantined. Both with a permanent error, exit code 2 causes the message to be quarantined. Both
action can be overriden using the 'code' directive. action can be overriden using the 'code' directive.
## Milter protocol check (milter) ## Milter protocol check (check.milter)
The 'milter' implements subset of Sendmail's milter protocol that can be used The 'milter' implements subset of Sendmail's milter protocol that can be used
to integrate external software in maddy. to integrate external software in maddy.
@ -773,7 +773,7 @@ removed without major changes to it. Restrictions 3, 4 and 5 are temporary due t
incomplete implementation. incomplete implementation.
``` ```
milter { check.milter {
endpoint <endpoint> endpoint <endpoint>
fail_open false fail_open false
} }
@ -801,13 +801,13 @@ The endpoit is specified in standard URL-like format:
Toggles behavior on milter I/O errors. If false ("fail closed") - message is Toggles behavior on milter I/O errors. If false ("fail closed") - message is
rejected with temporary error code. If true ("fail open") - check is skipped. rejected with temporary error code. If true ("fail open") - check is skipped.
## rspamd check (rspamd) ## rspamd check (check.rspamd)
The 'rspamd' module implements message filtering by contacting the rspamd The 'rspamd' module implements message filtering by contacting the rspamd
server via HTTP API. server via HTTP API.
``` ```
rspamd { check.rspamd {
tls_client { ... } tls_client { ... }
api_path http://127.0.0.1:11333 api_path http://127.0.0.1:11333
settings_id whatever settings_id whatever

10
docs/man/maddy-smtp.5.scd
View file

@ -147,7 +147,7 @@ check module.
*NOTE*: Report generation is not implemented now. *NOTE*: Report generation is not implemented now.
*NOTE*: DMARC needs apply_spf and verify_dkim checks to function correctly. *NOTE*: DMARC needs SPF and DKIM checks to function correctly.
Without these, DMARC check will not run. Without these, DMARC check will not run.
## Rate & concurrency limiting ## Rate & concurrency limiting
@ -538,8 +538,8 @@ This configuration allows to specify alias local addresses to remote ones
without being an open relay, since remote_queue can be used only if remote without being an open relay, since remote_queue can be used only if remote
address was introduced as a result of rewrite of local address. address was introduced as a result of rewrite of local address.
*WARNING*: If you have DMARC enabled (default), results generated by apply_spf *WARNING*: If you have DMARC enabled (default), results generated by SPF
and verify_dkim checks inside a reroute block *will not* be considered in DMARC and DKIM checks inside a reroute block *will not* be considered in DMARC
evaluation. evaluation.
*Syntax*: destination_in _table reference_ { ... } ++ *Syntax*: destination_in _table reference_ { ... } ++
@ -553,7 +553,7 @@ Takes precedence over all 'destination' directives.
Example: Example:
``` ```
destination_in file /etc/maddy/remote_addrs { destination_in file /etc/maddy/remote_addrs {
deliver_to smtp_downstream tcp://10.0.0.7:25 deliver_to smtp tcp://10.0.0.7:25
} }
destination example.com { destination example.com {
deliver_to &local_mailboxes deliver_to &local_mailboxes
@ -575,7 +575,7 @@ destination_in sql_table {
In this case, configuration should be specified separately and be referneced In this case, configuration should be specified separately and be referneced
using '&' syntax: using '&' syntax:
``` ```
sql_table remote_addrs { table.sql_table remote_addrs {
dsn ... dsn ...
driver ... driver ...
} }

4
docs/man/maddy-storage.5.scd
View file

@ -19,7 +19,7 @@ auto-creation will not happen when delivering incoming messages via SMTP as
there is no authentication to confirm that this account should indeed be there is no authentication to confirm that this account should indeed be
created. created.
# SQL-based database module (imapsql) # SQL-based database module (storage.imapsql)
The imapsql module implements unified database for IMAP index and message The imapsql module implements unified database for IMAP index and message
metadata using SQL-based relational database. metadata using SQL-based relational database.
@ -37,7 +37,7 @@ case-insensitive. UTF-8 names are supported with restrictions defined in the
PRECIS UsernameCaseMapped profile. PRECIS UsernameCaseMapped profile.
``` ```
imapsql { storage.imapsql {
driver sqlite3 driver sqlite3
dsn imapsql.db dsn imapsql.db
} }

20
docs/man/maddy-tables.5.scd
View file

@ -11,7 +11,7 @@ change the source of data, effectively turning the table into a complete
interface to a key-value store for maddy. Such tables are referred to as interface to a key-value store for maddy. Such tables are referred to as
"mutable tables". "mutable tables".
# File mapping (file) # File mapping (table.file)
This module builds string-string mapping from a text file. This module builds string-string mapping from a text file.
@ -58,13 +58,13 @@ aaa: bbb
aaa aaa
``` ```
# SQL query mapping (sql_query) # SQL query mapping (table.sql_query)
The sql_query module implements table interface using SQL queries. The sql_query module implements table interface using SQL queries.
Definition: Definition:
``` ```
sql_query { table.sql_query {
driver <driver name> driver <driver name>
dsn <data source name> dsn <data source name>
lookup <lookup query> lookup <lookup query>
@ -125,7 +125,7 @@ List of queries to execute on initialization. Can be used to configure RDBMS.
Example, to improve SQLite3 performance: Example, to improve SQLite3 performance:
``` ```
sql_query { table.sql_query {
driver sqlite3 driver sqlite3
dsn whatever.db dsn whatever.db
init "PRAGMA journal_mode=WAL" \ init "PRAGMA journal_mode=WAL" \
@ -155,13 +155,13 @@ entry in the database.
'del' query gets :key argument - key and should remove it from the database. 'del' query gets :key argument - key and should remove it from the database.
# Static table (static) # Static table (table.static)
The 'static' module implements table lookups using key-value pairs in its The 'static' module implements table lookups using key-value pairs in its
configuration. configuration.
``` ```
static { table.static {
entry KEY1 VALUE1 entry KEY1 VALUE1
entry KEY2 VALUE2 entry KEY2 VALUE2
... ...
@ -176,7 +176,7 @@ Add an entry to the table.
If the same key is used multiple times, the last one takes effect. If the same key is used multiple times, the last one takes effect.
# Regexp rewrite table (regexp) # Regexp rewrite table (table.regexp)
The 'regexp' module implements table lookups by applying a regular expression The 'regexp' module implements table lookups by applying a regular expression
to the key value. If it matches - 'replacement' value is returned with $N to the key value. If it matches - 'replacement' value is returned with $N
@ -187,7 +187,7 @@ The regular expression syntax is the subset of PCRE. See
https://golang.org/pkg/regexp/syntax/ for details. https://golang.org/pkg/regexp/syntax/ for details.
``` ```
regexp <regexp> <replacement> { table.regexp <regexp> <replacement> {
full_match yes full_match yes
case_insensitive yes case_insensitive yes
expand_placeholders yes expand_placeholders yes
@ -216,12 +216,12 @@ corresponding capture groups from the match.
To insert a literal $ in the output, use $$ in the template. To insert a literal $ in the output, use $$ in the template.
# Identity table (identity) # Identity table (table.identity)
The module 'identity' is a table module that just returns the key looked up. The module 'identity' is a table module that just returns the key looked up.
``` ```
identity { } table.identity { }
``` ```
# No-op table (dummy) # No-op table (dummy)

20
docs/man/maddy-targets.5.scd
View file

@ -5,18 +5,18 @@ maddy-targets(5) "maddy mail server" "maddy reference documentation"
This man page describes modules that can used with 'deliver_to' directive This man page describes modules that can used with 'deliver_to' directive
of SMTP endpoint module. of SMTP endpoint module.
# SQL module (sql) # SQL module (target.imapsql)
SQL module described in *maddy-storage*(5) can also be used as a delivery SQL module described in *maddy-storage*(5) can also be used as a delivery
target. target.
# Queue module (queue) # Queue module (target.queue)
Queue module buffers messages on disk and retries delivery multiple times to Queue module buffers messages on disk and retries delivery multiple times to
another target to ensure reliable delivery. another target to ensure reliable delivery.
``` ```
queue { target.queue {
target remote target remote
location ... location ...
max_parallelism 16 max_parallelism 16
@ -98,7 +98,7 @@ Module that implements message delivery to remote MTAs discovered via DNS MX
records. You probably want to use it with queue module for reliability. records. You probably want to use it with queue module for reliability.
``` ```
remote { target.remote {
hostname mx.example.org hostname mx.example.org
debug no debug no
} }
@ -344,21 +344,21 @@ Set the minimal MX security level required for all outbound messages.
See [Security levels](../../seclevels) page for details. See [Security levels](../../seclevels) page for details.
# SMTP transparent forwarding module (smtp_downstream) # SMTP transparent forwarding module (target.smtp)
Module that implements transparent forwarding of messages over SMTP. Module that implements transparent forwarding of messages over SMTP.
Use in pipeline configuration: Use in pipeline configuration:
``` ```
deliver_to smtp_downstream tcp://127.0.0.1:5353 deliver_to smtp tcp://127.0.0.1:5353
# or # or
deliver_to smtp_downstream tcp://127.0.0.1:5353 { deliver_to smtp tcp://127.0.0.1:5353 {
# Other settings, see below. # Other settings, see below.
} }
``` ```
``` ```
smtp_downstream { target.smtp {
debug no debug no
tls_client { tls_client {
... ...
@ -439,7 +439,7 @@ TLS).
Multiple addresses can be specified, they will be tried in order until connection to Multiple addresses can be specified, they will be tried in order until connection to
one succeeds (including TLS handshake if TLS is required). one succeeds (including TLS handshake if TLS is required).
# LMTP transparent forwarding module (lmtp_downstream) # LMTP transparent forwarding module (target.lmtp)
The 'lmtp_downstream' module is similar to 'smtp_downstream' and supports all The 'target.lmtp' module is similar to 'target.smtp' and supports all
its options and syntax but speaks LMTP instead of SMTP. its options and syntax but speaks LMTP instead of SMTP.

16
docs/man/maddy.1.scd
View file

@ -61,9 +61,9 @@ smtp ... {
# Deliver messages to the 'dummy' module with the default configuration. # Deliver messages to the 'dummy' module with the default configuration.
deliver_to dummy deliver_to dummy
# Deliver messages to the 'smtp_downstream' module with # Deliver messages to the 'target.smtp' module with
# 'tcp://127.0.0.1:1125' argument as a configuration. # 'tcp://127.0.0.1:1125' argument as a configuration.
deliver_to smtp_downstream tcp://127.0.0.1:1125 deliver_to smtp tcp://127.0.0.1:1125
# Deliver messages to the 'queue' module with the specified configuration. # Deliver messages to the 'queue' module with the specified configuration.
deliver_to queue { deliver_to queue {
@ -78,7 +78,7 @@ at the top-level and merely referenced by its name where it is needed.
Here is the example: Here is the example:
``` ```
sql local_mailboxes { storage.imapsql local_mailboxes {
driver sqlite3 driver sqlite3
dsn all.db dsn all.db
} }
@ -93,18 +93,24 @@ initialize such as storage backends and authentication providers.
For top-level configuration block definition, syntax is as follows: For top-level configuration block definition, syntax is as follows:
``` ```
module_name config_block_name... { namespace.module_name config_block_name... {
module_configuration module_configuration
} }
``` ```
If config_block_name is omitted, it will be the same as module_name. Multiple If config_block_name is omitted, it will be the same as module_name. Multiple
names can be specified. All names must be unique. names can be specified. All names must be unique.
Note the "storage." prefix. The actual module name is this and includes
"namespace". It is a little cheating to make more concise names and can
be omitted when you reference the module where it is used since it can
be implied (e.g. putting module reference in "check{}" likely means you want
something with "check." prefix)
Usual module arguments can't be specified when using this syntax, however, Usual module arguments can't be specified when using this syntax, however,
modules usually provide explicit directives that allow to specify the needed modules usually provide explicit directives that allow to specify the needed
values. For example 'sql sqlite3 all.db' is equivalent to values. For example 'sql sqlite3 all.db' is equivalent to
``` ```
sql { storage.imapsql {
driver sqlite3 driver sqlite3
dsn all.db dsn all.db
} }

4
docs/tutorials/smtp-only.md
View file

@ -29,9 +29,9 @@ service lmtp {
} }
``` ```
Add `local_mailboxes` block to maddy config using `lmtp_downstream` module: Add `local_mailboxes` block to maddy config using `target.lmtp` module:
``` ```
lmtp_downstream local_mailboxes { target.lmtp local_mailboxes {
targets unix:///var/run/maddy/dovecot-lmtp.sock targets unix:///var/run/maddy/dovecot-lmtp.sock
} }
``` ```

2
internal/README.md
View file

@ -12,7 +12,7 @@ endpoint/
modules - protocol listeners (e.g. SMTP server, etc) modules - protocol listeners (e.g. SMTP server, etc)
target/ target/
modules - final delivery targets (including outbound delivery, such as modules - final delivery targets (including outbound delivery, such as
smtp_downstream, remote) target.smtp, remote)
auth/ auth/
modules - authentication providers modules - authentication providers
check/ check/

3
internal/auth/external/externalauth.go vendored
View file

@ -81,5 +81,6 @@ func (ea *ExternalAuth) AuthPlain(username, password string) error {
} }
func init() { func init() {
module.Register("extauth", NewExternalAuth) module.RegisterDeprecated("extauth", "auth.command", NewExternalAuth)
module.Register("auth.external", NewExternalAuth)
} }

3
internal/auth/pam/module.go
View file

@ -72,5 +72,6 @@ func (a *Auth) AuthPlain(username, password string) error {
} }
func init() { func init() {
module.Register("pam", New) module.RegisterDeprecated("pam", "auth.pam", New)
module.Register("auth.pam", New)
} }

5
internal/auth/pass_table/table.go
View file

@ -29,7 +29,7 @@ func New(modName, instName string, _, inlineArgs []string) (module.Module, error
func (a *Auth) Init(cfg *config.Map) error { func (a *Auth) Init(cfg *config.Map) error {
if len(a.inlineArgs) != 0 { if len(a.inlineArgs) != 0 {
return modconfig.ModuleFromNode(a.inlineArgs, cfg.Block, cfg.Globals, &a.table) return modconfig.ModuleFromNode("table", a.inlineArgs, cfg.Block, cfg.Globals, &a.table)
} }
cfg.Custom("table", false, true, nil, modconfig.TableDirective, &a.table) cfg.Custom("table", false, true, nil, modconfig.TableDirective, &a.table)
@ -168,5 +168,6 @@ func (a *Auth) DeleteUser(username string) error {
} }
func init() { func init() {
module.Register("pass_table", New) module.RegisterDeprecated("pass_table", "auth.pass_table", New)
module.Register("auth.pass_table", New)
} }

3
internal/auth/plain_separate/plain_separate.go
View file

@ -101,5 +101,6 @@ func (a *Auth) AuthPlain(username, password string) error {
} }
func init() { func init() {
module.Register("plain_separate", NewAuth) module.RegisterDeprecated("plain_separate", "auth.plain_separate", NewAuth)
module.Register("auth.plain_separate", NewAuth)
} }

2
internal/auth/sasl.go
View file

@ -93,7 +93,7 @@ func (s *SASLAuth) CreateSASL(mech string, remoteAddr net.Addr, successCb func(i
// the 'auth' configuration directive. // the 'auth' configuration directive.
func (s *SASLAuth) AddProvider(m *config.Map, node config.Node) error { func (s *SASLAuth) AddProvider(m *config.Map, node config.Node) error {
var any interface{} var any interface{}
if err := modconfig.ModuleFromNode(node.Args, node, m.Globals, &any); err != nil { if err := modconfig.ModuleFromNode("auth", node.Args, node, m.Globals, &any); err != nil {
return err return err
} }

3
internal/auth/shadow/module.go
View file

@ -112,5 +112,6 @@ func (a *Auth) AuthPlain(username, password string) error {
} }
func init() { func init() {
module.Register("shadow", New) module.RegisterDeprecated("shadow", "auth.shadow", New)
module.Register("auth.shadow", New)
} }

3
internal/check/command/command.go
View file

@ -25,7 +25,7 @@ import (
"github.com/foxcpp/maddy/internal/target" "github.com/foxcpp/maddy/internal/target"
) )
const modName = "command" const modName = "check.command"
type Stage string type Stage string
@ -379,5 +379,6 @@ func (s *state) Close() error {
} }
func init() { func init() {
module.RegisterDeprecated("command", "check.command", New)
module.Register(modName, New) module.Register(modName, New)
} }

3
internal/check/dkim/dkim.go
View file

@ -257,5 +257,6 @@ func (c *Check) CheckStateForMsg(ctx context.Context, msgMeta *module.MsgMetadat
} }
func init() { func init() {
module.Register("verify_dkim", New) module.RegisterDeprecated("verify_dkim", "check.dkim", New)
module.Register("check.dkim", New)
} }

3
internal/check/dnsbl/dnsbl.go
View file

@ -423,5 +423,6 @@ func (*state) Close() error {
} }
func init() { func init() {
module.Register("dnsbl", NewDNSBL) module.RegisterDeprecated("dnsbl", "check.dnsbl", NewDNSBL)
module.Register("check.dnsbl", NewDNSBL)
} }

3
internal/check/milter/milter.go
View file

@ -18,7 +18,7 @@ import (
"github.com/foxcpp/maddy/internal/target" "github.com/foxcpp/maddy/internal/target"
) )
const modName = "milter" const modName = "check.milter"
type Check struct { type Check struct {
cl *milter.Client cl *milter.Client
@ -408,5 +408,6 @@ func (s *state) Close() error {
} }
func init() { func init() {
module.RegisterDeprecated("milter", "check.milter", New)
module.Register(modName, New) module.Register(modName, New)
} }

3
internal/check/rspamd/rspamd.go
View file

@ -20,7 +20,7 @@ import (
"github.com/foxcpp/maddy/internal/target" "github.com/foxcpp/maddy/internal/target"
) )
const modName = "rspamd" const modName = "check.rspamd"
type Check struct { type Check struct {
instName string instName string
@ -332,5 +332,6 @@ func (s *state) Close() error {
} }
func init() { func init() {
module.RegisterDeprecated("rspamd", modName, New)
module.Register(modName, New) module.Register(modName, New)
} }

3
internal/check/spf/spf.go
View file

@ -25,7 +25,7 @@ import (
"golang.org/x/net/idna" "golang.org/x/net/idna"
) )
const modName = "apply_spf" const modName = "check.spf"
type Check struct { type Check struct {
instName string instName string
@ -371,5 +371,6 @@ func (s *state) Close() error {
} }
func init() { func init() {
module.RegisterDeprecated("apply_spf", "check.spf", New)
module.Register(modName, New) module.Register(modName, New)
} }

10
internal/config/module/interfaces.go
View file

@ -7,7 +7,7 @@ import (
func MessageCheck(globals map[string]interface{}, args []string, block config.Node) (module.Check, error) { func MessageCheck(globals map[string]interface{}, args []string, block config.Node) (module.Check, error) {
var check module.Check var check module.Check
if err := ModuleFromNode(args, block, globals, &check); err != nil { if err := ModuleFromNode("check", args, block, globals, &check); err != nil {
return nil, err return nil, err
} }
return check, nil return check, nil
@ -29,7 +29,7 @@ func DeliveryDirective(m *config.Map, node config.Node) (interface{}, error) {
func DeliveryTarget(globals map[string]interface{}, args []string, block config.Node) (module.DeliveryTarget, error) { func DeliveryTarget(globals map[string]interface{}, args []string, block config.Node) (module.DeliveryTarget, error) {
var target module.DeliveryTarget var target module.DeliveryTarget
if err := ModuleFromNode(args, block, globals, &target); err != nil { if err := ModuleFromNode("target", args, block, globals, &target); err != nil {
return nil, err return nil, err
} }
return target, nil return target, nil
@ -37,7 +37,7 @@ func DeliveryTarget(globals map[string]interface{}, args []string, block config.
func MsgModifier(globals map[string]interface{}, args []string, block config.Node) (module.Modifier, error) { func MsgModifier(globals map[string]interface{}, args []string, block config.Node) (module.Modifier, error) {
var check module.Modifier var check module.Modifier
if err := ModuleFromNode(args, block, globals, &check); err != nil { if err := ModuleFromNode("modify", args, block, globals, &check); err != nil {
return nil, err return nil, err
} }
return check, nil return check, nil
@ -45,7 +45,7 @@ func MsgModifier(globals map[string]interface{}, args []string, block config.Nod
func StorageDirective(m *config.Map, node config.Node) (interface{}, error) { func StorageDirective(m *config.Map, node config.Node) (interface{}, error) {
var backend module.Storage var backend module.Storage
if err := ModuleFromNode(node.Args, node, m.Globals, &backend); err != nil { if err := ModuleFromNode("storage", node.Args, node, m.Globals, &backend); err != nil {
return nil, err return nil, err
} }
return backend, nil return backend, nil
@ -53,7 +53,7 @@ func StorageDirective(m *config.Map, node config.Node) (interface{}, error) {
func TableDirective(m *config.Map, node config.Node) (interface{}, error) { func TableDirective(m *config.Map, node config.Node) (interface{}, error) {
var tbl module.Table var tbl module.Table
if err := ModuleFromNode(node.Args, node, m.Globals, &tbl); err != nil { if err := ModuleFromNode("table", node.Args, node, m.Globals, &tbl); err != nil {
return nil, err return nil, err
} }
return tbl, nil return tbl, nil

29
internal/config/module/modconfig.go
View file

@ -22,10 +22,23 @@ import (
) )
// createInlineModule is a helper function for config matchers that can create inline modules. // createInlineModule is a helper function for config matchers that can create inline modules.
func createInlineModule(modName string, args []string) (module.Module, error) { func createInlineModule(preferredNamespace string, modName string, args []string) (module.Module, error) {
newMod := module.Get(modName) var newMod module.FuncNewModule
// First try to extend the name with preferred namespace unless the name
// already contains it.
if !strings.Contains(modName, ".") && preferredNamespace != "" {
newMod = module.Get(preferredNamespace + "." + modName)
}
// Then try global namespace for compatibility and complex modules.
if newMod == nil { if newMod == nil {
return nil, fmt.Errorf("unknown module: %s", modName) newMod = module.Get(modName)
}
// Bail if both failed.
if newMod == nil {
return nil, fmt.Errorf("unknown module: %s (namespace: %s)", modName, preferredNamespace)
} }
return newMod(modName, "", nil, args) return newMod(modName, "", nil, args)
@ -67,7 +80,11 @@ func initInlineModule(modObj module.Module, globals map[string]interface{}, bloc
// pointer (e.g. it implements all necessary interfaces) and stores it if everything is fine. // pointer (e.g. it implements all necessary interfaces) and stores it if everything is fine.
// If module object doesn't implement necessary module interfaces - error is returned. // If module object doesn't implement necessary module interfaces - error is returned.
// If modObj is not a pointer, ModuleFromNode panics. // If modObj is not a pointer, ModuleFromNode panics.
func ModuleFromNode(args []string, inlineCfg config.Node, globals map[string]interface{}, moduleIface interface{}) error { //
// preferredNamespace is used as an implicit prefix for module name lookups.
// Module with name preferredNamespace + "." + args[0] will be preferred over just args[0].
// It can be omitted.
func ModuleFromNode(preferredNamespace string, args []string, inlineCfg config.Node, globals map[string]interface{}, moduleIface interface{}) error {
if len(args) == 0 { if len(args) == 0 {
return parser.NodeErr(inlineCfg, "at least one argument is required") return parser.NodeErr(inlineCfg, "at least one argument is required")
} }
@ -84,7 +101,7 @@ func ModuleFromNode(args []string, inlineCfg config.Node, globals map[string]int
log.Debugf("%s:%d: reference %s", inlineCfg.File, inlineCfg.Line, args[0]) log.Debugf("%s:%d: reference %s", inlineCfg.File, inlineCfg.Line, args[0])
} else { } else {
log.Debugf("%s:%d: new module %s %v", inlineCfg.File, inlineCfg.Line, args[0], args[1:]) log.Debugf("%s:%d: new module %s %v", inlineCfg.File, inlineCfg.Line, args[0], args[1:])
modObj, err = createInlineModule(args[0], args[1:]) modObj, err = createInlineModule(preferredNamespace, args[0], args[1:])
} }
if err != nil { if err != nil {
return err return err
@ -122,5 +139,5 @@ func GroupFromNode(defaultModule string, args []string, inlineCfg config.Node, g
if len(args) == 0 { if len(args) == 0 {
args = append(args, defaultModule) args = append(args, defaultModule)
} }
return ModuleFromNode(args, inlineCfg, globals, moduleIface) return ModuleFromNode("", args, inlineCfg, globals, moduleIface)
} }

3
internal/modify/dkim/dkim.go
View file

@ -365,5 +365,6 @@ func (s state) Close() error {
} }
func init() { func init() {
module.Register("sign_dkim", New) module.RegisterDeprecated("sign_dkim", "modify.dkim", New)
module.Register("modify.dkim", New)
} }

8
internal/modify/replace_addr.go
View file

@ -41,7 +41,7 @@ func NewReplaceAddr(modName, instName string, _, inlineArgs []string) (module.Mo
} }
func (r *replaceAddr) Init(cfg *config.Map) error { func (r *replaceAddr) Init(cfg *config.Map) error {
return modconfig.ModuleFromNode(r.inlineArgs, cfg.Block, cfg.Globals, &r.table) return modconfig.ModuleFromNode("table", r.inlineArgs, cfg.Block, cfg.Globals, &r.table)
} }
func (r replaceAddr) Name() string { func (r replaceAddr) Name() string {
@ -122,6 +122,8 @@ func (r replaceAddr) rewrite(val string) (string, error) {
} }
func init() { func init() {
module.Register("replace_sender", NewReplaceAddr) module.Register("modify.replace_sender", NewReplaceAddr)
module.Register("replace_rcpt", NewReplaceAddr) module.RegisterDeprecated("replace_sender", "modify.replace_sender", NewReplaceAddr)
module.Register("modify.replace_rcpt", NewReplaceAddr)
module.RegisterDeprecated("replace_rcpt", "modify.replace_rcpt", NewReplaceAddr)
} }

13
internal/module/registry.go
View file

@ -2,6 +2,8 @@ package module
import ( import (
"sync" "sync"
"github.com/foxcpp/maddy/internal/log"
) )
var ( var (
@ -27,6 +29,17 @@ func Register(name string, factory FuncNewModule) {
modules[name] = factory modules[name] = factory
} }
// RegisterDeprecated adds module factory function to global registry.
//
// It prints warning to the log about name being deprecated and suggests using
// a new name.
func RegisterDeprecated(name, newName string, factory FuncNewModule) {
Register(name, func(modName, instName string, aliases, inlineArgs []string) (Module, error) {
log.Printf("module initialized via deprecated name %s, %s should be used instead; deprecated name may be removed in the next version", name, newName)
return factory(modName, instName, aliases, inlineArgs)
})
}
// Get returns module from global registry. // Get returns module from global registry.
// //
// This function does not return endpoint-type modules, use GetEndpoint for // This function does not return endpoint-type modules, use GetEndpoint for

4
internal/msgpipeline/config.go
View file

@ -52,7 +52,7 @@ func parseMsgPipelineRootCfg(globals map[string]interface{}, nodes []config.Node
cfg.globalModifiers.Modifiers = append(cfg.globalModifiers.Modifiers, globalModifiers.Modifiers...) cfg.globalModifiers.Modifiers = append(cfg.globalModifiers.Modifiers, globalModifiers.Modifiers...)
case "source_in": case "source_in":
var tbl module.Table var tbl module.Table
if err := modconfig.ModuleFromNode(node.Args, config.Node{}, globals, &tbl); err != nil { if err := modconfig.ModuleFromNode("table", node.Args, config.Node{}, globals, &tbl); err != nil {
return msgpipelineCfg{}, err return msgpipelineCfg{}, err
} }
srcBlock, err := parseMsgPipelineSrcCfg(globals, node.Children) srcBlock, err := parseMsgPipelineSrcCfg(globals, node.Children)
@ -163,7 +163,7 @@ func parseMsgPipelineSrcCfg(globals map[string]interface{}, nodes []config.Node)
src.modifiers.Modifiers = append(src.modifiers.Modifiers, modifiers.Modifiers...) src.modifiers.Modifiers = append(src.modifiers.Modifiers, modifiers.Modifiers...)
case "destination_in": case "destination_in":
var tbl module.Table var tbl module.Table
if err := modconfig.ModuleFromNode(node.Args, config.Node{}, globals, &tbl); err != nil { if err := modconfig.ModuleFromNode("table", node.Args, config.Node{}, globals, &tbl); err != nil {
return sourceBlock{}, err return sourceBlock{}, err
} }
rcptBlock, err := parseMsgPipelineRcptCfg(globals, node.Children) rcptBlock, err := parseMsgPipelineRcptCfg(globals, node.Children)

2
internal/smtpconn/smtpconn.go
View file

@ -1,4 +1,4 @@
// The package smtpconn contains the code shared between smtp_downstream and // The package smtpconn contains the code shared between target.smtp and
// remote modules. // remote modules.
// //
// It implements the wrapper over the SMTP connection (go-smtp.Client) object // It implements the wrapper over the SMTP connection (go-smtp.Client) object

2
internal/smtpconn/smtputf8_test.go
View file

@ -55,7 +55,7 @@ func TestSMTPUTF8(t *testing.T) {
defer testutils.CheckSMTPConnLeak(t, srv) defer testutils.CheckSMTPConnLeak(t, srv)
c := New() c := New()
c.Log = testutils.Logger(t, "smtp_downstream") c.Log = testutils.Logger(t, "target.smtp")
if _, err := c.Connect(context.Background(), config.Endpoint{ if _, err := c.Connect(context.Background(), config.Endpoint{
Scheme: "tcp", Scheme: "tcp",
Host: "127.0.0.1", Host: "127.0.0.1",

3
internal/storage/imapsql/imapsql.go
View file

@ -472,5 +472,6 @@ func (store *Storage) Close() error {
} }
func init() { func init() {
module.Register("imapsql", New) module.RegisterDeprecated("imapsql", "storage.imapsql", New)
module.Register("storage.imapsql", New)
} }

3
internal/table/file.go
View file

@ -15,7 +15,7 @@ import (
"github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/module"
) )
const FileModName = "file" const FileModName = "table.file"
type File struct { type File struct {
instName string instName string
@ -206,5 +206,6 @@ func (f *File) Lookup(val string) (string, bool, error) {
} }
func init() { func init() {
module.RegisterDeprecated("file", "table.file", NewFile)
module.Register(FileModName, NewFile) module.Register(FileModName, NewFile)
} }

3
internal/table/identity.go
View file

@ -34,5 +34,6 @@ func (s *Identity) Lookup(key string) (string, bool, error) {
} }
func init() { func init() {
module.Register("identity", NewIdentity) module.RegisterDeprecated("identity", "table.identity", NewIdentity)
module.Register("table.identity", NewIdentity)
} }

3
internal/table/regexp.go
View file

@ -89,5 +89,6 @@ func (r *Regexp) Lookup(key string) (string, bool, error) {
} }
func init() { func init() {
module.Register("regexp", NewRegexp) module.RegisterDeprecated("regexp", "table.regexp", NewRegexp)
module.Register("table.regexp", NewRegexp)
} }

3
internal/table/sql_query.go
View file

@ -175,5 +175,6 @@ func (s *SQL) SetKey(k, v string) error {
} }
func init() { func init() {
module.Register("sql_query", NewSQL) module.RegisterDeprecated("sql_query", "table.sql_query", NewSQL)
module.Register("table.sql_query", NewSQL)
} }

3
internal/table/sql_table.go
View file

@ -117,5 +117,6 @@ func (s *SQLTable) SetKey(k, v string) error {
} }
func init() { func init() {
module.Register("sql_table", NewSQLTable) module.RegisterDeprecated("sql_table", "table.sql_table", NewSQLTable)
module.Register("table.sql_table", NewSQLTable)
} }

3
internal/table/static.go
View file

@ -46,5 +46,6 @@ func (s *Static) Lookup(key string) (string, bool, error) {
} }
func init() { func init() {
module.Register("static", NewStatic) module.RegisterDeprecated("static", "table.static", NewStatic)
module.Register("table.static", NewStatic)
} }

3
internal/target/queue/queue.go
View file

@ -964,5 +964,6 @@ func (q *Queue) emitDSN(meta *QueueMetadata, header textproto.Header, failedRcpt
} }
func init() { func init() {
module.Register("queue", NewQueue) module.RegisterDeprecated("queue", "target.queue", NewQueue)
module.Register("target.queue", NewQueue)
} }

3
internal/target/remote/remote.go
View file

@ -491,5 +491,6 @@ func (rd *remoteDelivery) Close() error {
} }
func init() { func init() {
module.Register("remote", New) module.RegisterDeprecated("remote", "target.remote", New)
module.Register("target.remote", New)
} }

2
internal/target/smtp_downstream/sasl.go → internal/target/smtp/sasl.go
View file

@ -33,7 +33,7 @@ func saslAuthDirective(m *config.Map, node config.Node) (interface{}, error) {
Code: 530, Code: 530,
EnhancedCode: exterrors.EnhancedCode{5, 7, 0}, EnhancedCode: exterrors.EnhancedCode{5, 7, 0},
Message: "Authentication is required", Message: "Authentication is required",
TargetName: "smtp_downstream", TargetName: "target.smtp",
Reason: "Credentials forwarding is requested but the client is not authenticated", Reason: "Credentials forwarding is requested but the client is not authenticated",
} }
} }

8
internal/target/smtp_downstream/sasl_test.go → internal/target/smtp/sasl_test.go
View file

@ -35,7 +35,7 @@ func TestSASL_Plain(t *testing.T) {
}, },
}, },
saslFactory: testSaslFactory(t, "plain", "test", "testpass"), saslFactory: testSaslFactory(t, "plain", "test", "testpass"),
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -69,7 +69,7 @@ func TestSASL_Plain_AuthFail(t *testing.T) {
}, },
}, },
saslFactory: testSaslFactory(t, "plain", "test", "testpass"), saslFactory: testSaslFactory(t, "plain", "test", "testpass"),
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
_, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) _, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -93,7 +93,7 @@ func TestSASL_Forward(t *testing.T) {
}, },
}, },
saslFactory: testSaslFactory(t, "forward"), saslFactory: testSaslFactory(t, "forward"),
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDeliveryMeta(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}, &module.MsgMetadata{ testutils.DoTestDeliveryMeta(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}, &module.MsgMetadata{
@ -126,7 +126,7 @@ func TestSASL_Forward_NoCreds(t *testing.T) {
}, },
}, },
saslFactory: testSaslFactory(t, "forward"), saslFactory: testSaslFactory(t, "forward"),
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
_, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) _, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})

10
internal/target/smtp_downstream/smtp_downstream.go → internal/target/smtp/smtp_downstream.go
View file

@ -1,4 +1,4 @@
// Package smtp_downstream provides smtp_downstream module that implements // Package smtp_downstream provides target.smtp module that implements
// transparent forwarding or messages to configured list of SMTP servers. // transparent forwarding or messages to configured list of SMTP servers.
// //
// Like remote module, this implementation doesn't handle atomic // Like remote module, this implementation doesn't handle atomic
@ -137,7 +137,7 @@ type lmtpDelivery struct {
} }
func (u *Downstream) Start(ctx context.Context, msgMeta *module.MsgMetadata, mailFrom string) (module.Delivery, error) { func (u *Downstream) Start(ctx context.Context, msgMeta *module.MsgMetadata, mailFrom string) (module.Delivery, error) {
defer trace.StartRegion(ctx, "smtp_downstream/Start").End() defer trace.StartRegion(ctx, "target.smtp/Start").End()
d := &delivery{ d := &delivery{
u: u, u: u,
@ -285,6 +285,8 @@ func (d *delivery) Commit(ctx context.Context) error {
} }
func init() { func init() {
module.Register("smtp_downstream", NewDownstream) module.Register("target.smtp", NewDownstream)
module.Register("lmtp_downstream", NewDownstream) module.RegisterDeprecated("smtp_downstream", "target.smtp", NewDownstream)
module.Register("target.lmtp", NewDownstream)
module.RegisterDeprecated("lmtp_downstream", "target.lmtp", NewDownstream)
} }

16
internal/target/smtp_downstream/smtp_downstream_test.go → internal/target/smtp/smtp_downstream_test.go
View file

@ -39,7 +39,7 @@ func TestDownstreamDelivery(t *testing.T) {
Port: testPort, Port: testPort,
}, },
}, },
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -122,7 +122,7 @@ func TestDownstreamDelivery_Fallback(t *testing.T) {
Port: testPort, Port: testPort,
}, },
}, },
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -149,7 +149,7 @@ func TestDownstreamDelivery_MAILErr(t *testing.T) {
Port: testPort, Port: testPort,
}, },
}, },
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
_, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) _, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -172,7 +172,7 @@ func TestDownstreamDelivery_AttemptTLS(t *testing.T) {
}, },
tlsConfig: *clientCfg.Clone(), tlsConfig: *clientCfg.Clone(),
attemptStartTLS: true, attemptStartTLS: true,
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -197,7 +197,7 @@ func TestDownstreamDelivery_AttemptTLS_Fallback(t *testing.T) {
}, },
}, },
attemptStartTLS: true, attemptStartTLS: true,
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -221,7 +221,7 @@ func TestDownstreamDelivery_RequireTLS(t *testing.T) {
tlsConfig: *clientCfg.Clone(), tlsConfig: *clientCfg.Clone(),
attemptStartTLS: true, attemptStartTLS: true,
requireTLS: true, requireTLS: true,
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -248,7 +248,7 @@ func TestDownstreamDelivery_RequireTLS_Implicit(t *testing.T) {
tlsConfig: *clientCfg.Clone(), tlsConfig: *clientCfg.Clone(),
attemptStartTLS: true, attemptStartTLS: true,
requireTLS: true, requireTLS: true,
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
@ -274,7 +274,7 @@ func TestDownstreamDelivery_RequireTLS_Fail(t *testing.T) {
}, },
attemptStartTLS: true, attemptStartTLS: true,
requireTLS: true, requireTLS: true,
log: testutils.Logger(t, "smtp_downstream"), log: testutils.Logger(t, "target.smtp"),
} }
_, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"}) _, err := testutils.DoTestDeliveryErr(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})

0
internal/target/smtp_downstream/smtputf8_test.go → internal/target/smtp/smtputf8_test.go
View file

2
maddy.go
View file

@ -44,7 +44,7 @@ import (
_ "github.com/foxcpp/maddy/internal/table" _ "github.com/foxcpp/maddy/internal/table"
_ "github.com/foxcpp/maddy/internal/target/queue" _ "github.com/foxcpp/maddy/internal/target/queue"
_ "github.com/foxcpp/maddy/internal/target/remote" _ "github.com/foxcpp/maddy/internal/target/remote"
_ "github.com/foxcpp/maddy/internal/target/smtp_downstream" _ "github.com/foxcpp/maddy/internal/target/smtp"
) )
var ( var (