From 3e462713debd5c992aa071bed902110bed88ec67 Mon Sep 17 00:00:00 2001 From: Jesse Haka Date: Tue, 2 Oct 2018 09:00:50 +0300 Subject: if EnableLinkPreviews not enabled, do not call url (#9461) --- api4/system.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'api4/system.go') diff --git a/api4/system.go b/api4/system.go index 2f6e53ab8..ddeac4df4 100644 --- a/api4/system.go +++ b/api4/system.go @@ -451,6 +451,13 @@ func testS3(c *Context, w http.ResponseWriter, r *http.Request) { } func getRedirectLocation(c *Context, w http.ResponseWriter, r *http.Request) { + m := make(map[string]string) + m["location"] = "" + cfg := c.App.GetConfig() + if !*cfg.ServiceSettings.EnableLinkPreviews { + w.Write([]byte(model.MapToJson(m))) + return + } url := r.URL.Query().Get("url") if len(url) == 0 { c.SetInvalidParam("url") @@ -463,9 +470,6 @@ func getRedirectLocation(c *Context, w http.ResponseWriter, r *http.Request) { }, } - m := make(map[string]string) - m["location"] = "" - res, err := client.Head(url) if err != nil { // Always return a success status and a JSON string to limit the amount of information returned to a -- cgit v1.2.3-1-g7c22