mirror of
https://github.com/wneessen/go-mail.git
synced 2024-11-22 22:00:49 +01:00
Merge pull request #207 from wneessen/enhancement/181_rework-tlsportpolicy
Refine SMTP port selection and fallback logic
This commit is contained in:
commit
2fd3167de3
1 changed files with 38 additions and 19 deletions
33
client.go
33
client.go
|
@ -253,8 +253,6 @@ func WithTimeout(timeout time.Duration) Option {
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithSSL tells the client to use a SSL/TLS connection
|
// WithSSL tells the client to use a SSL/TLS connection
|
||||||
//
|
|
||||||
// Deprecated: use WithSSLPort instead.
|
|
||||||
func WithSSL() Option {
|
func WithSSL() Option {
|
||||||
return func(c *Client) error {
|
return func(c *Client) error {
|
||||||
c.useSSL = true
|
c.useSSL = true
|
||||||
|
@ -262,11 +260,16 @@ func WithSSL() Option {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithSSLPort tells the client to use a SSL/TLS connection.
|
// WithSSLPort tells the Client wether or not to use SSL and fallback.
|
||||||
// It automatically sets the port to 465.
|
// The correct port is automatically set.
|
||||||
//
|
//
|
||||||
// When the SSL connection fails and fallback is set to true,
|
// Port 465 is used when SSL set (true).
|
||||||
|
// Port 25 is used when SSL is unset (false).
|
||||||
|
// When the SSL connection fails and fb is set to true,
|
||||||
// the client will attempt to connect on port 25 using plaintext.
|
// the client will attempt to connect on port 25 using plaintext.
|
||||||
|
//
|
||||||
|
// Note: If a different port has already been set otherwise, the port-choosing
|
||||||
|
// and fallback automatism will be skipped.
|
||||||
func WithSSLPort(fallback bool) Option {
|
func WithSSLPort(fallback bool) Option {
|
||||||
return func(c *Client) error {
|
return func(c *Client) error {
|
||||||
c.SetSSLPort(true, fallback)
|
c.SetSSLPort(true, fallback)
|
||||||
|
@ -304,7 +307,8 @@ func WithHELO(helo string) Option {
|
||||||
|
|
||||||
// WithTLSPolicy tells the client to use the provided TLSPolicy
|
// WithTLSPolicy tells the client to use the provided TLSPolicy
|
||||||
//
|
//
|
||||||
// Deprecated: use WithTLSPortPolicy instead.
|
// Note: To follow best-practices for SMTP TLS connections, it is recommended
|
||||||
|
// to use WithTLSPortPolicy instead.
|
||||||
func WithTLSPolicy(policy TLSPolicy) Option {
|
func WithTLSPolicy(policy TLSPolicy) Option {
|
||||||
return func(c *Client) error {
|
return func(c *Client) error {
|
||||||
c.tlspolicy = policy
|
c.tlspolicy = policy
|
||||||
|
@ -319,6 +323,9 @@ func WithTLSPolicy(policy TLSPolicy) Option {
|
||||||
// If the connection fails with TLSOpportunistic,
|
// If the connection fails with TLSOpportunistic,
|
||||||
// a plaintext connection is attempted on port 25 as a fallback.
|
// a plaintext connection is attempted on port 25 as a fallback.
|
||||||
// NoTLS will allways use port 25.
|
// NoTLS will allways use port 25.
|
||||||
|
//
|
||||||
|
// Note: If a different port has already been set otherwise, the port-choosing
|
||||||
|
// and fallback automatism will be skipped.
|
||||||
func WithTLSPortPolicy(policy TLSPolicy) Option {
|
func WithTLSPortPolicy(policy TLSPolicy) Option {
|
||||||
return func(c *Client) error {
|
return func(c *Client) error {
|
||||||
c.SetTLSPortPolicy(policy)
|
c.SetTLSPortPolicy(policy)
|
||||||
|
@ -463,6 +470,9 @@ func (c *Client) ServerAddr() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetTLSPolicy overrides the current TLSPolicy with the given TLSPolicy value
|
// SetTLSPolicy overrides the current TLSPolicy with the given TLSPolicy value
|
||||||
|
//
|
||||||
|
// Note: To follow best-practices for SMTP TLS connections, it is recommended
|
||||||
|
// to use SetTLSPortPolicy instead.
|
||||||
func (c *Client) SetTLSPolicy(policy TLSPolicy) {
|
func (c *Client) SetTLSPolicy(policy TLSPolicy) {
|
||||||
c.tlspolicy = policy
|
c.tlspolicy = policy
|
||||||
}
|
}
|
||||||
|
@ -474,7 +484,11 @@ func (c *Client) SetTLSPolicy(policy TLSPolicy) {
|
||||||
// If the connection fails with TLSOpportunistic, a plaintext connection is
|
// If the connection fails with TLSOpportunistic, a plaintext connection is
|
||||||
// attempted on port 25 as a fallback.
|
// attempted on port 25 as a fallback.
|
||||||
// NoTLS will allways use port 25.
|
// NoTLS will allways use port 25.
|
||||||
|
//
|
||||||
|
// Note: If a different port has already been set otherwise, the port-choosing
|
||||||
|
// and fallback automatism will be skipped.
|
||||||
func (c *Client) SetTLSPortPolicy(policy TLSPolicy) {
|
func (c *Client) SetTLSPortPolicy(policy TLSPolicy) {
|
||||||
|
if c.port == DefaultPort {
|
||||||
c.port = DefaultPortTLS
|
c.port = DefaultPortTLS
|
||||||
|
|
||||||
if policy == TLSOpportunistic {
|
if policy == TLSOpportunistic {
|
||||||
|
@ -483,6 +497,7 @@ func (c *Client) SetTLSPortPolicy(policy TLSPolicy) {
|
||||||
if policy == NoTLS {
|
if policy == NoTLS {
|
||||||
c.port = DefaultPort
|
c.port = DefaultPort
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
c.tlspolicy = policy
|
c.tlspolicy = policy
|
||||||
}
|
}
|
||||||
|
@ -499,8 +514,11 @@ func (c *Client) SetSSL(ssl bool) {
|
||||||
// Port 25 is used when SSL is unset (false).
|
// Port 25 is used when SSL is unset (false).
|
||||||
// When the SSL connection fails and fb is set to true,
|
// When the SSL connection fails and fb is set to true,
|
||||||
// the client will attempt to connect on port 25 using plaintext.
|
// the client will attempt to connect on port 25 using plaintext.
|
||||||
|
//
|
||||||
|
// Note: If a different port has already been set otherwise, the port-choosing
|
||||||
|
// and fallback automatism will be skipped.
|
||||||
func (c *Client) SetSSLPort(ssl bool, fallback bool) {
|
func (c *Client) SetSSLPort(ssl bool, fallback bool) {
|
||||||
c.port = DefaultPort
|
if c.port == DefaultPort {
|
||||||
if ssl {
|
if ssl {
|
||||||
c.port = DefaultPortSSL
|
c.port = DefaultPortSSL
|
||||||
}
|
}
|
||||||
|
@ -509,6 +527,7 @@ func (c *Client) SetSSLPort(ssl bool, fallback bool) {
|
||||||
if fallback {
|
if fallback {
|
||||||
c.fallbackPort = DefaultPort
|
c.fallbackPort = DefaultPort
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
c.useSSL = ssl
|
c.useSSL = ssl
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue