mirror of
https://github.com/mjl-/mox.git
synced 2025-07-10 06:34:40 +03:00
change mox to start as root, bind to network sockets, then drop to regular unprivileged mox user
makes it easier to run on bsd's, where you cannot (easily?) let non-root users bind to ports <1024. starting as root also paves the way for future improvements with privilege separation. unfortunately, this requires changes to how you start mox. though mox will help by automatically fix up dir/file permissions/ownership. if you start mox from the systemd unit file, you should update it so it starts as root and adds a few additional capabilities: # first update the mox binary, then, as root: ./mox config printservice >mox.service systemctl daemon-reload systemctl restart mox journalctl -f -u mox & # you should see mox start up, with messages about fixing permissions on dirs/files. if you used the recommended config/ and data/ directory, in a directory just for mox, and with the mox user called "mox", this should be enough. if you don't want mox to modify dir/file permissions, set "NoFixPermissions: true" in mox.conf. if you named the mox user something else than mox, e.g. "_mox", add "User: _mox" to mox.conf. if you created a shared service user as originally suggested, you may want to get rid of that as it is no longer useful and may get in the way. e.g. if you had /home/service/mox with a "service" user, that service user can no longer access any files: only mox and root can. this also adds scripts for building mox docker images for alpine-supported platforms. the "restart" subcommand has been removed. it wasn't all that useful and got in the way. and another change: when adding a domain while mtasts isn't enabled, don't add the per-domain mtasts config, as it would cause failure to add the domain. based on report from setting up mox on openbsd from mteege. and based on issue #3. thanks for the feedback!
This commit is contained in:
@ -138,7 +138,7 @@ func MakeAccountConfig(addr smtp.Address) config.Account {
|
||||
|
||||
// MakeDomainConfig makes a new config for a domain, creating DKIM keys, using
|
||||
// accountName for DMARC and TLS reports.
|
||||
func MakeDomainConfig(ctx context.Context, domain, hostname dns.Domain, accountName string) (config.Domain, []string, error) {
|
||||
func MakeDomainConfig(ctx context.Context, domain, hostname dns.Domain, accountName string, withMTASTS bool) (config.Domain, []string, error) {
|
||||
log := xlog.WithContext(ctx)
|
||||
|
||||
now := time.Now()
|
||||
@ -242,14 +242,6 @@ func MakeDomainConfig(ctx context.Context, domain, hostname dns.Domain, accountN
|
||||
Localpart: "dmarc-reports",
|
||||
Mailbox: "DMARC",
|
||||
},
|
||||
MTASTS: &config.MTASTS{
|
||||
PolicyID: time.Now().UTC().Format("20060102T150405"),
|
||||
Mode: mtasts.ModeEnforce,
|
||||
// We start out with 24 hour, and warn in the admin interface that users should
|
||||
// increase it to weeks. Once the setup works.
|
||||
MaxAge: 24 * time.Hour,
|
||||
MX: []string{hostname.ASCII},
|
||||
},
|
||||
TLSRPT: &config.TLSRPT{
|
||||
Account: accountName,
|
||||
Localpart: "tls-reports",
|
||||
@ -257,6 +249,17 @@ func MakeDomainConfig(ctx context.Context, domain, hostname dns.Domain, accountN
|
||||
},
|
||||
}
|
||||
|
||||
if withMTASTS {
|
||||
confDomain.MTASTS = &config.MTASTS{
|
||||
PolicyID: time.Now().UTC().Format("20060102T150405"),
|
||||
Mode: mtasts.ModeEnforce,
|
||||
// We start out with 24 hour, and warn in the admin interface that users should
|
||||
// increase it to weeks once the setup works.
|
||||
MaxAge: 24 * time.Hour,
|
||||
MX: []string{hostname.ASCII},
|
||||
}
|
||||
}
|
||||
|
||||
rpaths := paths
|
||||
paths = nil
|
||||
|
||||
@ -293,7 +296,16 @@ func DomainAdd(ctx context.Context, domain dns.Domain, accountName string, local
|
||||
nc.Domains[name] = d
|
||||
}
|
||||
|
||||
confDomain, cleanupFiles, err := MakeDomainConfig(ctx, domain, Conf.Static.HostnameDomain, accountName)
|
||||
// Only enable mta-sts for domain if there is a listener with mta-sts.
|
||||
var withMTASTS bool
|
||||
for _, l := range Conf.Static.Listeners {
|
||||
if l.MTASTSHTTPS.Enabled {
|
||||
withMTASTS = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
confDomain, cleanupFiles, err := MakeDomainConfig(ctx, domain, Conf.Static.HostnameDomain, accountName, withMTASTS)
|
||||
if err != nil {
|
||||
return fmt.Errorf("preparing domain config: %v", err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user