MM-17609 Add EnableSVGs setting (#11874)

* MM-17609 Add EnableSVGs setting * MM-17609 Return SVG images in post metadata
mattermost · Aug 15, 2019 · 2c5a87b · 2c5a87b
1 parent 09eb7e5
commit 2c5a87b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/app/diagnostics.go b/app/diagnostics.go
@@ -281,6 +281,7 @@ func (a *App) trackConfig() {
 		"enable_email_invitations":                                *cfg.ServiceSettings.EnableEmailInvitations,
 		"experimental_channel_organization":                       *cfg.ServiceSettings.ExperimentalChannelOrganization,
 		"experimental_ldap_group_sync":                            *cfg.ServiceSettings.ExperimentalLdapGroupSync,
+		"enable_svgs":                                             *cfg.ServiceSettings.EnableSVGs,
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{

diff --git a/app/post_metadata.go b/app/post_metadata.go
@@ -470,7 +470,13 @@ func cacheLinkMetadata(requestURL string, timestamp int64, og *opengraph.OpenGra
 }
 
 func (a *App) parseLinkMetadata(requestURL string, body io.Reader, contentType string) (*opengraph.OpenGraph, *model.PostImage, error) {
-	if strings.HasPrefix(contentType, "image") {
+	if contentType == "image/svg+xml" {
+		image := &model.PostImage{
+			Format: "svg",
+		}
+
+		return nil, image, nil
+	} else if strings.HasPrefix(contentType, "image") {
 		image, err := parseImages(io.LimitReader(body, MaxMetadataImageSize))
 		return nil, image, err
 	} else if strings.HasPrefix(contentType, "text/html") {

diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go
@@ -1968,6 +1968,16 @@ func TestParseLinkMetadata(t *testing.T) {
 		assert.Nil(t, og)
 		assert.Nil(t, dimensions)
 	})
+
+	t.Run("svg", func(t *testing.T) {
+		og, dimensions, err := th.App.parseLinkMetadata("http://example.com/image.svg", nil, "image/svg+xml")
+		assert.Nil(t, err)
+
+		assert.Nil(t, og)
+		assert.Equal(t, &model.PostImage{
+			Format: "svg",
+		}, dimensions)
+	})
 }
 
 func TestParseImages(t *testing.T) {

diff --git a/config/default.json b/config/default.json
@@ -75,7 +75,8 @@
         "ExperimentalEnableHardenedMode": false,
         "DisableLegacyMFA": false,
         "EnableEmailInvitations": false,
-        "ExperimentalLdapGroupSync": false
+        "ExperimentalLdapGroupSync": false,
+        "EnableSVGs": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",

diff --git a/model/config.go b/model/config.go
@@ -285,6 +285,7 @@ type ServiceSettings struct {
 	DisableLegacyMFA                                  *bool
 	EnableEmailInvitations                            *bool
 	ExperimentalLdapGroupSync                         *bool
+	EnableSVGs                                        *bool
 }
 
 func (s *ServiceSettings) SetDefaults() {
@@ -583,6 +584,10 @@ func (s *ServiceSettings) SetDefaults() {
 	if s.ExperimentalLdapGroupSync == nil {
 		s.ExperimentalLdapGroupSync = NewBool(false)
 	}
+
+	if s.EnableSVGs == nil {
+		s.EnableSVGs = NewBool(true)
+	}
 }
 
 type ClusterSettings struct {

diff --git a/utils/config.go b/utils/config.go
@@ -452,6 +452,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
 	props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial)
 	props["ExperimentalEnableDefaultChannelLeaveJoinMessages"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages)
 	props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels
+	props["EnableSVGs"] = strconv.FormatBool(*c.ServiceSettings.EnableSVGs)
 
 	// This setting is only temporary, so keep using the old setting name for the mobile and web apps
 	props["ExperimentalEnablePostMetadata"] = strconv.FormatBool(!*c.ExperimentalSettings.DisablePostMetadata)