wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-22 13:50:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some code smell that was identified by SonarQube

Browse source
This commit is contained in:
Winni Neessen 2022-04-12 16:01:30 +02:00
parent 3351e158a8
commit 914a02b0be
Signed by: wneessen
GPG key ID: 5F3AF39B820C119D
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
msgwriter.go
View file

@ -18,6 +18,13 @@ import (
// RFC 2047 suggests 76 characters // RFC 2047 suggests 76 characters
const MaxHeaderLength = 76 const MaxHeaderLength = 76
// SingleNewLine represents a new line that can be used by the msgWriter to issue a carriage return
const SingleNewLine = "\r\n"
// DoubleNewLine represents a double new line that can be used by the msgWriter to
// indicate a new segement of the mail
const DoubleNewLine = "\r\n\r\n"
// msgWriter handles the I/O to the io.WriteCloser of the SMTP client // msgWriter handles the I/O to the io.WriteCloser of the SMTP client
type msgWriter struct { type msgWriter struct {
c Charset c Charset
@ -59,15 +66,15 @@ func (mw *msgWriter) writeMsg(m *Msg) {
if m.hasMixed() { if m.hasMixed() {
mw.startMP("mixed", m.boundary) mw.startMP("mixed", m.boundary)
mw.writeString("\r\n\r\n") mw.writeString(DoubleNewLine)
} }
if m.hasRelated() { if m.hasRelated() {
mw.startMP("related", m.boundary) mw.startMP("related", m.boundary)
mw.writeString("\r\n\r\n") mw.writeString(DoubleNewLine)
} }
if m.hasAlt() { if m.hasAlt() {
mw.startMP(MIMEAlternative, m.boundary) mw.startMP(MIMEAlternative, m.boundary)
mw.writeString("\r\n\r\n") mw.writeString(DoubleNewLine)
} }
for _, p := range m.parts { for _, p := range m.parts {
@ -163,7 +170,7 @@ func (mw *msgWriter) addFiles(fl []*File, a bool) {
for h, v := range f.Header { for h, v := range f.Header {
mw.writeHeader(Header(h), v...) mw.writeHeader(Header(h), v...)
} }
mw.writeString("\r\n") mw.writeString(SingleNewLine)
} }
if mw.d > 0 { if mw.d > 0 {
mw.newPart(f.Header) mw.newPart(f.Header)
@ -184,7 +191,7 @@ func (mw *msgWriter) writePart(p *Part, cs Charset) {
if mw.d == 0 { if mw.d == 0 {
mw.writeHeader(HeaderContentType, ct) mw.writeHeader(HeaderContentType, ct)
mw.writeHeader(HeaderContentTransferEnc, cte) mw.writeHeader(HeaderContentTransferEnc, cte)
mw.writeString("\r\n") mw.writeString(SingleNewLine)
} }
if mw.d > 0 { if mw.d > 0 {
mh := textproto.MIMEHeader{} mh := textproto.MIMEHeader{}
@ -222,7 +229,7 @@ func (mw *msgWriter) writeHeader(k Header, vl ...string) {
sfs := strings.Split(fs, " ") sfs := strings.Split(fs, " ")
for i, v := range sfs { for i, v := range sfs {
if cl-len(v) <= 1 { if cl-len(v) <= 1 {
wbuf.WriteString("\r\n ") wbuf.WriteString(fmt.Sprintf("%s ", SingleNewLine))
cl = MaxHeaderLength - 3 cl = MaxHeaderLength - 3
} }
wbuf.WriteString(v) wbuf.WriteString(v)
@ -234,7 +241,7 @@ func (mw *msgWriter) writeHeader(k Header, vl ...string) {
} }
bufs := wbuf.String() bufs := wbuf.String()
bufs = strings.ReplaceAll(bufs, " \r\n", "\r\n") bufs = strings.ReplaceAll(bufs, fmt.Sprintf(" %s", SingleNewLine), SingleNewLine)
mw.writeString(bufs) mw.writeString(bufs)
mw.writeString("\r\n") mw.writeString("\r\n")
} }