From a15cdb16551e932f7c4a6263c4069ce23497d7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Mon, 18 Mar 2024 20:18:09 -0700 Subject: [PATCH] Fix regression in AbsoluteProxifyURL() Regression introduced in commit 66b8483791e58030c0cc3b5c5d82b0b0d5e87cec PR #2499 --- internal/googlereader/handler.go | 2 +- internal/proxy/media_proxy_test.go | 75 ++++++++++++++++++++++++++++++ internal/proxy/proxy.go | 54 ++++++++++++++------- 3 files changed, 113 insertions(+), 18 deletions(-) diff --git a/internal/googlereader/handler.go b/internal/googlereader/handler.go index b9d9257c..740b6675 100644 --- a/internal/googlereader/handler.go +++ b/internal/googlereader/handler.go @@ -766,7 +766,7 @@ func subscribe(newFeed Stream, category Stream, title string, store *storage.Sto } created, localizedError := mff.CreateFeed(store, userID, &feedRequest) - if err != nil { + if localizedError != nil { return nil, localizedError.Error() } diff --git a/internal/proxy/media_proxy_test.go b/internal/proxy/media_proxy_test.go index bd0de097..9b029af4 100644 --- a/internal/proxy/media_proxy_test.go +++ b/internal/proxy/media_proxy_test.go @@ -157,6 +157,31 @@ func TestProxyFilterWithHttpsAlways(t *testing.T) { } } +func TestAbsoluteProxyFilterWithHttpsAlways(t *testing.T) { + os.Clearenv() + os.Setenv("PROXY_OPTION", "all") + os.Setenv("PROXY_MEDIA_TYPES", "image") + os.Setenv("PROXY_PRIVATE_KEY", "test") + + var err error + parser := config.NewParser() + config.Opts, err = parser.ParseEnvironmentVariables() + if err != nil { + t.Fatalf(`Parsing failure: %v`, err) + } + + r := mux.NewRouter() + r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy") + + input := `

Test

` + output := AbsoluteProxyRewriter(r, "localhost", input) + expected := `

Test

` + + if expected != output { + t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected) + } +} + func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) { os.Clearenv() os.Setenv("PROXY_OPTION", "all") @@ -182,6 +207,56 @@ func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) { } } +func TestProxyFilterWithHttpsAlwaysAndIncorrectCustomProxyServer(t *testing.T) { + os.Clearenv() + os.Setenv("PROXY_OPTION", "all") + os.Setenv("PROXY_MEDIA_TYPES", "image") + os.Setenv("PROXY_URL", "http://:8080example.com") + + var err error + parser := config.NewParser() + config.Opts, err = parser.ParseEnvironmentVariables() + if err != nil { + t.Fatalf(`Parsing failure: %v`, err) + } + + r := mux.NewRouter() + r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy") + + input := `

Test

` + output := ProxyRewriter(r, input) + expected := `

Test

` + + if expected != output { + t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected) + } +} + +func TestAbsoluteProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) { + os.Clearenv() + os.Setenv("PROXY_OPTION", "all") + os.Setenv("PROXY_MEDIA_TYPES", "image") + os.Setenv("PROXY_URL", "https://proxy-example/proxy") + + var err error + parser := config.NewParser() + config.Opts, err = parser.ParseEnvironmentVariables() + if err != nil { + t.Fatalf(`Parsing failure: %v`, err) + } + + r := mux.NewRouter() + r.HandleFunc("/proxy/{encodedDigest}/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy") + + input := `

Test

` + output := ProxyRewriter(r, input) + expected := `

Test

` + + if expected != output { + t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected) + } +} + func TestProxyFilterWithHttpInvalid(t *testing.T) { os.Clearenv() os.Setenv("PROXY_OPTION", "invalid") diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 512431df..8bbb59d1 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -7,6 +7,7 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/base64" + "log/slog" "net/url" "path" @@ -18,35 +19,54 @@ import ( ) // ProxifyURL generates a relative URL for a proxified resource. -func ProxifyURL(router *mux.Router, link string) string { - if link == "" { +func ProxifyURL(router *mux.Router, mediaURL string) string { + if mediaURL == "" { return "" } - if proxyImageUrl := config.Opts.ProxyUrl(); proxyImageUrl != "" { - proxyUrl, err := url.Parse(proxyImageUrl) - if err != nil { - return "" - } - proxyUrl.Path = path.Join(proxyUrl.Path, base64.URLEncoding.EncodeToString([]byte(link))) - return proxyUrl.String() + if customProxyURL := config.Opts.ProxyUrl(); customProxyURL != "" { + return ProxifyURLWithCustomProxy(mediaURL, customProxyURL) } mac := hmac.New(sha256.New, config.Opts.ProxyPrivateKey()) - mac.Write([]byte(link)) + mac.Write([]byte(mediaURL)) digest := mac.Sum(nil) - return route.Path(router, "proxy", "encodedDigest", base64.URLEncoding.EncodeToString(digest), "encodedURL", base64.URLEncoding.EncodeToString([]byte(link))) + return route.Path(router, "proxy", "encodedDigest", base64.URLEncoding.EncodeToString(digest), "encodedURL", base64.URLEncoding.EncodeToString([]byte(mediaURL))) } // AbsoluteProxifyURL generates an absolute URL for a proxified resource. -func AbsoluteProxifyURL(router *mux.Router, host, link string) string { - proxifiedUrl := ProxifyURL(router, link) +func AbsoluteProxifyURL(router *mux.Router, host, mediaURL string) string { + if mediaURL == "" { + return "" + } - if config.Opts.ProxyUrl() == "" { - return proxifiedUrl + if customProxyURL := config.Opts.ProxyUrl(); customProxyURL != "" { + return ProxifyURLWithCustomProxy(mediaURL, customProxyURL) } + + proxifiedUrl := ProxifyURL(router, mediaURL) + scheme := "http" if config.Opts.HTTPS { - return "https://" + host + proxifiedUrl + scheme = "https" } - return "http://" + host + proxifiedUrl + + return scheme + "://" + host + proxifiedUrl +} + +func ProxifyURLWithCustomProxy(mediaURL, customProxyURL string) string { + if customProxyURL == "" { + return mediaURL + } + + proxyUrl, err := url.Parse(customProxyURL) + if err != nil { + slog.Error("Incorrect custom media proxy URL", + slog.String("custom_proxy_url", customProxyURL), + slog.Any("error", err), + ) + return mediaURL + } + + proxyUrl.Path = path.Join(proxyUrl.Path, base64.URLEncoding.EncodeToString([]byte(mediaURL))) + return proxyUrl.String() }