SDP-1343 Fix HTML escaping (#420)

stellar · Sep 17, 2024 · b7c47bd · b7c47bd
1 parent 3c64059
commit b7c47bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/internal/htmltemplate/htmltemplate.go b/internal/htmltemplate/htmltemplate.go
@@ -26,7 +26,7 @@ func ExecuteHTMLTemplate(templateName string, data interface{}) (string, error)
 }
 
 type EmptyBodyEmailTemplate struct {
-	Body string
+	Body template.HTML
 }
 
 func ExecuteHTMLTemplateForEmailEmptyBody(data EmptyBodyEmailTemplate) (string, error) {

diff --git a/internal/htmltemplate/htmltemplate_test.go b/internal/htmltemplate/htmltemplate_test.go
@@ -3,6 +3,7 @@ package htmltemplate
 import (
 	"crypto/rand"
 	"fmt"
+	"html/template"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -43,7 +44,7 @@ func Test_ExecuteHTMLTemplateForEmailEmptyBody(t *testing.T) {
 	randomStr := fmt.Sprintf("%x", b)[:10]
 
 	// check if the random string is imprinted in the template
-	inputData := EmptyBodyEmailTemplate{Body: randomStr}
+	inputData := EmptyBodyEmailTemplate{Body: template.HTML(randomStr)}
 	templateStr, err := ExecuteHTMLTemplateForEmailEmptyBody(inputData)
 	require.NoError(t, err)
 	require.Contains(t, templateStr, randomStr)

diff --git a/internal/message/aws_ses_client.go b/internal/message/aws_ses_client.go
@@ -2,6 +2,7 @@ package message
 
 import (
 	"fmt"
+	"html/template"
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -51,7 +52,7 @@ func (a *awsSESClient) SendMessage(message Message) error {
 
 // generateAWSEmail generates the email object to send an email through AWS SES.
 func generateAWSEmail(message Message, sender string) (*ses.SendEmailInput, error) {
-	html, err := htmltemplate.ExecuteHTMLTemplateForEmailEmptyBody(htmltemplate.EmptyBodyEmailTemplate{Body: message.Message})
+	html, err := htmltemplate.ExecuteHTMLTemplateForEmailEmptyBody(htmltemplate.EmptyBodyEmailTemplate{Body: template.HTML(message.Message)})
 	if err != nil {
 		return nil, fmt.Errorf("generating html template: %w", err)
 	}