mirror of
https://github.com/navidrome/navidrome.git
synced 2026-09-14 14:43:23 -04:00
Deluan Quintão
1f861d27ef
* fix(plugins): build public URLs on the caller's address instead of localhost The artwork host service had no `*http.Request`, so it passed `nil` to `publicurl.ImageURL`. With neither `ShareURL` nor `BaseURL` configured, that produced `http://localhost/share/img/...`, which is useless to anything outside the server. The Discord Rich Presence plugin explicitly drops localhost URLs, so it fell back to the Navidrome logo instead of the real cover art. `serverAddressMiddleware` already works out the client-facing scheme and host from the `X-Forwarded-*` headers. It now also records them in the request context, and `publicurl` takes a `context.Context` instead of an `*http.Request` so any caller can reach them. Extism passes the caller's context through to host functions, so plugins invoked during a request now get a reachable URL with no configuration. Switching the parameter also removes the need for a second, parallel entry point: the package previously wanted only a scheme, a host, and a context, and took a whole request to get them. `AbsoluteURL` no longer dereferences a possibly-nil request on its parse-error path. Plugin calls that start from `context.Background()` (scheduler and websocket callbacks, the buffered scrobble drain) still fall back to localhost, since they have no request to learn from. A debug log now points at `ShareURL` when that happens. * fix(publicurl): include the configured port in the localhost fallback The last-resort fallback built `http://localhost/...`, which points at port 80 and so is unreachable for a server listening anywhere else — the default 4533 included. Use `conf.Server.Port` so a consumer on the same machine can actually fetch the URL. * fix(publicurl): use https in the localhost fallback when TLS is configured The fallback hardcoded the http scheme, so a TLS-only server with no BaseURL advertised a URL it does not answer on. Mirror the server's own switch, which requires both a certificate and a key. * refactor(publicurl): tidy the localhost fallback and its tests Use gg.If for the fallback scheme so it reads as an expression, like the BaseScheme branch above it, instead of assigning http and overwriting it. Drop two tests the ctx refactor left redundant: one asserted PublicURL "works without a request" but became a byte-identical copy of the ShareURL spec once the *http.Request parameter went away, and the two port specs differed only in the integer, where the non-default port is the stronger assertion. * refactor(conf): add TLSEnabled and use it instead of repeating the predicate Whether the server speaks HTTPS was decided inline in three unconnected places. This PR added the third, in a URL-building package that has no business inferring the transport config. Move the rule to conf, next to the fields it derives from, and call it from publicurl and the insights collector. server.Run keeps its own expression: it takes the certificate and key as parameters, and its test passes values that do not come from the config.
72 lines
1.9 KiB
Go
72 lines
1.9 KiB
Go
package request
|
|
|
|
import (
|
|
"context"
|
|
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
var _ = Describe("Token epoch holder", func() {
|
|
It("reports nothing when unset", func() {
|
|
ctx := WithTokenEpochHolder(context.TODO())
|
|
_, ok := TokenEpochFrom(ctx)
|
|
Expect(ok).To(BeFalse())
|
|
})
|
|
|
|
It("round-trips a value set by the handler", func() {
|
|
ctx := WithTokenEpochHolder(context.TODO())
|
|
SetTokenEpoch(ctx, 7)
|
|
|
|
epoch, ok := TokenEpochFrom(ctx)
|
|
Expect(ok).To(BeTrue())
|
|
Expect(epoch).To(Equal(7))
|
|
})
|
|
|
|
It("survives being wrapped in a derived context", func() {
|
|
ctx := WithTokenEpochHolder(context.TODO())
|
|
SetTokenEpoch(context.WithValue(ctx, contextKey("unrelated"), 1), 3)
|
|
|
|
epoch, ok := TokenEpochFrom(ctx)
|
|
Expect(ok).To(BeTrue())
|
|
Expect(epoch).To(Equal(3))
|
|
})
|
|
|
|
It("is a no-op with no holder installed", func() {
|
|
Expect(func() { SetTokenEpoch(context.TODO(), 5) }).ToNot(Panic())
|
|
_, ok := TokenEpochFrom(context.TODO())
|
|
Expect(ok).To(BeFalse())
|
|
})
|
|
})
|
|
|
|
var _ = Describe("Server address", func() {
|
|
It("reports nothing when unset", func() {
|
|
_, _, ok := ServerAddressFrom(context.TODO())
|
|
Expect(ok).To(BeFalse())
|
|
})
|
|
|
|
It("round-trips the scheme and host", func() {
|
|
ctx := WithServerAddress(context.TODO(), "https", "music.example.com")
|
|
|
|
scheme, host, ok := ServerAddressFrom(ctx)
|
|
Expect(ok).To(BeTrue())
|
|
Expect(scheme).To(Equal("https"))
|
|
Expect(host).To(Equal("music.example.com"))
|
|
})
|
|
|
|
It("reports nothing when the host is empty", func() {
|
|
ctx := WithServerAddress(context.TODO(), "https", "")
|
|
|
|
_, _, ok := ServerAddressFrom(ctx)
|
|
Expect(ok).To(BeFalse())
|
|
})
|
|
|
|
It("is carried over to a background context by AddValues", func() {
|
|
reqCtx := WithServerAddress(context.TODO(), "https", "music.example.com")
|
|
|
|
_, host, ok := ServerAddressFrom(AddValues(context.Background(), reqCtx))
|
|
Expect(ok).To(BeTrue())
|
|
Expect(host).To(Equal("music.example.com"))
|
|
})
|
|
})
|