Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: change email encoding to quoted-printable (#1238)
Kyle Mendell858bf62bda46
diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex 15154c23a..949e7f789 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -379,7 +379,10 @@ func (s *NotificationService) sendEmailNotification(ctx context.Context, imageRe}subject := fmt.Sprintf("Container Update Available: %s", notifications.SanitizeForEmail(imageRef))- message := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ message, err := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ if err != nil {+ return fmt.Errorf("failed to build email message: %w", err)+ }client, err := notifications.ConnectSMTP(ctx, emailConfig)if err != nil {@@ -583,7 +586,10 @@ func (s *NotificationService) sendEmailContainerUpdateNotification(ctx context.C}subject := fmt.Sprintf("Container Updated: %s", notifications.SanitizeForEmail(containerName))- message := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ message, err := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ if err != nil {+ return fmt.Errorf("failed to build email message: %w", err)+ }client, err := notifications.ConnectSMTP(ctx, emailConfig)if err != nil {@@ -740,7 +746,10 @@ func (s *NotificationService) sendTestEmail(ctx context.Context, config models.J}subject := "Test Email from Arcane"- message := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ message, err := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ if err != nil {+ return fmt.Errorf("failed to build email message: %w", err)+ }client, err := notifications.ConnectSMTP(ctx, emailConfig)if err != nil {@@ -1014,7 +1023,10 @@ func (s *NotificationService) sendBatchEmailNotification(ctx context.Context, up}return ""}())- message := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ message, err := notifications.BuildMultipartMessage(emailConfig.FromAddress, emailConfig.ToAddresses, subject, htmlBody, textBody)+ if err != nil {+ return fmt.Errorf("failed to build email message: %w", err)+ }client, err := notifications.ConnectSMTP(ctx, emailConfig)if err != nil {diff --git a/backend/internal/utils/notifications/email_util.go b/backend/internal/utils/notifications/email_util.goindex d2a8e0108..2cd1435d1 100644--- a/backend/internal/utils/notifications/email_util.go+++ b/backend/internal/utils/notifications/email_util.go@@ -6,6 +6,7 @@ import ("crypto/tls""errors""fmt"+ "mime/quotedprintable""os""strings""time"@@ -170,7 +171,7 @@ func SanitizeForEmail(s string) string {}// BuildMultipartMessage constructs a MIME multipart email message with both HTML and text parts-func BuildMultipartMessage(fromAddress string, toAddresses []string, subject string, htmlBody string, textBody string) string {+func BuildMultipartMessage(fromAddress string, toAddresses []string, subject string, htmlBody string, textBody string) (string, error) {var buf bytes.Bufferboundary := fmt.Sprintf("boundary_%d", time.Now().UnixNano())@@ -186,21 +187,31 @@ func BuildMultipartMessage(fromAddress string, toAddresses []string, subject str// Add text partbuf.WriteString(fmt.Sprintf("--%s\r\n", boundary))buf.WriteString("Content-Type: text/plain; charset=UTF-8\r\n")- buf.WriteString("Content-Transfer-Encoding: 7bit\r\n")+ buf.WriteString("Content-Transfer-Encoding: quoted-printable\r\n")buf.WriteString("\r\n")- buf.WriteString(textBody)++ qp := quotedprintable.NewWriter(&buf)+ if _, err := qp.Write([]byte(textBody)); err != nil {+ return "", fmt.Errorf("failed to encode text body: %w", err)+ }+ qp.Close()buf.WriteString("\r\n")// Add HTML partbuf.WriteString(fmt.Sprintf("--%s\r\n", boundary))buf.WriteString("Content-Type: text/html; charset=UTF-8\r\n")- buf.WriteString("Content-Transfer-Encoding: 7bit\r\n")+ buf.WriteString("Content-Transfer-Encoding: quoted-printable\r\n")buf.WriteString("\r\n")- buf.WriteString(htmlBody)++ qp = quotedprintable.NewWriter(&buf)+ if _, err := qp.Write([]byte(htmlBody)); err != nil {+ return "", fmt.Errorf("failed to encode html body: %w", err)+ }+ qp.Close()buf.WriteString("\r\n")// End boundarybuf.WriteString(fmt.Sprintf("--%s--\r\n", boundary))- return buf.String()+ return buf.String(), nil}