Fix a few linter warnings + gofmt + goimports

README.md

@@ -15,7 +15,7 @@ daemon with uniform configuration and minimal maintenance cost.
 feature-packed implementation you may want to use Dovecot instead. maddy still
 can handle message delivery business.
 
-[![builds.sr.ht status](https://builds.sr.ht/~emersion/maddy.svg)](https://builds.sr.ht/~emersion/maddy?)
+[![CI status](https://img.shields.io/github/workflow/status/foxcpp/maddy/Testing%20and%20release%20preparation?style=flat-square)](https://github.com/foxcpp/maddy/actions/workflows/cicd.yml)
 [![Issues tracker](https://img.shields.io/github/issues/foxcpp/maddy)](https://github.com/foxcpp/maddy)
 
 * [Setup tutorial](https://maddy.email/tutorials/setting-up/)

cmd/maddy/main.go

@@ -20,7 +20,7 @@ package main
 
 import (
 	_ "github.com/foxcpp/maddy"
-	"github.com/foxcpp/maddy/internal/cli"
+	maddycli "github.com/foxcpp/maddy/internal/cli"
 	_ "github.com/foxcpp/maddy/internal/cli/ctl"
 )
 

cmd/maddy/test.conf

@@ -0,0 +1,13 @@
+state_dir /tmp
+runtime_dir /tmp
+
+imap tcp://127.0.0.1:2222 {
+	tls off
+	auth pam
+	storage imapsql {
+		driver sqlite3
+		dsn /tmp/hello.db
+		delivery_map email_localpart
+    		auth_normalize precis_casefold
+	}
+}

directories.go

@@ -1,4 +1,5 @@
-//+build !docker
+//go:build !docker
+// +build !docker
 
 package maddy
 

directories_docker.go

@@ -1,4 +1,5 @@
-//+build docker
+//go:build docker
+// +build docker
 
 package maddy
 

framework/dns/debugflags.go

@@ -1,4 +1,5 @@
-//+build debugflags
+//go:build debugflags
+// +build debugflags
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

framework/log/syslog.go

@@ -1,4 +1,5 @@
-//+build !windows,!plan9
+//go:build !windows && !plan9
+// +build !windows,!plan9
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

framework/log/syslog_stub.go

@@ -1,4 +1,5 @@
-//+build windows plan9
+//go:build windows || plan9
+// +build windows plan9
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/auth/pam/pam.go

@@ -1,4 +1,5 @@
-//+build cgo,libpam
+//go:build cgo && libpam
+// +build cgo,libpam
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/auth/pam/pam_stub.go

@@ -1,4 +1,5 @@
-//+build !cgo !libpam
+//go:build !cgo || !libpam
+// +build !cgo !libpam
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/auth/shadow/module.go

@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/check/dns/dns_test.go

@@ -119,4 +119,3 @@ func TestRequireMXRecord(t *testing.T) {
 	test("", "", nil, false) // Permit <> for bounces.
 	test("foo@example.org", "example.org", []net.MX{{Host: "."}}, true)
 }
-

internal/check/skeleton.go

@@ -1,4 +1,5 @@
-//+build ignore
+//go:build ignore
+// +build ignore
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/cli/app.go

@@ -95,11 +95,15 @@ func Run() {
 	// Actual entry point is registered in maddy.go.
 
 	// Print help when called via maddyctl executable. To be removed
-	// once backward compatbility hack for 'maddy run' is removed too.
+	// once backward compatibility hack for 'maddy run' is removed too.
 	if strings.Contains(os.Args[0], "maddyctl") && len(os.Args) == 1 {
-		app.Run([]string{os.Args[0], "help"})
+		if err := app.Run([]string{os.Args[0], "help"}); err != nil {
+			log.DefaultLogger.Error("app.Run failed", err)
+		}
 		return
 	}
 
-	app.Run(os.Args)
+	if err := app.Run(os.Args); err != nil {
+		log.DefaultLogger.Error("app.Run failed", err)
+	}
 }

internal/cli/clitools/termios.go

@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/cli/clitools/termios_stub.go

@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/cli/ctl/imap.go

@@ -468,7 +468,8 @@ func mboxesCreate(be module.Storage, ctx *cli.Context) error {
 	}
 
 	if ctx.IsSet("special") {
-		attr := "\\" + strings.Title(ctx.String("special"))
+		attr := "\\" + strings.Title(ctx.String("special")) //nolint:staticcheck
+		// (nolint) strings.Title is perfectly fine there since special mailbox tags will never use Unicode.
 
 		suu, ok := u.(SpecialUseUser)
 		if !ok {

internal/cli/ctl/users.go

@@ -199,8 +199,8 @@ func usersCreate(be module.PlainUserDB, ctx *cli.Context) error {
 		}
 	}
 
-	if be, ok := be.(*pass_table.Auth); ok {
+	if beHash, ok := be.(*pass_table.Auth); ok {
-		return be.CreateUserHash(username, pass, ctx.String("hash"), pass_table.HashOpts{
+		return beHash.CreateUserHash(username, pass, ctx.String("hash"), pass_table.HashOpts{
 			BcryptCost: ctx.Int("bcrypt-cost"),
 		})
 	} else if ctx.IsSet("hash") || ctx.IsSet("bcrypt-cost") {

internal/libdns/alidns.go

@@ -1,4 +1,5 @@
-//+build libdns_alidns libdns_all
+//go:build libdns_alidns || libdns_all
+// +build libdns_alidns libdns_all
 
 package libdns
 

internal/libdns/cloudflare.go

@@ -1,4 +1,5 @@
-//+build libdns_cloudflare !libdns_separate
+//go:build libdns_cloudflare || !libdns_separate
+// +build libdns_cloudflare !libdns_separate
 
 package libdns
 

internal/libdns/digitalocean.go

@@ -1,4 +1,5 @@
-//+build libdns_digitalocean !libdns_separate
+//go:build libdns_digitalocean || !libdns_separate
+// +build libdns_digitalocean !libdns_separate
 
 package libdns
 

internal/libdns/gandi.go

@@ -1,4 +1,5 @@
-//+build libdns_gandi !libdns_separate
+//go:build libdns_gandi || !libdns_separate
+// +build libdns_gandi !libdns_separate
 
 package libdns
 

internal/libdns/googleclouddns.go

@@ -1,4 +1,5 @@
-//+build libdns_googleclouddns libdns_all
+//go:build libdns_googleclouddns || libdns_all
+// +build libdns_googleclouddns libdns_all
 
 package libdns
 

internal/libdns/hetzner.go

@@ -1,4 +1,5 @@
-//+build libdns_hetzner !libdns_separate
+//go:build libdns_hetzner || !libdns_separate
+// +build libdns_hetzner !libdns_separate
 
 package libdns
 

internal/libdns/leaseweb.go

@@ -1,4 +1,5 @@
-//+build libdns_leaseweb libdns_all
+//go:build libdns_leaseweb || libdns_all
+// +build libdns_leaseweb libdns_all
 
 package libdns
 

internal/libdns/metaname.go

@@ -1,4 +1,5 @@
-//+build libdns_metaname libdns_all
+//go:build libdns_metaname || libdns_all
+// +build libdns_metaname libdns_all
 
 package libdns
 

internal/libdns/namecheap.go

@@ -1,4 +1,5 @@
-//+build go1.16
+//go:build go1.16
+// +build go1.16
 
 package libdns
 

internal/libdns/namedotcom.go

@@ -1,4 +1,5 @@
-//+build libdns_namedotdom libdns_all
+//go:build libdns_namedotdom || libdns_all
+// +build libdns_namedotdom libdns_all
 
 package libdns
 

internal/libdns/route53.go

@@ -1,4 +1,5 @@
-//+build libdns_route53 libdns_all
+//go:build libdns_route53 || libdns_all
+// +build libdns_route53 libdns_all
 
 package libdns
 

internal/libdns/vultr.go

@@ -1,4 +1,5 @@
-//+build libdns_vultr !libdns_separate
+//go:build libdns_vultr || !libdns_separate
+// +build libdns_vultr !libdns_separate
 
 package libdns
 

internal/modify/replace_addr_test.go

@@ -103,7 +103,6 @@ func testReplaceAddr(t *testing.T, modName string) {
 		test("test@example.com", []string{"1@example.com", "2@example.com", "3@example.com"},
 			map[string][]string{"test@example.com": []string{"1@example.com", "2@example.com", "3@example.com"}})
 	}
-
 }
 
 func TestReplaceAddr_RewriteSender(t *testing.T) {

internal/msgpipeline/msgpipeline.go

@@ -339,7 +339,6 @@ func (dd *msgpipelineDelivery) AddRcpt(ctx context.Context, to string) error {
 		dd.log.Debugln("per-rcpt modifiers:", to, "=>", newTo)
 
 		for _, to = range newTo {
-
 			wrapErr = func(err error) error {
 				return exterrors.WithFields(err, map[string]interface{}{
 					"effective_rcpt": to,

internal/storage/blob/test_blob.go

@@ -1,4 +1,5 @@
-//+build cgo,!no_sqlite3
+//go:build cgo && !no_sqlite3
+// +build cgo,!no_sqlite3
 
 package blob
 

internal/storage/blob/test_blob_nosqlite.go

@@ -1,4 +1,5 @@
-//+build !cgo no_sqlite3
+//go:build !cgo || no_sqlite3
+// +build !cgo no_sqlite3
 
 package blob
 

internal/storage/imapsql/sqlite3.go

@@ -1,4 +1,5 @@
-//+build !nosqlite3,cgo
+//go:build !nosqlite3 && cgo
+// +build !nosqlite3,cgo
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/table/file.go

@@ -119,11 +119,11 @@ func (f *File) reloader() {
 	}()
 
 	t := time.NewTicker(reloadInterval)
+	defer t.Stop()
 
 	for {
 		select {
 		case <-t.C:
-			var latestStamp time.Time
 			info, err := os.Stat(f.file)
 			if err != nil {
 				if os.IsNotExist(err) {
@@ -133,10 +133,10 @@ func (f *File) reloader() {
 					f.mLck.Unlock()
 					continue
 				}
-				f.log.Printf("%v", err)
+				f.log.Error("os stat", err)
 			}
-			if info.ModTime().After(latestStamp) {
+			if info.ModTime().Before(f.mStamp) {
-				latestStamp = info.ModTime()
+				continue // reload not necessary
 			}
 		case <-f.forceReload:
 		case <-f.stopReloader:

internal/table/sql_query_test.go

@@ -1,4 +1,5 @@
-//+build !nosqlite3,cgo
+//go:build !nosqlite3 && cgo
+// +build !nosqlite3,cgo
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/table/sqlite3.go

@@ -1,4 +1,5 @@
-//+build !nosqlite3,cgo
+//go:build !nosqlite3 && cgo
+// +build !nosqlite3,cgo
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/target/remote/debugflags.go

@@ -1,4 +1,5 @@
-//+build debugflags
+//go:build debugflags
+// +build debugflags
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

internal/target/skeleton.go

@@ -1,4 +1,5 @@
-//+build ignore
+//go:build ignore
+// +build ignore
 
 // Copy that file into target/ subdirectory.
 

maddy_debug.go

@@ -1,4 +1,5 @@
-//+build debugflags
+//go:build debugflags
+// +build debugflags
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

signal.go

@@ -1,4 +1,5 @@
-//+build darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

signal_nonposix.go

@@ -1,4 +1,5 @@
-//+build windows plan9
+//go:build windows || plan9
+// +build windows plan9
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

systemd.go

@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

systemd_nonlinux.go

@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/basic_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/cover_test.go

@@ -1,4 +1,5 @@
-//+build cover_main
+//go:build cover_main
+// +build cover_main
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/dovecot_sasl_test.go

@@ -1,5 +1,6 @@
-//+build integration
+//go:build integration && (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
-//+build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build integration
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/dovecot_sasld_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/gocovcat.go

@@ -2,6 +2,7 @@
 //
 // From: https://git.lukeshu.com/go/cmd/gocovcat/
 //
+//go:build ignore
 // +build ignore
 
 // Copyright 2017 Luke Shumaker <lukeshu@parabola.nu>

tests/imapsql_test.go

@@ -1,4 +1,5 @@
-//+build integration,cgo,!nosqlite3
+//go:build integration && cgo && !nosqlite3
+// +build integration,cgo,!nosqlite3
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/issue327_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/limits_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/lmtp_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/mta_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/replace_addr_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/smtp_autobuffer_test.go

@@ -1,4 +1,5 @@
-//+build integration,cgo,!nosqlite3
+//go:build integration && cgo && !nosqlite3
+// +build integration,cgo,!nosqlite3
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/smtp_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.

tests/stress_test.go

@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 /*
 Maddy Mail Server - Composable all-in-one email server.