mirror of https://github.com/miniflux/v2.git
Fix regression in AbsoluteProxifyURL()
Regression introduced in commit 66b8483791
PR #2499
This commit is contained in:
parent
fa9697b972
commit
a15cdb1655
|
@ -766,7 +766,7 @@ func subscribe(newFeed Stream, category Stream, title string, store *storage.Sto
|
||||||
}
|
}
|
||||||
|
|
||||||
created, localizedError := mff.CreateFeed(store, userID, &feedRequest)
|
created, localizedError := mff.CreateFeed(store, userID, &feedRequest)
|
||||||
if err != nil {
|
if localizedError != nil {
|
||||||
return nil, localizedError.Error()
|
return nil, localizedError.Error()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
|
||||||
|
output := AbsoluteProxyRewriter(r, "localhost", input)
|
||||||
|
expected := `<p><img src="http://localhost/proxy/LdPNR1GBDigeeNp2ArUQRyZsVqT_PWLfHGjYFrrWWIY=/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9pbWFnZS5wbmc=" alt="Test"/></p>`
|
||||||
|
|
||||||
|
if expected != output {
|
||||||
|
t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
|
func TestProxyFilterWithHttpsAlwaysAndCustomProxyServer(t *testing.T) {
|
||||||
os.Clearenv()
|
os.Clearenv()
|
||||||
os.Setenv("PROXY_OPTION", "all")
|
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 := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
|
||||||
|
output := ProxyRewriter(r, input)
|
||||||
|
expected := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
|
||||||
|
|
||||||
|
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 := `<p><img src="https://website/folder/image.png" alt="Test"/></p>`
|
||||||
|
output := ProxyRewriter(r, input)
|
||||||
|
expected := `<p><img src="https://proxy-example/proxy/aHR0cHM6Ly93ZWJzaXRlL2ZvbGRlci9pbWFnZS5wbmc=" alt="Test"/></p>`
|
||||||
|
|
||||||
|
if expected != output {
|
||||||
|
t.Errorf(`Not expected output: got "%s" instead of "%s"`, output, expected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestProxyFilterWithHttpInvalid(t *testing.T) {
|
func TestProxyFilterWithHttpInvalid(t *testing.T) {
|
||||||
os.Clearenv()
|
os.Clearenv()
|
||||||
os.Setenv("PROXY_OPTION", "invalid")
|
os.Setenv("PROXY_OPTION", "invalid")
|
||||||
|
|
|
@ -7,6 +7,7 @@ import (
|
||||||
"crypto/hmac"
|
"crypto/hmac"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
|
"log/slog"
|
||||||
"net/url"
|
"net/url"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
|
@ -18,35 +19,54 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// ProxifyURL generates a relative URL for a proxified resource.
|
// ProxifyURL generates a relative URL for a proxified resource.
|
||||||
func ProxifyURL(router *mux.Router, link string) string {
|
func ProxifyURL(router *mux.Router, mediaURL string) string {
|
||||||
if link == "" {
|
if mediaURL == "" {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
if proxyImageUrl := config.Opts.ProxyUrl(); proxyImageUrl != "" {
|
if customProxyURL := config.Opts.ProxyUrl(); customProxyURL != "" {
|
||||||
proxyUrl, err := url.Parse(proxyImageUrl)
|
return ProxifyURLWithCustomProxy(mediaURL, customProxyURL)
|
||||||
if err != nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
proxyUrl.Path = path.Join(proxyUrl.Path, base64.URLEncoding.EncodeToString([]byte(link)))
|
|
||||||
return proxyUrl.String()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mac := hmac.New(sha256.New, config.Opts.ProxyPrivateKey())
|
mac := hmac.New(sha256.New, config.Opts.ProxyPrivateKey())
|
||||||
mac.Write([]byte(link))
|
mac.Write([]byte(mediaURL))
|
||||||
digest := mac.Sum(nil)
|
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.
|
// AbsoluteProxifyURL generates an absolute URL for a proxified resource.
|
||||||
func AbsoluteProxifyURL(router *mux.Router, host, link string) string {
|
func AbsoluteProxifyURL(router *mux.Router, host, mediaURL string) string {
|
||||||
proxifiedUrl := ProxifyURL(router, link)
|
if mediaURL == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
if config.Opts.ProxyUrl() == "" {
|
if customProxyURL := config.Opts.ProxyUrl(); customProxyURL != "" {
|
||||||
return proxifiedUrl
|
return ProxifyURLWithCustomProxy(mediaURL, customProxyURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
proxifiedUrl := ProxifyURL(router, mediaURL)
|
||||||
|
scheme := "http"
|
||||||
if config.Opts.HTTPS {
|
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()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue