infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-10 07:54:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

for imap/smtp syntax errors, only echo the remaining buffer if the connection is authenticated

Browse Source
This commit is contained in:
Mechiel Lukkien
2023-03-10 11:32:34 +01:00
parent e413c906b1
commit f9eae88aba
6 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
imapserver/error.go
View File

@ -1,6 +1,7 @@
package imapserver
import (
"errors"
"fmt"
)
@ -36,13 +37,14 @@ func xserverErrorf(format string, args ...any) {
}
type syntaxError struct {
line string // Optional line to write before BAD result. For untagged response. CRLF will be added.
code string // Optional result code (between []) to write in BAD result.
err error // BAD response message.
line string // Optional line to write before BAD result. For untagged response. CRLF will be added.
code string // Optional result code (between []) to write in BAD result.
errmsg string // BAD response message.
err error // Typically with same info as errmsg, but sometimes more.
}
func (e syntaxError) Error() string {
s := "bad syntax: " + e.err.Error()
s := "bad syntax: " + e.errmsg
if e.code != "" {
s += " [" + e.code + "]"
}
@ -51,5 +53,7 @@ func (e syntaxError) Error() string {
func (e syntaxError) Unwrap() error { return e.err }
func xsyntaxErrorf(format string, args ...any) {
panic(syntaxError{"", "", fmt.Errorf(format, args...)})
errmsg := fmt.Sprintf(format, args...)
err := errors.New(errmsg)
panic(syntaxError{"", "", errmsg, err})
}