这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(mediaproxy): always forward the browser Accept header #3711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2025
Merged

fix(mediaproxy): always forward the browser Accept header #3711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions internal/reader/fetcher/request_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ import (
)

const (
defaultHTTPClientTimeout = 20
defaultHTTPClientMaxBodySize = 15 * 1024 * 1024
defaultAcceptHeader = "application/xml, application/atom+xml, application/rss+xml, application/rdf+xml, application/feed+json, text/html, */*;q=0.9"
defaultHTTPClientTimeout = 20
defaultAcceptHeader = "application/xml, application/atom+xml, application/rss+xml, application/rdf+xml, application/feed+json, text/html, */*;q=0.9"
)

type RequestBuilder struct {
headers http.Header
clientProxyURL *url.URL
clientTimeout int
useClientProxy bool
withoutRedirects bool
ignoreTLSErrors bool
disableHTTP2 bool
proxyRotator *proxyrotator.ProxyRotator
feedProxyURL string
headers http.Header
clientProxyURL *url.URL
clientTimeout int
useClientProxy bool
withoutRedirects bool
ignoreTLSErrors bool
disableHTTP2 bool
disableCompression bool
proxyRotator *proxyrotator.ProxyRotator
feedProxyURL string
}

func NewRequestBuilder() *RequestBuilder {
Expand Down Expand Up @@ -124,6 +124,11 @@ func (r *RequestBuilder) IgnoreTLSErrors(value bool) *RequestBuilder {
return r
}

func (r *RequestBuilder) WithoutCompression() *RequestBuilder {
r.disableCompression = true
return r
}

func (r *RequestBuilder) ExecuteRequest(requestURL string) (*http.Response, error) {
transport := &http.Transport{
Proxy: http.ProxyFromEnvironment,
Expand Down Expand Up @@ -197,8 +202,18 @@ func (r *RequestBuilder) ExecuteRequest(requestURL string) (*http.Response, erro
}

req.Header = r.headers
req.Header.Set("Accept-Encoding", "br, gzip")
req.Header.Set("Accept", defaultAcceptHeader)
if r.disableCompression {
req.Header.Set("Accept-Encoding", "identity")
} else {
req.Header.Set("Accept-Encoding", "br, gzip")
}

// Set default Accept header if not already set.
// Note that for the media proxy requests, we need to forward the browser Accept header.
if req.Header.Get("Accept") == "" {
req.Header.Set("Accept", defaultAcceptHeader)
}

req.Header.Set("Connection", "close")

slog.Debug("Making outgoing request", slog.Group("request",
Expand Down
3 changes: 3 additions & 0 deletions internal/ui/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ func (h *handler) mediaProxy(w http.ResponseWriter, r *http.Request) {
requestBuilder := fetcher.NewRequestBuilder()
requestBuilder.WithTimeout(config.Opts.MediaProxyHTTPClientTimeout())

// Disable compression for the media proxy requests (not implemented).
requestBuilder.WithoutCompression()

if referer := rewrite.GetRefererForURL(mediaURL); referer != "" {
requestBuilder.WithHeader("Referer", referer)
}
Expand Down
Loading