Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-18 14:47:03 +00:00
Code Releases Activity

smtpsrv: Rename internal variable ehloAddress -> ehloDomain

Browse Source 
The EHLO parameter is generally referred to as "domain", even though it
can take either a domain or an address.

For clarity, rename the variable and comments to match.

This is stylistic only, there are no functional changes.
This commit is contained in:
Alberto Bertogli
2020-09-14 21:17:01 +01:00
parent 4c26713f40
commit 5bebb00af9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/smtpsrv/conn.go
View File

@@ -115,8 +115,8 @@ type Conn struct {
// TLS configuration. // TLS configuration.
tlsConfig *tls.Config tlsConfig *tls.Config
// Address given at HELO/EHLO, used for tracing purposes. // Domain given at HELO/EHLO.
ehloAddress string ehloDomain string
// Envelope. // Envelope.
mailFrom string mailFrom string
@@ -305,7 +305,7 @@ func (c *Conn) HELO(params string) (code int, msg string) {
if len(strings.TrimSpace(params)) == 0 { if len(strings.TrimSpace(params)) == 0 {
return 501, "Invisible customers are not welcome!" return 501, "Invisible customers are not welcome!"
} }
c.ehloAddress = strings.Fields(params)[0] c.ehloDomain = strings.Fields(params)[0]
types := []string{ types := []string{
"general store", "used armor dealership", "second-hand bookstore", "general store", "used armor dealership", "second-hand bookstore",
@@ -323,7 +323,7 @@ func (c *Conn) EHLO(params string) (code int, msg string) {
if len(strings.TrimSpace(params)) == 0 { if len(strings.TrimSpace(params)) == 0 {
return 501, "Invisible customers are not welcome!" return 501, "Invisible customers are not welcome!"
} }
c.ehloAddress = strings.Fields(params)[0] c.ehloDomain = strings.Fields(params)[0]
c.isESMTP = true c.isESMTP = true
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
@@ -575,7 +575,7 @@ func (c *Conn) RCPT(params string) (code int, msg string) {
// DATA SMTP command handler. // DATA SMTP command handler.
func (c *Conn) DATA(params string) (code int, msg string) { func (c *Conn) DATA(params string) (code int, msg string) {
if c.ehloAddress == "" { if c.ehloDomain == "" {
return 503, "5.5.1 Invisible customers are not welcome!" return 503, "5.5.1 Invisible customers are not welcome!"
} }
if c.mailFrom == "" { if c.mailFrom == "" {
@@ -669,15 +669,15 @@ func (c *Conn) addReceivedHeader() {
// https://tools.ietf.org/html/rfc5321#section-4.4 // https://tools.ietf.org/html/rfc5321#section-4.4
if c.completedAuth { if c.completedAuth {
// For authenticated users, only show the EHLO address they gave; // For authenticated users, only show the EHLO domain they gave;
// explicitly hide their network address. // explicitly hide their network address.
v += fmt.Sprintf("from %s\n", c.ehloAddress) v += fmt.Sprintf("from %s\n", c.ehloDomain)
} else { } else {
// For non-authenticated users we show the real address as canonical, // For non-authenticated users we show the real address as canonical,
// and then the given EHLO address for convenience and // and then the given EHLO domain for convenience and
// troubleshooting. // troubleshooting.
v += fmt.Sprintf("from [%s] (%s)\n", v += fmt.Sprintf("from [%s] (%s)\n",
addrLiteral(c.conn.RemoteAddr()), c.ehloAddress) addrLiteral(c.conn.RemoteAddr()), c.ehloDomain)
} }
v += fmt.Sprintf("by %s (chasquid) ", c.hostname) v += fmt.Sprintf("by %s (chasquid) ", c.hostname)