From 074f352709c024a04261ebb007dce6772c9eb243 Mon Sep 17 00:00:00 2001 From: Daenney Date: Wed, 22 Feb 2023 22:36:18 +0100 Subject: [PATCH] [chore] improve opengraph descripiton tag (#1550) This changes parseDescription to properly encode things to be safe for usage without removing things like backslashes that may be relevant. * text.SanitizePlaintext already calls html.UnescapeString so we don't have to do that * Replace \n with space early * Remove duplicate white-space by splitting on fields and joining * HTML-escape the string we have * For extra certainty, encode the backslash as \ Fixes #1549 --- internal/web/opengraph.go | 8 +++--- internal/web/opengraph_test.go | 50 ++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 internal/web/opengraph_test.go diff --git a/internal/web/opengraph.go b/internal/web/opengraph.go index 9636e408..6fcc524c 100644 --- a/internal/web/opengraph.go +++ b/internal/web/opengraph.go @@ -134,11 +134,11 @@ func parseTitle(account *apimodel.Account, accountDomain string) string { // parseDescription returns a string description which is // safe to use as a template.HTMLAttr inside templates. func parseDescription(in string) string { - i := html.UnescapeString(in) - i = text.SanitizePlaintext(i) - i = strings.ReplaceAll(i, "\"", "'") - i = strings.ReplaceAll(i, `\`, "") + i := text.SanitizePlaintext(in) i = strings.ReplaceAll(i, "\n", " ") + i = strings.Join(strings.Fields(i), " ") + i = html.EscapeString(i) + i = strings.ReplaceAll(i, `\`, "\") i = trim(i, maxOGDescriptionLength) return `content="` + i + `"` } diff --git a/internal/web/opengraph_test.go b/internal/web/opengraph_test.go new file mode 100644 index 00000000..07282a77 --- /dev/null +++ b/internal/web/opengraph_test.go @@ -0,0 +1,50 @@ +/* + GoToSocial + Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +package web + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/suite" +) + +type OpenGraphTestSuite struct { + suite.Suite +} + +func (suite *OpenGraphTestSuite) TestParseDescription() { + tests := []struct { + name, in, exp string + }{ + {name: "shellcmd", in: `echo '\e]8;;http://example.com\e\This is a link\e]8;;\e'`, exp: `echo '\e]8;;http://example.com\e\This is a link\e]8;;\e'`}, + {name: "newlines", in: "test\n\ntest\ntest", exp: "test test test"}, + } + + for _, tt := range tests { + tt := tt + suite.Run(tt.name, func() { + suite.Equal(fmt.Sprintf("content=\"%s\"", tt.exp), parseDescription(tt.in)) + }) + } +} + +func TestOpenGraphTestSuite(t *testing.T) { + suite.Run(t, &OpenGraphTestSuite{}) +}