cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated CR removal code to work on older Go versions

pull/1894/head
Glenn Wilkinson 2020-03-24 17:26:05 +00:00
parent 920f61d2ee
commit f5d3ca4968
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imap/imap.go
View File

@ -7,8 +7,8 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"io" "io"
"regexp"
"strconv" "strconv"
"strings"
"time" "time"
"github.com/emersion/go-imap" "github.com/emersion/go-imap"
@ -163,7 +163,8 @@ func (mbox *Mailbox) GetUnread(markAsRead, delete bool) ([]Email, error) {
//Remove CR characters, see https://github.com/jordan-wright/email/issues/106 //Remove CR characters, see https://github.com/jordan-wright/email/issues/106
tmp := string(buf) tmp := string(buf)
tmp = strings.ReplaceAll(tmp, "\r", "") re := regexp.MustCompile(`\r`)
tmp = re.ReplaceAllString(tmp, "")
buf = []byte(tmp) buf = []byte(tmp)
rawBodyStream := bytes.NewReader(buf) rawBodyStream := bytes.NewReader(buf)