Skip to content

fix: Add missing err checks to inbound.Parse #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Add missing err checks to inbound.Parse #461

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8362012
inbound.Parse: fix panic when Content-Type is not multipart
m-terel May 19, 2022
6d23f68
drop err msg
m-terel May 19, 2022
cc27653
Merge pull request #1 from m-terel/inbound-parse-fix-panic
m-terel Jun 9, 2022
dd4031c
Add missing err checks
m-terel Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions helpers/inbound/inbound.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"io/ioutil"
"mime"
"mime/multipart"
"mime/quotedprintable"
"net/http"
"strings"
)
Expand Down Expand Up @@ -168,11 +169,34 @@ func (email *ParsedEmail) parseRawEmail(rawEmail string) error {
return err
}

// if Content-Type is not multipart just set the whole email
if raw == nil {
if len(sections) < 2 {
return nil
}

wholeEmail := sections[1]
// decode if needed
if email.Headers["Content-Transfer-Encoding"] == "quoted-printable" {
decoded, err := ioutil.ReadAll(quotedprintable.NewReader(strings.NewReader(wholeEmail)))
if err != nil {
return err
}
wholeEmail = string(decoded)
}

email.Body[email.Headers["Content-Type"]] = wholeEmail
return nil
}

for {
emailPart, err := raw.NextPart()
if err == io.EOF {
return nil
}
if err != nil {
return err
}
rawEmailBody, err := parseMultipart(emailPart, emailPart.Header.Get("Content-Type"))
if err != nil {
return err
Expand All @@ -183,6 +207,9 @@ func (email *ParsedEmail) parseRawEmail(rawEmail string) error {
if err == io.EOF {
break
}
if err != nil {
return err
}
header := emailBodyPart.Header.Get("Content-Type")
b, err := ioutil.ReadAll(emailPart)
if err != nil {
Expand Down