Extract several packages to form a public API

cmd/maddyctl/appendlimit.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	appendlimit "github.com/emersion/go-imap-appendlimit"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/urfave/cli"
 )
 

cmd/maddyctl/imap.go

@@ -12,7 +12,7 @@ import (
 	"github.com/emersion/go-imap"
 	imapsql "github.com/foxcpp/go-imap-sql"
 	"github.com/foxcpp/maddy/cmd/maddyctl/clitools"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/urfave/cli"
 )
 

cmd/maddyctl/imapacct.go

@@ -7,7 +7,7 @@ import (
 
 	specialuse "github.com/emersion/go-imap-specialuse"
 	"github.com/foxcpp/maddy/cmd/maddyctl/clitools"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/urfave/cli"
 )
 

cmd/maddyctl/main.go

@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 
 	"github.com/foxcpp/maddy"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/hooks"
-	"github.com/foxcpp/maddy/internal/module"
+	parser "github.com/foxcpp/maddy/framework/cfgparser"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/hooks"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/updatepipe"
-	parser "github.com/foxcpp/maddy/pkg/cfgparser"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/bcrypt"
 )

cmd/maddyctl/users.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/foxcpp/maddy/cmd/maddyctl/clitools"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/urfave/cli"
 )
 

config.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/log"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/log"
 )
 
 /*

framework/address/norm.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/foxcpp/maddy/internal/dns"
+	"github.com/foxcpp/maddy/framework/dns"
 	"golang.org/x/net/idna"
 	"golang.org/x/text/unicode/norm"
 )

framework/cfgparser/parse.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/foxcpp/maddy/internal/config/lexer"
+	"github.com/foxcpp/maddy/framework/config/lexer"
 )
 
 // Node struct describes a parsed configurtion block or a simple directive.

framework/config/config.go

@@ -3,7 +3,7 @@ package config
 import (
 	"fmt"
 
-	parser "github.com/foxcpp/maddy/pkg/cfgparser"
+	parser "github.com/foxcpp/maddy/framework/cfgparser"
 )
 
 type (

framework/config/module/check_action.go

@@ -1,4 +1,4 @@
-package check
+package modconfig
 
 import (
 	"errors"
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 // FailAction specifies actions that messages pipeline should take based on the
@@ -20,8 +20,8 @@ import (
 // Add the configuration directive to allow user to specify the action:
 //     cfg.Custom("SOME_action", false, false,
 //     	func() (interface{}, error) {
-//     		return check.FailAction{Quarantine: true}, nil
-//     	}, check.FailActionDirective, &yourModule.SOMEAction)
+//     		return modconfig.FailAction{Quarantine: true}, nil
+//     	}, modconfig.FailActionDirective, &yourModule.SOMEAction)
 // return in func literal is the default value, you might want to adjust it.
 //
 // Call yourModule.SOMEAction.Apply on CheckResult containing only the

framework/config/module/interfaces.go

@@ -1,8 +1,8 @@
 package modconfig
 
 import (
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 func MessageCheck(globals map[string]interface{}, args []string, block config.Node) (module.Check, error) {

framework/config/module/modconfig.go

@@ -14,11 +14,11 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/hooks"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
-	parser "github.com/foxcpp/maddy/pkg/cfgparser"
+	parser "github.com/foxcpp/maddy/framework/cfgparser"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/hooks"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 // createInlineModule is a helper function for config matchers that can create inline modules.

framework/config/tls_client.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/foxcpp/maddy/internal/log"
+	"github.com/foxcpp/maddy/framework/log"
 )
 
 func TLSClientBlock(m *Map, node Node) (interface{}, error) {

framework/config/tls_general.go

@@ -3,7 +3,7 @@ package config
 import (
 	"crypto/tls"
 
-	"github.com/foxcpp/maddy/internal/log"
+	"github.com/foxcpp/maddy/framework/log"
 )
 
 var strVersionsMap = map[string]uint16{

framework/config/tls_server.go

@@ -13,8 +13,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/foxcpp/maddy/internal/hooks"
-	"github.com/foxcpp/maddy/internal/log"
+	"github.com/foxcpp/maddy/framework/hooks"
+	"github.com/foxcpp/maddy/framework/log"
 )
 
 type TLSConfig struct {

framework/log/log.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/foxcpp/maddy/internal/exterrors"
+	"github.com/foxcpp/maddy/framework/exterrors"
 )
 
 // Logger is the structure that writes formatted output to the underlying

framework/module/check.go

@@ -6,7 +6,7 @@ import (
 	"github.com/emersion/go-message/textproto"
 	"github.com/emersion/go-msgauth/authres"
 	"github.com/emersion/go-smtp"
-	"github.com/foxcpp/maddy/internal/buffer"
+	"github.com/foxcpp/maddy/framework/buffer"
 )
 
 // Check is the module interface that is meant for read-only (with the

framework/module/delivery_target.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
+	"github.com/foxcpp/maddy/framework/buffer"
 )
 
 // DeliveryTarget interface represents abstract storage for the message data

framework/module/dummy.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/config"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
 )
 
 // Dummy is a struct that implements PlainAuth and DeliveryTarget

framework/module/instances.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/hooks"
-	"github.com/foxcpp/maddy/internal/log"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/hooks"
+	"github.com/foxcpp/maddy/framework/log"
 )
 
 var (

framework/module/modifier.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
+	"github.com/foxcpp/maddy/framework/buffer"
 )
 
 // Modifier is the module interface for modules that can mutate the

framework/module/module.go

@@ -16,7 +16,7 @@
 package module
 
 import (
-	"github.com/foxcpp/maddy/internal/config"
+	"github.com/foxcpp/maddy/framework/config"
 )
 
 // Module is the interface implemented by all maddy module instances.

framework/module/msgmetadata.go

@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"github.com/emersion/go-smtp"
-	"github.com/foxcpp/maddy/internal/future"
+	"github.com/foxcpp/maddy/framework/future"
 )
 
 // ConnState structure holds the state information of the protocol used to

framework/module/partial_delivery.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
+	"github.com/foxcpp/maddy/framework/buffer"
 )
 
 // StatusCollector is an object that is passed by message source

framework/module/registry.go

@@ -3,7 +3,7 @@ package module
 import (
 	"sync"
 
-	"github.com/foxcpp/maddy/internal/log"
+	"github.com/foxcpp/maddy/framework/log"
 )
 
 var (

internal/auth/dovecot_sasl/dovecot_sasl.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/emersion/go-sasl"
 	dovecotsasl "github.com/foxcpp/go-dovecot-sasl"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/auth"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
 )
 
 type Auth struct {

internal/auth/external/externalauth.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/auth"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
 )
 
 type ExternalAuth struct {

internal/auth/external/helperauth.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"os/exec"
 
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 func AuthUsingHelper(binaryPath, accountName, password string) error {

internal/auth/pam/module.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/auth/external"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
 )
 
 type Auth struct {

internal/auth/pass_table/table.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/foxcpp/maddy/internal/config"
-	modconfig "github.com/foxcpp/maddy/internal/config/module"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/module"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/text/secure/precis"
 )

internal/auth/pass_table/table_test.go

@@ -3,7 +3,7 @@ package pass_table
 import (
 	"testing"
 
-	"github.com/foxcpp/maddy/internal/config"
+	"github.com/foxcpp/maddy/framework/config"
 	"github.com/foxcpp/maddy/internal/testutils"
 )
 

internal/auth/plain_separate/plain_separate.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 type Auth struct {

internal/auth/plain_separate/plain_separate_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/emersion/go-sasl"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 type mockAuth struct {

internal/auth/sasl.go

@@ -6,10 +6,10 @@ import (
 	"net"
 
 	"github.com/emersion/go-sasl"
-	"github.com/foxcpp/maddy/internal/config"
-	modconfig "github.com/foxcpp/maddy/internal/config/module"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 )
 
 var (

internal/auth/sasl_test.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/testutils"
 )
 

internal/auth/shadow/module.go

@@ -8,10 +8,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/auth/external"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
 )
 
 type Auth struct {

internal/check/command/command.go

@@ -16,12 +16,12 @@ import (
 	"strings"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 )
 
@@ -43,7 +43,7 @@ type Check struct {
 	log      log.Logger
 
 	stage   Stage
-	actions map[int]check.FailAction
+	actions map[int]modconfig.FailAction
 	cmd     string
 	cmdArgs []string
 }
@@ -51,11 +51,11 @@ type Check struct {
 func New(modName, instName string, aliases, inlineArgs []string) (module.Module, error) {
 	c := &Check{
 		instName: instName,
-		actions: map[int]check.FailAction{
-			1: check.FailAction{
+		actions: map[int]modconfig.FailAction{
+			1: modconfig.FailAction{
 				Reject: true,
 			},
-			2: check.FailAction{
+			2: modconfig.FailAction{
 				Quarantine: true,
 			},
 		},
@@ -105,7 +105,7 @@ func (c *Check) Init(cfg *config.Map) error {
 			if err != nil {
 				return config.NodeErr(node, "%v", err)
 			}
-			action, err := check.ParseActionDirective(node.Args[1:])
+			action, err := modconfig.ParseActionDirective(node.Args[1:])
 			if err != nil {
 				return config.NodeErr(node, "%v", err)
 			}

internal/check/dkim/dkim.go

@@ -12,13 +12,13 @@ import (
 	"github.com/emersion/go-message/textproto"
 	"github.com/emersion/go-msgauth/authres"
 	"github.com/emersion/go-msgauth/dkim"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/dns"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/dns"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 )
 
@@ -28,8 +28,8 @@ type Check struct {
 
 	requiredFields  map[string]struct{}
 	allowBodySubset bool
-	brokenSigAction check.FailAction
-	noSigAction     check.FailAction
+	brokenSigAction modconfig.FailAction
+	noSigAction     modconfig.FailAction
 	failOpen        bool
 
 	resolver dns.Resolver
@@ -55,12 +55,12 @@ func (c *Check) Init(cfg *config.Map) error {
 	cfg.Bool("fail_open", false, false, &c.failOpen)
 	cfg.Custom("broken_sig_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{}, nil
-		}, check.FailActionDirective, &c.brokenSigAction)
+			return modconfig.FailAction{}, nil
+		}, modconfig.FailActionDirective, &c.brokenSigAction)
 	cfg.Custom("no_sig_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{}, nil
-		}, check.FailActionDirective, &c.noSigAction)
+			return modconfig.FailAction{}, nil
+		}, modconfig.FailActionDirective, &c.noSigAction)
 	_, err := cfg.Process()
 	if err != nil {
 		return err

internal/check/dkim/dkim_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/emersion/go-msgauth/authres"
 	"github.com/foxcpp/go-mockdns"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/testutils"
 )
 

internal/check/dns/dns.go

@@ -4,11 +4,12 @@ import (
 	"net"
 	"strings"
 
-	"github.com/foxcpp/maddy/internal/address"
+	"github.com/foxcpp/maddy/framework/address"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/dns"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/dns"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/module"
 )
 
 func requireMatchingRDNS(ctx check.StatelessCheckContext) module.CheckResult {
@@ -217,10 +218,10 @@ func requireMatchingEHLO(ctx check.StatelessCheckContext) module.CheckResult {
 }
 
 func init() {
-	check.RegisterStatelessCheck("require_matching_rdns", check.FailAction{Quarantine: true},
+	check.RegisterStatelessCheck("require_matching_rdns", modconfig.FailAction{Quarantine: true},
 		requireMatchingRDNS, nil, nil, nil)
-	check.RegisterStatelessCheck("require_mx_record", check.FailAction{Quarantine: true},
+	check.RegisterStatelessCheck("require_mx_record", modconfig.FailAction{Quarantine: true},
 		nil, requireMXRecord, nil, nil)
-	check.RegisterStatelessCheck("require_matching_ehlo", check.FailAction{Quarantine: true},
+	check.RegisterStatelessCheck("require_matching_ehlo", modconfig.FailAction{Quarantine: true},
 		requireMatchingEHLO, nil, nil, nil)
 }

internal/check/dns/dns_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/emersion/go-smtp"
 	"github.com/foxcpp/go-mockdns"
+	"github.com/foxcpp/maddy/framework/future"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/future"
-	"github.com/foxcpp/maddy/internal/module"
 	"github.com/foxcpp/maddy/internal/testutils"
 )
 

internal/check/dnsbl/common.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/foxcpp/maddy/internal/dns"
-	"github.com/foxcpp/maddy/internal/exterrors"
+	"github.com/foxcpp/maddy/framework/dns"
+	"github.com/foxcpp/maddy/framework/exterrors"
 )
 
 type ListedErr struct {

internal/check/dnsbl/dnsbl.go

@@ -10,13 +10,13 @@ import (
 
 	"github.com/emersion/go-message/textproto"
 	"github.com/emersion/go-smtp"
-	"github.com/foxcpp/maddy/internal/address"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/dns"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/address"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/dns"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 	"golang.org/x/sync/errgroup"
 )

internal/check/milter/milter.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/emersion/go-message/textproto"
 	"github.com/emersion/go-milter"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 )
 

internal/check/requiretls/requiretls.go

@@ -1,9 +1,10 @@
 package requiretls
 
 import (
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/module"
 )
 
 func requireTLS(ctx check.StatelessCheckContext) module.CheckResult {
@@ -22,5 +23,5 @@ func requireTLS(ctx check.StatelessCheckContext) module.CheckResult {
 }
 
 func init() {
-	check.RegisterStatelessCheck("require_tls", check.FailAction{Reject: true}, requireTLS, nil, nil, nil)
+	check.RegisterStatelessCheck("require_tls", modconfig.FailAction{Reject: true}, requireTLS, nil, nil, nil)
 }

internal/check/rspamd/rspamd.go

@@ -11,12 +11,12 @@ import (
 	"strings"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 )
 
@@ -32,10 +32,10 @@ type Check struct {
 	tag        string
 	mtaName    string
 
-	ioErrAction       check.FailAction
-	errorRespAction   check.FailAction
-	addHdrAction      check.FailAction
-	rewriteSubjAction check.FailAction
+	ioErrAction       modconfig.FailAction
+	errorRespAction   modconfig.FailAction
+	addHdrAction      modconfig.FailAction
+	rewriteSubjAction modconfig.FailAction
 
 	client *http.Client
 }
@@ -81,20 +81,20 @@ func (c *Check) Init(cfg *config.Map) error {
 	cfg.String("hostname", true, false, "", &c.mtaName)
 	cfg.Custom("io_error_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{}, nil
-		}, check.FailActionDirective, &c.ioErrAction)
+			return modconfig.FailAction{}, nil
+		}, modconfig.FailActionDirective, &c.ioErrAction)
 	cfg.Custom("error_resp_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{}, nil
-		}, check.FailActionDirective, &c.errorRespAction)
+			return modconfig.FailAction{}, nil
+		}, modconfig.FailActionDirective, &c.errorRespAction)
 	cfg.Custom("add_header_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{Quarantine: true}, nil
-		}, check.FailActionDirective, &c.addHdrAction)
+			return modconfig.FailAction{Quarantine: true}, nil
+		}, modconfig.FailActionDirective, &c.addHdrAction)
 	cfg.Custom("rewrite_subj_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{Quarantine: true}, nil
-		}, check.FailActionDirective, &c.rewriteSubjAction)
+			return modconfig.FailAction{Quarantine: true}, nil
+		}, modconfig.FailActionDirective, &c.rewriteSubjAction)
 	cfg.StringList("flags", false, false, []string{"pass_all"}, &flags)
 	if _, err := cfg.Process(); err != nil {
 		return err

internal/check/skeleton.go

@@ -9,10 +9,10 @@ package directory_name_here
 
 import (
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 )
 

internal/check/spf/spf.go

@@ -12,15 +12,15 @@ import (
 	"github.com/emersion/go-message/textproto"
 	"github.com/emersion/go-msgauth/authres"
 	"github.com/emersion/go-msgauth/dmarc"
-	"github.com/foxcpp/maddy/internal/address"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/check"
-	"github.com/foxcpp/maddy/internal/config"
+	"github.com/foxcpp/maddy/framework/address"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/dns"
+	"github.com/foxcpp/maddy/framework/exterrors"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	maddydmarc "github.com/foxcpp/maddy/internal/dmarc"
-	"github.com/foxcpp/maddy/internal/dns"
-	"github.com/foxcpp/maddy/internal/exterrors"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
 	"github.com/foxcpp/maddy/internal/target"
 	"golang.org/x/net/idna"
 )
@@ -31,12 +31,12 @@ type Check struct {
 	instName     string
 	enforceEarly bool
 
-	noneAction     check.FailAction
-	neutralAction  check.FailAction
-	failAction     check.FailAction
-	softfailAction check.FailAction
-	permerrAction  check.FailAction
-	temperrAction  check.FailAction
+	noneAction     modconfig.FailAction
+	neutralAction  modconfig.FailAction
+	failAction     modconfig.FailAction
+	softfailAction modconfig.FailAction
+	permerrAction  modconfig.FailAction
+	temperrAction  modconfig.FailAction
 
 	log log.Logger
 }
@@ -61,28 +61,28 @@ func (c *Check) Init(cfg *config.Map) error {
 	cfg.Bool("enforce_early", true, false, &c.enforceEarly)
 	cfg.Custom("none_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{}, nil
-		}, check.FailActionDirective, &c.noneAction)
+			return modconfig.FailAction{}, nil
+		}, modconfig.FailActionDirective, &c.noneAction)
 	cfg.Custom("neutral_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{}, nil
-		}, check.FailActionDirective, &c.neutralAction)
+			return modconfig.FailAction{}, nil
+		}, modconfig.FailActionDirective, &c.neutralAction)
 	cfg.Custom("fail_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{Quarantine: true}, nil
-		}, check.FailActionDirective, &c.failAction)
+			return modconfig.FailAction{Quarantine: true}, nil
+		}, modconfig.FailActionDirective, &c.failAction)
 	cfg.Custom("softfail_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{Quarantine: true}, nil
-		}, check.FailActionDirective, &c.softfailAction)
+			return modconfig.FailAction{Quarantine: true}, nil
+		}, modconfig.FailActionDirective, &c.softfailAction)
 	cfg.Custom("permerr_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{Reject: true}, nil
-		}, check.FailActionDirective, &c.permerrAction)
+			return modconfig.FailAction{Reject: true}, nil
+		}, modconfig.FailActionDirective, &c.permerrAction)
 	cfg.Custom("temperr_action", false, false,
 		func() (interface{}, error) {
-			return check.FailAction{Reject: true}, nil
-		}, check.FailActionDirective, &c.temperrAction)
+			return modconfig.FailAction{Reject: true}, nil
+		}, modconfig.FailActionDirective, &c.temperrAction)
 	_, err := cfg.Process()
 	if err != nil {
 		return err

internal/check/stateless_check.go

@@ -6,11 +6,12 @@ import (
 	"runtime/trace"
 
 	"github.com/emersion/go-message/textproto"
-	"github.com/foxcpp/maddy/internal/buffer"
-	"github.com/foxcpp/maddy/internal/config"
-	"github.com/foxcpp/maddy/internal/dns"
-	"github.com/foxcpp/maddy/internal/log"
-	"github.com/foxcpp/maddy/internal/module"
+	"github.com/foxcpp/maddy/framework/buffer"
+	"github.com/foxcpp/maddy/framework/config"
+	modconfig "github.com/foxcpp/maddy/framework/config/module"
+	"github.com/foxcpp/maddy/framework/dns"
+	"github.com/foxcpp/maddy/framework/log"
+	"github.com/foxcpp/maddy/framework/module"
 	"github.com/foxcpp/maddy/internal/target"
 )
 
@@ -43,9 +44,9 @@ type statelessCheck struct {
 	logger   log.Logger
 
 	// One used by Init if config option is not passed by a user.
-	defaultFailAction FailAction
+	defaultFailAction modconfig.FailAction
 	// The actual fail action that should be applied.
-	failAction FailAction
+	failAction modconfig.FailAction
 
 	connCheck   FuncConnCheck
 	senderCheck FuncSenderCheck
@@ -138,7 +139,7 @@ func (c *statelessCheck) Init(cfg *config.Map) error {
 	cfg.Custom("fail_action", false, false,
 		func() (interface{}, error) {
 			return c.defaultFailAction, nil
-		}, FailActionDirective, &c.failAction)
+		}, modconfig.FailActionDirective, &c.failAction)
 	_, err := cfg.Process()
 	return err
 }
@@ -161,7 +162,7 @@ func (c *statelessCheck) InstanceName() string {
 // StatelessCheck supports different action types based on the user configuration, but the particular check
 // code doesn't need to know about it. It should assume that it is always "Reject" and hence it should
 // populate Reason field of the result object with the relevant error description.
-func RegisterStatelessCheck(name string, defaultFailAction FailAction, connCheck FuncConnCheck, senderCheck FuncSenderCheck, rcptCheck FuncRcptCheck, bodyCheck FuncBodyCheck) {
+func RegisterStatelessCheck(name string, defaultFailAction modconfig.FailAction, connCheck FuncConnCheck, senderCheck FuncSenderCheck, rcptCheck FuncRcptCheck, bodyCheck FuncBodyCheck) {
 	module.Register(name, func(modName, instName string, aliases, inlineArgs []string) (module.Module, error) {
 		if len(inlineArgs) != 0 {
 			return nil, fmt.Errorf("%s: inline arguments are not used", modName)

internal/dmarc/evaluate.go

@@ -11,7 +11,7 @@ import (
 	"github.com/emersion/go-message/textproto"
 	"github.com/emersion/go-msgauth/authres"
 	"github.com/emersion/go-msgauth/dmarc"
-	"github.com/foxcpp/maddy/internal/address"
+	"github.com/foxcpp/maddy/framework/address"
 	"golang.org/x/net/publicsuffix"
 )