Skip to content

Commit

Permalink
Fix gosec issues
Browse files Browse the repository at this point in the history
  • Loading branch information
koddr committed Aug 31, 2021
1 parent 872eec0 commit 943af0f
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions sender.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ func (s *Sender) SendHTMLEmail(templatePath string, dest []string, subject strin
if templatePath == "" {
return fmt.Errorf("Template not found in the given path!")
}
tmpl, errParseTemplate := ParseTemplate(templatePath, data)
if errParseTemplate != nil {
return errParseTemplate
tmpl, err := ParseTemplate(templatePath, data)
if err != nil {
return err
}
body := s.writeEmail(dest, "text/html", subject, tmpl)
if errSendEmail := s.sendEmail(dest, subject, body); errSendEmail != nil {
return errSendEmail
if err := s.sendEmail(dest, subject, body); err != nil {
return err
}
return nil
}

// SendPlainEmail func for send plain text email with data.
func (s *Sender) SendPlainEmail(dest []string, subject, data string) error {
body := s.writeEmail(dest, "text/plain", subject, data)
if errSendEmail := s.sendEmail(dest, subject, body); errSendEmail != nil {
return errSendEmail
if err := s.sendEmail(dest, subject, body); err != nil {
return err
}
return nil
}
Expand Down Expand Up @@ -71,8 +71,10 @@ func (s *Sender) writeEmail(dest []string, contentType, subject, body string) st

// Create writer for make encoding the message.
result := quotedprintable.NewWriter(&encodedMessage)
result.Write([]byte(body))
result.Close()
if _, err := result.Write([]byte(body)); err != nil {
return ""
}
defer result.Close()

// Return the encoded message string.
message += "\r\n" + encodedMessage.String()
Expand Down

0 comments on commit 943af0f

Please sign in to comment.