go/mailpit
1
0
Fork 0
mirror of https://github.com/axllent/mailpit.git synced 2025-08-15 20:13:16 +02:00
Code Issues Releases Activity

Refactor write & writef arguments

Browse Source
This commit is contained in:
Ralph Slooten
2025-01-18 14:47:20 +13:00
parent 2a1a5ae852
commit 168049faf9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/smtpd/smtpd.go
View File

@@ -426,7 +426,7 @@ loop:
s.writef("501 5.5.4 Syntax error in parameters or arguments (invalid SIZE parameter)") s.writef("501 5.5.4 Syntax error in parameters or arguments (invalid SIZE parameter)")
} else if s.srv.MaxSize > 0 && size > s.srv.MaxSize { // SIZE above maximum size, if set } else if s.srv.MaxSize > 0 && size > s.srv.MaxSize { // SIZE above maximum size, if set
err = maxSizeExceeded(s.srv.MaxSize) err = maxSizeExceeded(s.srv.MaxSize)
s.writef(err.Error()) s.writef("%s", err.Error())
} else { // SIZE ok } else { // SIZE ok
from = match[1] from = match[1]
gotFrom = true gotFrom = true
@@ -507,7 +507,7 @@ loop:
} }
break loop break loop
case maxSizeExceededError: case maxSizeExceededError:
s.writef(err.Error()) s.writef("%s", err.Error())
continue continue
default: default:
s.writef("451 4.3.0 Requested action aborted: local error in processing") s.writef("451 4.3.0 Requested action aborted: local error in processing")
@@ -526,7 +526,7 @@ loop:
if err != nil { if err != nil {
checkErrFormat := regexp.MustCompile(`^([2-5][0-9]{2})[\s\-](.+)$`) checkErrFormat := regexp.MustCompile(`^([2-5][0-9]{2})[\s\-](.+)$`)
if checkErrFormat.MatchString(err.Error()) { if checkErrFormat.MatchString(err.Error()) {
s.writef(err.Error()) s.writef("%s", err.Error())
} else { } else {
s.writef("451 4.3.5 Unable to process mail") s.writef("451 4.3.5 Unable to process mail")
} }
@@ -538,7 +538,7 @@ loop:
if err != nil { if err != nil {
checkErrFormat := regexp.MustCompile(`^([2-5][0-9]{2})[\s\-](.+)$`) checkErrFormat := regexp.MustCompile(`^([2-5][0-9]{2})[\s\-](.+)$`)
if checkErrFormat.MatchString(err.Error()) { if checkErrFormat.MatchString(err.Error()) {
s.writef(err.Error()) s.writef("%s", err.Error())
} else { } else {
s.writef("451 4.3.5 Unable to process mail") s.writef("451 4.3.5 Unable to process mail")
} }
@@ -546,7 +546,7 @@ loop:
} }
if msgID != "" { if msgID != "" {
s.writef("250 2.0.0 Ok: queued as " + msgID) s.writef("250 2.0.0 Ok: queued as %s", msgID)
} else { } else {
s.writef("250 2.0.0 Ok: queued") s.writef("250 2.0.0 Ok: queued")
} }
@@ -703,7 +703,7 @@ loop:
break loop break loop
} }
s.writef(err.Error()) s.writef("%s", err.Error())
break break
} }
@@ -726,7 +726,7 @@ func (s *session) writef(format string, args ...interface{}) {
} }
line := fmt.Sprintf(format, args...) line := fmt.Sprintf(format, args...)
fmt.Fprintf(s.bw, line+"\r\n") fmt.Fprintf(s.bw, "%s\r\n", line)
_ = s.bw.Flush() _ = s.bw.Flush()
if Debug { if Debug {
@@ -869,7 +869,7 @@ func (s *session) handleAuthLogin(arg string) (bool, error) {
var err error var err error
if arg == "" { if arg == "" {
s.writef("334 " + base64.StdEncoding.EncodeToString([]byte("Username:"))) s.writef("334 %s", base64.StdEncoding.EncodeToString([]byte("Username:")))
arg, err = s.readLine() arg, err = s.readLine()
if err != nil { if err != nil {
return false, err return false, err
@@ -881,7 +881,7 @@ func (s *session) handleAuthLogin(arg string) (bool, error) {
return false, errors.New("501 5.5.2 Syntax error (unable to decode)") return false, errors.New("501 5.5.2 Syntax error (unable to decode)")
} }
s.writef("334 " + base64.StdEncoding.EncodeToString([]byte("Password:"))) s.writef("334 %s", base64.StdEncoding.EncodeToString([]byte("Password:")))
line, err := s.readLine() line, err := s.readLine()
if err != nil { if err != nil {
return false, err return false, err
@@ -929,7 +929,7 @@ func (s *session) handleAuthPlain(arg string) (bool, error) {
func (s *session) handleAuthCramMD5() (bool, error) { func (s *session) handleAuthCramMD5() (bool, error) {
shared := "<" + strconv.Itoa(os.Getpid()) + "." + strconv.Itoa(time.Now().Nanosecond()) + "@" + s.srv.Hostname + ">" shared := "<" + strconv.Itoa(os.Getpid()) + "." + strconv.Itoa(time.Now().Nanosecond()) + "@" + s.srv.Hostname + ">"
s.writef("334 " + base64.StdEncoding.EncodeToString([]byte(shared))) s.writef("334 %s", base64.StdEncoding.EncodeToString([]byte(shared)))
data, err := s.readLine() data, err := s.readLine()
if err != nil { if err != nil {