mirror of
https://github.com/foxcpp/maddy.git
synced 2025-04-03 05:07:38 +03:00
fox.cpp
parent
301c47d815
commit
db0874c2be
25 changed files with 139 additions and 113 deletions
|
|
@ -284,7 +284,7 @@ func ParseDataSize(s string) (int, error) {
|
|||
// data unit and allows multiple arguments (they will be added together).
|
||||
//
|
||||
// See Map.Custom for description of arguments.
|
||||
func (m *Map) DataSize(name string, inheritGlobal, required bool, defaultVal int, store *int) {
|
||||
func (m *Map) DataSize(name string, inheritGlobal, required bool, defaultVal int64, store *int64) {
|
||||
m.Custom(name, inheritGlobal, required, func() (interface{}, error) {
|
||||
return defaultVal, nil
|
||||
}, func(_ *Map, node Node) (interface{}, error) {
|
||||
|
|
@ -301,7 +301,7 @@ func (m *Map) DataSize(name string, inheritGlobal, required bool, defaultVal int
|
|||
return nil, NodeErr(node, "%v", err)
|
||||
}
|
||||
|
||||
return dur, nil
|
||||
return int64(dur), nil
|
||||
}, store)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import (
|
|||
"context"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
)
|
||||
|
||||
|
|
@ -56,7 +57,7 @@ type Delivery interface {
|
|||
// recipients that can't be used. Note: MsgMetadata object passed to Start
|
||||
// contains BodyLength field. If it is non-zero, it can be used to check
|
||||
// storage quota for the user before Body.
|
||||
AddRcpt(ctx context.Context, rcptTo string) error
|
||||
AddRcpt(ctx context.Context, rcptTo string, opts smtp.RcptOptions) error
|
||||
|
||||
// Body sets the body and header contents for the message.
|
||||
// If this method fails, message is assumed to be undeliverable
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import (
|
|||
"context"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/config"
|
||||
)
|
||||
|
|
@ -63,7 +64,7 @@ func (d *Dummy) Start(ctx context.Context, msgMeta *MsgMetadata, mailFrom string
|
|||
|
||||
type dummyDelivery struct{}
|
||||
|
||||
func (dd dummyDelivery) AddRcpt(ctx context.Context, to string) error {
|
||||
func (dd dummyDelivery) AddRcpt(ctx context.Context, rcptTo string, opts smtp.RcptOptions) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
|||
4
go.mod
4
go.mod
|
|
@ -13,7 +13,7 @@ require (
|
|||
github.com/emersion/go-milter v0.3.3
|
||||
github.com/emersion/go-msgauth v0.6.6
|
||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
|
||||
github.com/emersion/go-smtp v0.16.0
|
||||
github.com/emersion/go-smtp v0.20.2-0.20240121112028-434ddca4792e
|
||||
github.com/foxcpp/go-dovecot-sasl v0.0.0-20200522223722-c4699d7a24bf
|
||||
github.com/foxcpp/go-imap-backend-tests v0.0.0-20220105184719-e80aa29a5e16
|
||||
github.com/foxcpp/go-imap-i18nlevel v0.0.0-20200208001533-d6ec88553005
|
||||
|
|
@ -52,6 +52,7 @@ require (
|
|||
golang.org/x/net v0.17.0
|
||||
golang.org/x/sync v0.2.0
|
||||
golang.org/x/text v0.14.0
|
||||
modernc.org/sqlite v1.28.0
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
@ -153,7 +154,6 @@ require (
|
|||
modernc.org/mathutil v1.6.0 // indirect
|
||||
modernc.org/memory v1.7.2 // indirect
|
||||
modernc.org/opt v0.1.3 // indirect
|
||||
modernc.org/sqlite v1.28.0 // indirect
|
||||
modernc.org/strutil v1.1.3 // indirect
|
||||
modernc.org/token v1.0.1 // indirect
|
||||
)
|
||||
|
|
|
|||
25
go.sum
25
go.sum
|
|
@ -234,10 +234,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jely
|
|||
github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
|
||||
github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
|
||||
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
|
||||
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
|
||||
github.com/caddyserver/certmagic v0.17.2 h1:o30seC1T/dBqBCNNGNHWwj2i5/I/FMjBbTAhjADP3nE=
|
||||
github.com/caddyserver/certmagic v0.17.2/go.mod h1:ouWUuC490GOLJzkyN35eXfV8bSbwMwSf4bdhkIxtdQE=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
|
|
@ -258,8 +256,6 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
|
|||
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
|
||||
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
|
|
@ -290,8 +286,8 @@ github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod h1:G/dpzLu
|
|||
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
|
||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||
github.com/emersion/go-smtp v0.16.0 h1:eB9CY9527WdEZSs5sWisTmilDX7gG+Q/2IdRcmubpa8=
|
||||
github.com/emersion/go-smtp v0.16.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
|
||||
github.com/emersion/go-smtp v0.20.2-0.20240121112028-434ddca4792e h1:WAPhaiA+bDO/mFgCDQJKCQI/RbH/73lCcis4Jb8Y2ec=
|
||||
github.com/emersion/go-smtp v0.20.2-0.20240121112028-434ddca4792e/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
|
||||
github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
|
||||
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
|
||||
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
|
||||
|
|
@ -321,8 +317,6 @@ github.com/foxcpp/go-imap-mess v0.0.0-20230108134257-b7ec3a649613 h1:fw9OWfPxP1C
|
|||
github.com/foxcpp/go-imap-mess v0.0.0-20230108134257-b7ec3a649613/go.mod h1:P/O/qz4gaVkefzJ40BUtN/ZzBnaEg0YYe1no/SMp7Aw=
|
||||
github.com/foxcpp/go-imap-namespace v0.0.0-20200802091432-08496dd8e0ed h1:1Jo7geyvunrPSjL6F6D9EcXoNApS5v3LQaro7aUNPnE=
|
||||
github.com/foxcpp/go-imap-namespace v0.0.0-20200802091432-08496dd8e0ed/go.mod h1:Shows1vmkBWO40ChOClaUe6DUnZrsP1UPAuoWzIUdgQ=
|
||||
github.com/foxcpp/go-imap-sql v0.5.1-0.20230313080458-c0176dad679c h1:vqLBcLtG5lcXL2hifcsKjiUaljRukD8xHodVM2rZ+L4=
|
||||
github.com/foxcpp/go-imap-sql v0.5.1-0.20230313080458-c0176dad679c/go.mod h1:8uUTN2RRWZrETuA9pDvDr4SjV1hCvEYG2WOlXuupj+g=
|
||||
github.com/foxcpp/go-imap-sql v0.5.1-0.20240120174134-48f9dc0b4abf h1:tqkJhHCPp1LL0tFqe0GwPjw2BMug8ivMtKJbQ7ZUA/g=
|
||||
github.com/foxcpp/go-imap-sql v0.5.1-0.20240120174134-48f9dc0b4abf/go.mod h1:8uUTN2RRWZrETuA9pDvDr4SjV1hCvEYG2WOlXuupj+g=
|
||||
github.com/foxcpp/go-mockdns v0.0.0-20191216195825-5eabd8dbfe1f/go.mod h1:tPg4cp4nseejPd+UKxtCVQ2hUxNTZ7qQZJa7CLriIeo=
|
||||
|
|
@ -342,11 +336,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
|
|||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||
github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs=
|
||||
github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI=
|
||||
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
|
||||
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
|
||||
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
|
||||
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
|
||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
|
|
@ -426,6 +418,7 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
|
|||
github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
|
||||
github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
|
||||
|
|
@ -473,12 +466,10 @@ github.com/johannesboyne/gofakes3 v0.0.0-20210704111953-6a9f95c2941c h1:lx/uPI+m
|
|||
github.com/johannesboyne/gofakes3 v0.0.0-20210704111953-6a9f95c2941c/go.mod h1:LIAXxPvcUXwOcTIj9LSNSUpE9/eMHalTWxsP/kmWxQI=
|
||||
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
|
||||
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
|
||||
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
||||
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
|
||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
|
||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
|
|
@ -557,7 +548,6 @@ github.com/minio/minio-go/v7 v7.0.55 h1:ZXqUO/8cgfHzI+08h/zGuTTFpISSA32BZmBE3FCL
|
|||
github.com/minio/minio-go/v7 v7.0.55/go.mod h1:NUDy4A4oXPq1l2yK6LTSvCEzAMeIcoz9lcj5dbzSrRE=
|
||||
github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
|
||||
github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
|
||||
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
|
||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
|
|
@ -565,12 +555,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
|
|||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/netauth/netauth v0.6.2-0.20220831214440-1df568cd25d6 h1:TsF5Cl0Mj5JMvPOP2ySVq+CZoiPrTGwvNPbuQotuSAE=
|
||||
github.com/netauth/netauth v0.6.2-0.20220831214440-1df568cd25d6/go.mod h1:4PEbISVqRCQaXaDAt289w3nK9UhoF8/ZOLy31Hbv7ds=
|
||||
github.com/netauth/protocol v0.0.0-20210918062754-7fee492ffcbd h1:4yVpQ/+li28lQ/daYCWeDB08obRmjaoAw2qfFFaCQ40=
|
||||
github.com/netauth/protocol v0.0.0-20210918062754-7fee492ffcbd/go.mod h1:wpK5wqysOJU1w2OxgG65du8M7UqBkxzsNaJdjwiRqAs=
|
||||
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
|
||||
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
|
||||
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
|
||||
github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
|
||||
|
|
@ -604,7 +592,6 @@ github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a
|
|||
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
|
||||
github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 h1:J6qvD6rbmOil46orKqJaRPG+zTpoGlBTUdyv8ki63L0=
|
||||
github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63/go.mod h1:n+VKSARF5y/tS9XFSP7vWDfS+GUC5vs/YT7M5XDTUEM=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
|
||||
github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
|
|
@ -663,7 +650,6 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe
|
|||
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
||||
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
||||
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
|
||||
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
|
||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
|
||||
|
|
@ -1211,7 +1197,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|||
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
|
@ -1230,6 +1215,8 @@ modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
|
|||
modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
|
||||
modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
|
||||
modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
|
||||
modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
|
||||
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
|
||||
modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs=
|
||||
modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ=
|
||||
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
|
||||
|
|
@ -1242,8 +1229,10 @@ modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
|
|||
modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
|
||||
modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
|
||||
modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
|
||||
modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
|
||||
modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
|
||||
modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
|
||||
modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
|
||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ func (s *Session) fetchRDNSName(ctx context.Context) {
|
|||
s.connState.RDNSName.Set(name, nil)
|
||||
}
|
||||
|
||||
func (s *Session) Rcpt(to string) error {
|
||||
func (s *Session) Rcpt(to string, opts *smtp.RcptOptions) error {
|
||||
s.msgLock.Lock()
|
||||
defer s.msgLock.Unlock()
|
||||
|
||||
|
|
@ -363,7 +363,7 @@ func (s *Session) Rcpt(to string) error {
|
|||
rcptCtx, rcptTask := trace.NewTask(s.msgCtx, "RCPT TO")
|
||||
defer rcptTask.End()
|
||||
|
||||
if err := s.rcpt(rcptCtx, to); err != nil {
|
||||
if err := s.rcpt(rcptCtx, to, opts); err != nil {
|
||||
if s.loggedRcptErrors < s.endp.maxLoggedRcptErrors {
|
||||
s.log.Error("RCPT error", err, "rcpt", to, "msg_id", s.msgMeta.ID)
|
||||
s.loggedRcptErrors++
|
||||
|
|
@ -377,7 +377,7 @@ func (s *Session) Rcpt(to string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *Session) rcpt(ctx context.Context, to string) error {
|
||||
func (s *Session) rcpt(ctx context.Context, to string, opts *smtp.RcptOptions) error {
|
||||
// INTERNATIONALIZATION: Do not permit non-ASCII addresses unless SMTPUTF8 is
|
||||
// used.
|
||||
if !address.IsASCII(to) && !s.opts.UTF8 {
|
||||
|
|
@ -396,7 +396,7 @@ func (s *Session) rcpt(ctx context.Context, to string) error {
|
|||
}
|
||||
}
|
||||
|
||||
return s.delivery.AddRcpt(ctx, cleanTo)
|
||||
return s.delivery.AddRcpt(ctx, cleanTo, *opts)
|
||||
}
|
||||
|
||||
func (s *Session) Logout() error {
|
||||
|
|
@ -413,6 +413,9 @@ func (s *Session) Logout() error {
|
|||
if s.cancelRDNS != nil {
|
||||
s.cancelRDNS()
|
||||
}
|
||||
|
||||
s.endp.sessionCnt.Add(-1)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/emersion/go-sasl"
|
||||
|
|
@ -67,7 +68,9 @@ type Endpoint struct {
|
|||
deferServerReject bool
|
||||
maxLoggedRcptErrors int
|
||||
maxReceived int
|
||||
maxHeaderBytes int
|
||||
maxHeaderBytes int64
|
||||
|
||||
sessionCnt atomic.Int32
|
||||
|
||||
authNormalize authz.NormalizeFunc
|
||||
authMap module.Table
|
||||
|
|
@ -401,6 +404,8 @@ func (endp *Endpoint) NewSession(conn *smtp.Conn) (smtp.Session, error) {
|
|||
return nil, endp.wrapErr("", true, "EHLO", err)
|
||||
}
|
||||
|
||||
endp.sessionCnt.Add(1)
|
||||
|
||||
return sess, nil
|
||||
}
|
||||
|
||||
|
|
@ -447,6 +452,10 @@ func (endp *Endpoint) newSession(conn *smtp.Conn) *Session {
|
|||
return s
|
||||
}
|
||||
|
||||
func (endp *Endpoint) ConnectionCount() int {
|
||||
return int(endp.sessionCnt.Load())
|
||||
}
|
||||
|
||||
func (endp *Endpoint) Close() error {
|
||||
endp.serv.Close()
|
||||
endp.listenersWg.Wait()
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ func submitMsgOpts(t *testing.T, cl *smtp.Client, from string, rcpts []string, o
|
|||
return err
|
||||
}
|
||||
for _, rcpt := range rcpts {
|
||||
if err := cl.Rcpt(rcpt); err != nil {
|
||||
if err := cl.Rcpt(rcpt, &smtp.RcptOptions{}); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
@ -334,9 +334,9 @@ func TestSMTPDeliver_CheckError_Deferred(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
checkErr(cl.Rcpt("test1@example.org"))
|
||||
checkErr(cl.Rcpt("test1@example.org"))
|
||||
checkErr(cl.Rcpt("test2@example.org"))
|
||||
checkErr(cl.Rcpt("test1@example.org", &smtp.RcptOptions{}))
|
||||
checkErr(cl.Rcpt("test1@example.org", &smtp.RcptOptions{}))
|
||||
checkErr(cl.Rcpt("test2@example.org", &smtp.RcptOptions{}))
|
||||
}
|
||||
|
||||
func TestSMTPDelivery_Multi(t *testing.T) {
|
||||
|
|
@ -394,7 +394,7 @@ func TestSMTPDelivery_AbortData(t *testing.T) {
|
|||
if err := cl.Mail("sender@example.org", nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := cl.Rcpt("test@example.com"); err != nil {
|
||||
if err := cl.Rcpt("test@example.com", &smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data, err := cl.Data()
|
||||
|
|
@ -432,7 +432,7 @@ func TestSMTPDelivery_EmptyMessage(t *testing.T) {
|
|||
if err := cl.Mail("sender@example.org", nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := cl.Rcpt("test@example.com"); err != nil {
|
||||
if err := cl.Rcpt("test@example.com", &smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data, err := cl.Data()
|
||||
|
|
@ -471,7 +471,7 @@ func TestSMTPDelivery_AbortLogout(t *testing.T) {
|
|||
if err := cl.Mail("sender@example.org", nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := cl.Rcpt("test@example.com"); err != nil {
|
||||
if err := cl.Rcpt("test@example.com", &smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -499,7 +499,7 @@ func TestSMTPDelivery_Reset(t *testing.T) {
|
|||
if err := cl.Mail("from-garbage@example.org", nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := cl.Rcpt("to-garbage@example.org"); err != nil {
|
||||
if err := cl.Rcpt("to-garbage@example.org", &smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := cl.Reset(); err != nil {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import (
|
|||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-msgauth/authres"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/go-mockdns"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/exterrors"
|
||||
|
|
@ -59,7 +60,7 @@ func doTestDelivery(t *testing.T, tgt module.DeliveryTarget, from string, to []s
|
|||
return encodedID, err
|
||||
}
|
||||
for _, rcpt := range to {
|
||||
if err := delivery.AddRcpt(context.Background(), rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), rcpt, smtp.RcptOptions{}); err != nil {
|
||||
if err := delivery.Abort(context.Background()); err != nil {
|
||||
t.Log("delivery.Abort:", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import (
|
|||
"context"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/address"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/config"
|
||||
|
|
@ -276,7 +277,7 @@ type msgpipelineDelivery struct {
|
|||
checkRunner *checkRunner
|
||||
}
|
||||
|
||||
func (dd *msgpipelineDelivery) AddRcpt(ctx context.Context, to string) error {
|
||||
func (dd *msgpipelineDelivery) AddRcpt(ctx context.Context, to string, opts smtp.RcptOptions) error {
|
||||
if err := dd.checkRunner.checkRcpt(ctx, dd.d.globalChecks, to); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -363,7 +364,7 @@ func (dd *msgpipelineDelivery) AddRcpt(ctx context.Context, to string) error {
|
|||
return wrapErr(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(ctx, to); err != nil {
|
||||
if err := delivery.AddRcpt(ctx, to, opts); err != nil {
|
||||
return wrapErr(err)
|
||||
}
|
||||
delivery.recipients = append(delivery.recipients, originalTo)
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/module"
|
||||
"github.com/foxcpp/maddy/internal/modify"
|
||||
|
|
@ -422,10 +423,10 @@ func TestMsgPipeline_PerRcptReject(t *testing.T) {
|
|||
}
|
||||
}()
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "rcpt2@example.com"); err == nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "rcpt2@example.com", smtp.RcptOptions{}); err == nil {
|
||||
t.Fatalf("expected error for delivery.AddRcpt(rcpt2@example.com), got nil")
|
||||
}
|
||||
if err := delivery.AddRcpt(context.Background(), "rcpt1@example.com"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "rcpt1@example.com", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatalf("unexpected AddRcpt err for %s: %v", "rcpt1@example.com", err)
|
||||
}
|
||||
if err := delivery.Body(context.Background(), textproto.Header{}, buffer.MemoryBuffer{Slice: []byte("foobar")}); err != nil {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// The package smtpconn contains the code shared between target.smtp and
|
||||
// Package smtpconn contains the code shared between target.smtp and
|
||||
// remote modules.
|
||||
//
|
||||
// It implements the wrapper over the SMTP connection (go-smtp.Client) object
|
||||
|
|
@ -222,13 +222,9 @@ func (c *C) attemptConnect(ctx context.Context, lmtp bool, endp config.Endpoint,
|
|||
c.lmtp = lmtp
|
||||
// This uses initial greeting timeout of 5 minutes (hardcoded).
|
||||
if lmtp {
|
||||
cl, err = smtp.NewClientLMTP(conn, endp.Host)
|
||||
cl = smtp.NewClientLMTP(conn)
|
||||
} else {
|
||||
cl, err = smtp.NewClient(conn, endp.Host)
|
||||
}
|
||||
if err != nil {
|
||||
conn.Close()
|
||||
return false, nil, err
|
||||
cl = smtp.NewClient(conn)
|
||||
}
|
||||
|
||||
cl.CommandTimeout = c.CommandTimeout
|
||||
|
|
@ -336,9 +332,13 @@ func (c *C) IsLMTP() bool {
|
|||
//
|
||||
// If the address is non-ASCII and cannot be converted to ASCII and the remote
|
||||
// server does not support SMTPUTF8, error will be returned.
|
||||
func (c *C) Rcpt(ctx context.Context, to string) error {
|
||||
func (c *C) Rcpt(ctx context.Context, to string, opts smtp.RcptOptions) error {
|
||||
defer trace.StartRegion(ctx, "smtpconn/RCPT TO").End()
|
||||
|
||||
outOpts := &smtp.RcptOptions{
|
||||
// TODO: DSN support
|
||||
}
|
||||
|
||||
// If necessary, the extension flag is enabled in Start.
|
||||
if ok, _ := c.cl.Extension("SMTPUTF8"); !address.IsASCII(to) && !ok {
|
||||
var err error
|
||||
|
|
@ -356,7 +356,7 @@ func (c *C) Rcpt(ctx context.Context, to string) error {
|
|||
}
|
||||
}
|
||||
|
||||
if err := c.cl.Rcpt(to); err != nil {
|
||||
if err := c.cl.Rcpt(to, outOpts); err != nil {
|
||||
return c.wrapClientErr(err, c.serverName)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ func doTestDelivery(t *testing.T, conn *C, from string, to []string, opts smtp.M
|
|||
return err
|
||||
}
|
||||
for _, rcpt := range to {
|
||||
if err := conn.Rcpt(context.Background(), rcpt); err != nil {
|
||||
if err := conn.Rcpt(context.Background(), rcpt, smtp.RcptOptions{}); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import (
|
|||
"github.com/emersion/go-imap"
|
||||
"github.com/emersion/go-imap/backend"
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
imapsql "github.com/foxcpp/go-imap-sql"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/exterrors"
|
||||
|
|
@ -58,7 +59,7 @@ func userDoesNotExist(actual error) error {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *delivery) AddRcpt(ctx context.Context, rcptTo string) error {
|
||||
func (d *delivery) AddRcpt(ctx context.Context, rcptTo string, _ smtp.RcptOptions) error {
|
||||
defer trace.StartRegion(ctx, "sql/AddRcpt").End()
|
||||
|
||||
accountName, err := d.store.deliveryNormalize(ctx, rcptTo)
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ func (store *Storage) Init(cfg *config.Map) error {
|
|||
var (
|
||||
driver string
|
||||
dsn []string
|
||||
appendlimitVal = -1
|
||||
appendlimitVal int64 = -1
|
||||
compression []string
|
||||
authNormalize string
|
||||
deliveryNormalize string
|
||||
|
|
@ -232,7 +232,7 @@ func (store *Storage) Init(cfg *config.Map) error {
|
|||
} else {
|
||||
// int is 32-bit on some platforms, so cut off values we can't actually
|
||||
// use.
|
||||
if int(uint32(appendlimitVal)) != appendlimitVal {
|
||||
if int64(uint32(appendlimitVal)) != appendlimitVal {
|
||||
return errors.New("imapsql: appendlimit value is too big")
|
||||
}
|
||||
opts.MaxMsgBytes = new(uint32)
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ All scheduled deliveries are attempted to the configured DeliveryTarget.
|
|||
All metadata is preserved on disk.
|
||||
|
||||
Failure status is determined on per-recipient basis:
|
||||
- Delivery.Start fail handled as a failure for all recipients.
|
||||
- Delivery.AddRcpt fail handled as a failure for the corresponding recipient.
|
||||
- Delivery.Body fail handled as a failure for all recipients.
|
||||
- If Delivery implements PartialDelivery, then
|
||||
PartialDelivery.BodyNonAtomic is used instead. Failures are determined based
|
||||
on StatusCollector.SetStatus calls done by target in this case.
|
||||
- Delivery.Start fail handled as a failure for all recipients.
|
||||
- Delivery.AddRcpt fail handled as a failure for the corresponding recipient.
|
||||
- Delivery.Body fail handled as a failure for all recipients.
|
||||
- If Delivery implements PartialDelivery, then
|
||||
PartialDelivery.BodyNonAtomic is used instead. Failures are determined based
|
||||
on StatusCollector.SetStatus calls done by target in this case.
|
||||
|
||||
For each failure check is done to see if it is a permanent failure
|
||||
or a temporary one. This is done using exterrors.IsTemporaryOrUnspec.
|
||||
|
|
@ -487,7 +487,7 @@ func (q *Queue) deliver(meta *QueueMetadata, header textproto.Header, body buffe
|
|||
var acceptedRcpts []string
|
||||
for _, rcpt := range meta.To {
|
||||
rcptCtx, rcptTask := trace.NewTask(msgCtx, "RCPT TO")
|
||||
if err := delivery.AddRcpt(rcptCtx, rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(rcptCtx, rcpt, smtp.RcptOptions{} /* TODO: DSN support */); err != nil {
|
||||
dl.Debugf("delivery.AddRcpt %s failed: %v", rcpt, err)
|
||||
perr.Errs[rcpt] = err
|
||||
} else {
|
||||
|
|
@ -558,7 +558,7 @@ type queueDelivery struct {
|
|||
body buffer.Buffer
|
||||
}
|
||||
|
||||
func (qd *queueDelivery) AddRcpt(ctx context.Context, rcptTo string) error {
|
||||
func (qd *queueDelivery) AddRcpt(ctx context.Context, rcptTo string, _ smtp.RcptOptions) error {
|
||||
qd.meta.To = append(qd.meta.To, rcptTo)
|
||||
return nil
|
||||
}
|
||||
|
|
@ -975,7 +975,7 @@ func (q *Queue) emitDSN(meta *QueueMetadata, header textproto.Header, failedRcpt
|
|||
}()
|
||||
|
||||
rcptCtx, rcptTask := trace.NewTask(msgCtx, "RCPT TO")
|
||||
if err = dsnDelivery.AddRcpt(rcptCtx, meta.From); err != nil {
|
||||
if err = dsnDelivery.AddRcpt(rcptCtx, meta.From, smtp.RcptOptions{}); err != nil {
|
||||
rcptTask.End()
|
||||
return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/exterrors"
|
||||
"github.com/foxcpp/maddy/framework/log"
|
||||
|
|
@ -104,7 +105,7 @@ type unreliableTargetDeliveryPartial struct {
|
|||
*unreliableTargetDelivery
|
||||
}
|
||||
|
||||
func (utd *unreliableTargetDelivery) AddRcpt(ctx context.Context, rcptTo string) error {
|
||||
func (utd *unreliableTargetDelivery) AddRcpt(ctx context.Context, rcptTo string, _ smtp.RcptOptions) error {
|
||||
if len(utd.ut.rcptFailures) > utd.ut.passedMessages {
|
||||
rcptErrs := utd.ut.rcptFailures[utd.ut.passedMessages]
|
||||
if err := rcptErrs[rcptTo]; err != nil {
|
||||
|
|
@ -610,7 +611,7 @@ func TestQueueDelivery_AbortNoDangling(t *testing.T) {
|
|||
t.Fatalf("unexpected Start err: %v", err)
|
||||
}
|
||||
for _, rcpt := range [...]string{"test@example.org", "test2@example.org"} {
|
||||
if err := delivery.AddRcpt(context.Background(), rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), rcpt, smtp.RcptOptions{}); err != nil {
|
||||
t.Fatalf("unexpected AddRcpt err for %s: %v", rcpt, err)
|
||||
}
|
||||
}
|
||||
|
|
@ -790,7 +791,7 @@ func TestQueueDSN_RcptRewrite(t *testing.T) {
|
|||
t.Fatalf("unexpected Start err: %v", err)
|
||||
}
|
||||
for _, rcpt := range [...]string{"test@example.org", "test2@example.org"} {
|
||||
if err := delivery.AddRcpt(context.Background(), rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), rcpt, smtp.RcptOptions{}); err != nil {
|
||||
t.Fatalf("unexpected AddRcpt err for %s: %v", rcpt, err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/address"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/config"
|
||||
|
|
@ -269,7 +270,7 @@ func (rt *Target) Start(ctx context.Context, msgMeta *module.MsgMetadata, mailFr
|
|||
}, nil
|
||||
}
|
||||
|
||||
func (rd *remoteDelivery) AddRcpt(ctx context.Context, to string) error {
|
||||
func (rd *remoteDelivery) AddRcpt(ctx context.Context, to string, opts smtp.RcptOptions) error {
|
||||
defer trace.StartRegion(ctx, "remote/AddRcpt").End()
|
||||
|
||||
if rd.msgMeta.Quarantine {
|
||||
|
|
@ -311,7 +312,7 @@ func (rd *remoteDelivery) AddRcpt(ctx context.Context, to string) error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := conn.Rcpt(ctx, to); err != nil {
|
||||
if err := conn.Rcpt(ctx, to, opts); err != nil {
|
||||
return moduleError(err)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ func TestRemoteDelivery_NoMXFallback(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err == nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err == nil {
|
||||
t.Fatal("Expected an error, got none")
|
||||
}
|
||||
|
||||
|
|
@ -275,7 +275,7 @@ func TestRemoteDelivery_Abort(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -305,7 +305,7 @@ func TestRemoteDelivery_CommitWithoutBody(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -342,7 +342,7 @@ func TestRemoteDelivery_MAILFROMErr(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{})
|
||||
testutils.CheckSMTPErr(t, err, 550, exterrors.EnhancedCode{5, 1, 2}, "mx.example.invalid. said: Hey")
|
||||
|
||||
if err := delivery.Abort(context.Background()); err != nil {
|
||||
|
|
@ -368,7 +368,7 @@ func TestRemoteDelivery_NoMX(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err == nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err == nil {
|
||||
t.Fatal("Expected an error, got none")
|
||||
}
|
||||
|
||||
|
|
@ -398,7 +398,7 @@ func TestRemoteDelivery_NullMX(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{})
|
||||
testutils.CheckSMTPErr(t, err, 556, exterrors.EnhancedCode{5, 1, 10}, "Domain does not accept email (null MX)")
|
||||
|
||||
if err := delivery.Abort(context.Background()); err != nil {
|
||||
|
|
@ -429,7 +429,7 @@ func TestRemoteDelivery_Quarantined(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -475,10 +475,10 @@ func TestRemoteDelivery_MAILFROMErr_Repeated(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{})
|
||||
testutils.CheckSMTPErr(t, err, 550, exterrors.EnhancedCode{5, 1, 2}, "mx.example.invalid. said: Hey")
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test2@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test2@example.invalid", smtp.RcptOptions{})
|
||||
testutils.CheckSMTPErr(t, err, 550, exterrors.EnhancedCode{5, 1, 2}, "mx.example.invalid. said: Hey")
|
||||
|
||||
if err := delivery.Abort(context.Background()); err != nil {
|
||||
|
|
@ -515,12 +515,12 @@ func TestRemoteDelivery_RcptErr(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{})
|
||||
testutils.CheckSMTPErr(t, err, 550, exterrors.EnhancedCode{5, 1, 2}, "mx.example.invalid. said: Hey")
|
||||
|
||||
// It should be possible to, however, add another recipient and continue
|
||||
// delivery as if nothing happened.
|
||||
if err := delivery.AddRcpt(context.Background(), "test2@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test2@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -659,14 +659,14 @@ func TestRemoteDelivery_Split_Fail(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{})
|
||||
if err == nil {
|
||||
t.Fatal("Expected an error, got none")
|
||||
}
|
||||
|
||||
// It should be possible to, however, add another recipient and continue
|
||||
// delivery as if nothing happened.
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example2.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example2.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -712,7 +712,7 @@ func TestRemoteDelivery_BodyErr(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid")
|
||||
err = delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -766,10 +766,10 @@ func TestRemoteDelivery_Split_BodyErr(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example2.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example2.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
@ -822,13 +822,13 @@ func TestRemoteDelivery_Split_BodyErr_NonAtomic(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := delivery.AddRcpt(context.Background(), "test2@example.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test2@example.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example2.invalid"); err != nil {
|
||||
if err := delivery.AddRcpt(context.Background(), "test@example2.invalid", smtp.RcptOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -251,8 +251,8 @@ func (d *delivery) connect(ctx context.Context) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (d *delivery) AddRcpt(ctx context.Context, rcptTo string) error {
|
||||
err := d.conn.Rcpt(ctx, rcptTo)
|
||||
func (d *delivery) AddRcpt(ctx context.Context, rcptTo string, opts smtp.RcptOptions) error {
|
||||
err := d.conn.Rcpt(ctx, rcptTo, opts)
|
||||
if err != nil {
|
||||
return d.u.moduleError(err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/module"
|
||||
)
|
||||
|
|
@ -124,7 +125,7 @@ func BenchDelivery(b *testing.B, target module.DeliveryTarget, sender string, re
|
|||
for i, rcptTemplate := range recipientTemplates {
|
||||
rcpt := strings.Replace(rcptTemplate, "X", strconv.Itoa(i), -1)
|
||||
|
||||
if err := delivery.AddRcpt(benchCtx, rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(benchCtx, rcpt, smtp.RcptOptions{}); err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import (
|
|||
"net"
|
||||
"reflect"
|
||||
"sort"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
|
|
@ -53,10 +54,13 @@ type SMTPBackend struct {
|
|||
RcptErr map[string]error
|
||||
DataErr error
|
||||
LMTPDataErr []error
|
||||
|
||||
ActiveSessionsCounter atomic.Int32
|
||||
}
|
||||
|
||||
func (be *SMTPBackend) NewSession(conn *smtp.Conn) (smtp.Session, error) {
|
||||
be.SessionCounter++
|
||||
be.ActiveSessionsCounter.Add(1)
|
||||
if be.SourceEndpoints == nil {
|
||||
be.SourceEndpoints = make(map[string]struct{})
|
||||
}
|
||||
|
|
@ -67,6 +71,10 @@ func (be *SMTPBackend) NewSession(conn *smtp.Conn) (smtp.Session, error) {
|
|||
}, nil
|
||||
}
|
||||
|
||||
func (be *SMTPBackend) ConnectionCount() int {
|
||||
return int(be.ActiveSessionsCounter.Load())
|
||||
}
|
||||
|
||||
func (be *SMTPBackend) CheckMsg(t *testing.T, indx int, from string, rcptTo []string) {
|
||||
t.Helper()
|
||||
|
||||
|
|
@ -104,6 +112,7 @@ func (s *session) Reset() {
|
|||
}
|
||||
|
||||
func (s *session) Logout() error {
|
||||
s.backend.ActiveSessionsCounter.Add(-1)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +138,7 @@ func (s *session) Mail(from string, opts *smtp.MailOptions) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *session) Rcpt(to string) error {
|
||||
func (s *session) Rcpt(to string, _ *smtp.RcptOptions) error {
|
||||
if err := s.backend.RcptErr[to]; err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -368,17 +377,23 @@ func SMTPServerTLS(t *testing.T, addr string, fn ...SMTPServerConfigureFunc) (*t
|
|||
return clientCfg, be, s
|
||||
}
|
||||
|
||||
type smtpBackendConnCounter interface {
|
||||
ConnectionCount() int
|
||||
}
|
||||
|
||||
func CheckSMTPConnLeak(t *testing.T, srv *smtp.Server) {
|
||||
t.Helper()
|
||||
|
||||
ccb, ok := srv.Backend.(smtpBackendConnCounter)
|
||||
if !ok {
|
||||
t.Error("CheckSMTPConnLeak used for smtp.Server with backend without ConnectionCount method")
|
||||
return
|
||||
}
|
||||
|
||||
// Connection closure is handled asynchronously, so before failing
|
||||
// wait a bit for handleQuit in go-smtp to do its work.
|
||||
for i := 0; i < 10; i++ {
|
||||
found := false
|
||||
srv.ForEachConn(func(_ *smtp.Conn) {
|
||||
found = true
|
||||
})
|
||||
if !found {
|
||||
if ccb.ConnectionCount() == 0 {
|
||||
return
|
||||
}
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/emersion/go-message/textproto"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/foxcpp/maddy/framework/buffer"
|
||||
"github.com/foxcpp/maddy/framework/config"
|
||||
"github.com/foxcpp/maddy/framework/exterrors"
|
||||
|
|
@ -100,7 +101,7 @@ func (dt *Target) Start(ctx context.Context, msgMeta *module.MsgMetadata, mailFr
|
|||
}, dt.StartErr
|
||||
}
|
||||
|
||||
func (dtd *testTargetDelivery) AddRcpt(ctx context.Context, to string) error {
|
||||
func (dtd *testTargetDelivery) AddRcpt(ctx context.Context, to string, _ smtp.RcptOptions) error {
|
||||
if dtd.tgt.RcptErr != nil {
|
||||
if err := dtd.tgt.RcptErr[to]; err != nil {
|
||||
return err
|
||||
|
|
@ -219,7 +220,7 @@ func DoTestDeliveryNonAtomic(t *testing.T, c module.StatusCollector, tgt module.
|
|||
}
|
||||
for _, rcpt := range to {
|
||||
t.Log("-- delivery.AddRcpt", rcpt)
|
||||
if err := delivery.AddRcpt(testCtx, rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(testCtx, rcpt, smtp.RcptOptions{}); err != nil {
|
||||
t.Log("-- ... delivery.AddRcpt", rcpt, err, exterrors.Fields(err))
|
||||
t.Log("-- delivery.Abort")
|
||||
if err := delivery.Abort(testCtx); err != nil {
|
||||
|
|
@ -269,7 +270,7 @@ func DoTestDeliveryErrMeta(t *testing.T, tgt module.DeliveryTarget, from string,
|
|||
}
|
||||
for _, rcpt := range to {
|
||||
t.Log("-- delivery.AddRcpt", rcpt)
|
||||
if err := delivery.AddRcpt(testCtx, rcpt); err != nil {
|
||||
if err := delivery.AddRcpt(testCtx, rcpt, smtp.RcptOptions{}); err != nil {
|
||||
t.Log("-- ... delivery.AddRcpt", rcpt, err, exterrors.Fields(err))
|
||||
t.Log("-- delivery.Abort")
|
||||
if err := delivery.Abort(testCtx); err != nil {
|
||||
|
|
|
|||
|
|
@ -51,14 +51,14 @@ func TestConcurrencyLimit(tt *testing.T) {
|
|||
c1 := t.Conn("smtp")
|
||||
defer c1.Close()
|
||||
c1.SMTPNegotation("localhost", nil, nil)
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test")
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test>")
|
||||
c1.ExpectPattern("250 *")
|
||||
// Down on semaphore.
|
||||
|
||||
c2 := t.Conn("smtp")
|
||||
defer c2.Close()
|
||||
c2.SMTPNegotation("localhost", nil, nil)
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test")
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test>")
|
||||
// Temporary error due to lock timeout.
|
||||
c1.ExpectPattern("451 *")
|
||||
}
|
||||
|
|
@ -87,21 +87,21 @@ func TestPerIPConcurrency(tt *testing.T) {
|
|||
c1 := t.Conn("smtp")
|
||||
defer c1.Close()
|
||||
c1.SMTPNegotation("localhost", nil, nil)
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test")
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test>")
|
||||
c1.ExpectPattern("250 *")
|
||||
// Down on semaphore.
|
||||
|
||||
c3 := t.Conn4("127.0.0.2", "smtp")
|
||||
defer c3.Close()
|
||||
c3.SMTPNegotation("localhost", nil, nil)
|
||||
c3.Writeln("MAIL FROM:<testing@maddy.test")
|
||||
c3.Writeln("MAIL FROM:<testing@maddy.test>")
|
||||
c3.ExpectPattern("250 *")
|
||||
// Down on semaphore (different IP).
|
||||
|
||||
c2 := t.Conn("smtp")
|
||||
defer c2.Close()
|
||||
c2.SMTPNegotation("localhost", nil, nil)
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test")
|
||||
c1.Writeln("MAIL FROM:<testing@maddy.test>")
|
||||
// Temporary error due to lock timeout.
|
||||
c1.ExpectPattern("451 *")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ func TestSMTPFlood_FullMsg_NoLimits_1Conn(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@maddy.test",
|
||||
"MAIL FROM:<from@maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"DATA",
|
||||
"From: <from@maddy.test>",
|
||||
|
|
@ -103,7 +103,7 @@ func TestSMTPFlood_FullMsg_NoLimits_10Conns(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@maddy.test",
|
||||
"MAIL FROM:<from@maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"DATA",
|
||||
"From: <from@maddy.test>",
|
||||
|
|
@ -151,7 +151,7 @@ func TestSMTPFlood_EnvelopeAbort_NoLimits_10Conns(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@maddy.test",
|
||||
"MAIL FROM:<from@maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"RSET",
|
||||
}, []string{
|
||||
|
|
@ -202,7 +202,7 @@ func TestSMTPFlood_EnvelopeAbort_Ratelimited(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@maddy.test",
|
||||
"MAIL FROM:<from@maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"RSET",
|
||||
}, []string{
|
||||
|
|
@ -265,7 +265,7 @@ func TestSMTPFlood_FullMsg_Ratelimited_PerSource(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@1.maddy.test",
|
||||
"MAIL FROM:<from@1.maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"DATA",
|
||||
"From: <from@1.maddy.test>",
|
||||
|
|
@ -292,7 +292,7 @@ func TestSMTPFlood_FullMsg_Ratelimited_PerSource(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@2.maddy.test",
|
||||
"MAIL FROM:<from@2.maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"DATA",
|
||||
"From: <from@1.maddy.test>",
|
||||
|
|
@ -364,7 +364,7 @@ func TestSMTPFlood_EnvelopeAbort_Ratelimited_PerIP(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@maddy.test",
|
||||
"MAIL FROM:<from@maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"RSET",
|
||||
}, []string{
|
||||
|
|
@ -383,7 +383,7 @@ func TestSMTPFlood_EnvelopeAbort_Ratelimited_PerIP(tt *testing.T) {
|
|||
defer c.Close()
|
||||
c.SMTPNegotation("helo.maddy.test", nil, nil)
|
||||
floodSmtp(&c, []string{
|
||||
"MAIL FROM:<from@maddy.test",
|
||||
"MAIL FROM:<from@maddy.test>",
|
||||
"RCPT TO:<to@maddy.test>",
|
||||
"RSET",
|
||||
}, []string{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue