diff options
| author | Christopher Brown <ccbrown112@gmail.com> | 2018-02-09 20:08:39 -0600 |
|---|---|---|
| committer | Christopher Brown <ccbrown112@gmail.com> | 2018-02-09 20:08:39 -0600 |
| commit | c1b6e8792c9f91c66c35737438c20757ef43066f (patch) | |
| tree | 6185a06ef39be33c7128ea335c656deddd626419 | |
| parent | 396e7513ecc7d86b04e56745586c802e56e5d763 (diff) | |
| download | chat-c1b6e8792c9f91c66c35737438c20757ef43066f.tar.gz chat-c1b6e8792c9f91c66c35737438c20757ef43066f.tar.bz2 chat-c1b6e8792c9f91c66c35737438c20757ef43066f.zip | |
minor addition to #8238
| -rw-r--r-- | app/post.go | 6 | ||||
| -rw-r--r-- | app/post_test.go | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/post.go b/app/post.go index 5b0e59b23..be9374e10 100644 --- a/app/post.go +++ b/app/post.go @@ -894,14 +894,10 @@ func (a *App) ImageProxyAdder() func(string) string { } return func(url string) string { - if url == "" || strings.HasPrefix(url, siteURL) || strings.HasPrefix(url, proxyURL) { + if url == "" || url[0] == '/' || strings.HasPrefix(url, siteURL) || strings.HasPrefix(url, proxyURL) { return url } - if url[0] == '/' { - url = siteURL + url[1:] - } - switch proxyType { case "atmos/camo": mac := hmac.New(sha1.New, []byte(options)) diff --git a/app/post_test.go b/app/post_test.go index e09d3a198..409bc043d 100644 --- a/app/post_test.go +++ b/app/post_test.go @@ -221,6 +221,12 @@ func TestImageProxy(t *testing.T) { ImageURL: "http://mymattermost.com/myimage", ProxiedImageURL: "http://mymattermost.com/myimage", }, + "willnorris/imageproxy_PathOnly": { + ProxyType: "willnorris/imageproxy", + ProxyURL: "https://127.0.0.1", + ImageURL: "/myimage", + ProxiedImageURL: "/myimage", + }, "willnorris/imageproxy_EmptyImageURL": { ProxyType: "willnorris/imageproxy", ProxyURL: "https://127.0.0.1", |