remote/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-08 02:17:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 40634af09e into 52135913d4

Browse source
This commit is contained in:
Vladimir Babin 2026-10-08 01:17:12 +08:00 • committed by GitHub
commit 79cefc5ab6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/subsonic/browsing.go
View file

@ -236,7 +236,7 @@ func (api *Router) GetAlbumInfo(r *http.Request) (*responses.Subsonic, error) {
response.AlbumInfo.LargeImageUrl = publicurl.ImageURL(r.Context(), album.CoverArtID(), 1200)
}
response.AlbumInfo.LastFmUrl = album.ExternalUrl
response.AlbumInfo.LastFmUrl = lastFmURLOrEmpty(album.ExternalUrl)
response.AlbumInfo.MusicBrainzID = album.MbzAlbumID
return response, nil
@ -302,7 +302,7 @@ func (api *Router) getArtistInfo(r *http.Request) (*responses.ArtistInfoBase, *m
base.MediumImageUrl = publicurl.ImageURL(r.Context(), artist.CoverArtID(), 600)
base.LargeImageUrl = publicurl.ImageURL(r.Context(), artist.CoverArtID(), 1200)
}
base.LastFmUrl = artist.ExternalUrl
base.LastFmUrl = lastFmURLOrEmpty(artist.ExternalUrl)
base.MusicBrainzID = artist.MbzArtistID
return &base, &artist.SimilarArtists, nil

24
server/subsonic/browsing_test.go
View file

@ -168,6 +168,18 @@ var _ = Describe("Browsing", func() {
Expect(resp.AlbumInfo.SmallImageUrl).ToNot(BeEmpty())
Expect(resp.AlbumInfo.LargeImageUrl).ToNot(BeEmpty())
})
It("only reports Last.fm pages as lastFmUrl", func() {
api.provider = &fakeInfoProvider{album: &model.Album{ID: "al-1", ExternalUrl: "https://www.last.fm/music/Radiohead/OK+Computer"}}
r := httptest.NewRequest("GET", "/rest/getAlbumInfo?id=al-1", nil)
resp, err := api.GetAlbumInfo(r)
Expect(err).ToNot(HaveOccurred())
Expect(resp.AlbumInfo.LastFmUrl).To(Equal("https://www.last.fm/music/Radiohead/OK+Computer"))
api.provider = &fakeInfoProvider{album: &model.Album{ID: "al-1", ExternalUrl: "https://www.deezer.com/album/12345"}}
resp, err = api.GetAlbumInfo(r)
Expect(err).ToNot(HaveOccurred())
Expect(resp.AlbumInfo.LastFmUrl).To(BeEmpty())
})
It("omits image URLs when the album artwork is known absent", func() {
api.provider = &fakeInfoProvider{album: &model.Album{ID: "al-1", ItemImage: model.ItemImage{ImageAbsent: true}}}
r := httptest.NewRequest("GET", "/rest/getAlbumInfo?id=al-1", nil)
@ -187,6 +199,18 @@ var _ = Describe("Browsing", func() {
Expect(err).ToNot(HaveOccurred())
Expect(resp.ArtistInfo.SmallImageUrl).ToNot(BeEmpty())
})
It("only reports Last.fm pages as lastFmUrl", func() {
api.provider = &fakeInfoProvider{artist: &model.Artist{ID: "ar-1", ExternalUrl: "https://www.last.fm/music/Radiohead"}}
r := httptest.NewRequest("GET", "/rest/getArtistInfo?id=ar-1", nil)
resp, err := api.GetArtistInfo(r)
Expect(err).ToNot(HaveOccurred())
Expect(resp.ArtistInfo.LastFmUrl).To(Equal("https://www.last.fm/music/Radiohead"))
api.provider = &fakeInfoProvider{artist: &model.Artist{ID: "ar-1", ExternalUrl: "https://www.radiohead.com/"}}
resp, err = api.GetArtistInfo(r)
Expect(err).ToNot(HaveOccurred())
Expect(resp.ArtistInfo.LastFmUrl).To(BeEmpty())
})
It("omits image URLs when the artist artwork is known absent", func() {
api.provider = &fakeInfoProvider{artist: &model.Artist{ID: "ar-1", ItemImage: model.ItemImage{ImageAbsent: true}}}
r := httptest.NewRequest("GET", "/rest/getArtistInfo?id=ar-1", nil)

18
server/subsonic/helpers.go
View file

@ -7,6 +7,7 @@ import (
"fmt"
"mime"
"net/http"
"net/url"
"slices"
"sort"
"strings"
@ -104,6 +105,23 @@ func coverArtOrEmpty(id model.ArtworkID, absent bool) string {
return id.String()
}
// lastFmURLOrEmpty returns the URL only when it points to a Last.fm music page,
// as other agents may store an unrelated site in ExternalUrl.
func lastFmURLOrEmpty(externalURL string) string {
u, err := url.Parse(externalURL)
if err != nil || (u.Scheme != "http" && u.Scheme != "https") {
return ""
}
host := strings.ToLower(u.Hostname())
if host != "last.fm" && !strings.HasSuffix(host, ".last.fm") {
return ""
}
if !strings.HasPrefix(u.Path, "/music/") {
return ""
}
return externalURL
}
func toArtist(r *http.Request, a model.Artist) responses.Artist {
artist := responses.Artist{
Id: a.ID,

16
server/subsonic/helpers_test.go
View file

@ -53,6 +53,22 @@ var _ = Describe("helpers", func() {
})
})
Describe("lastFmURLOrEmpty", func() {
It("keeps Last.fm artist and album pages", func() {
Expect(lastFmURLOrEmpty("https://www.last.fm/music/Radiohead")).To(Equal("https://www.last.fm/music/Radiohead"))
Expect(lastFmURLOrEmpty("http://last.fm/music/Radiohead/OK+Computer")).To(Equal("http://last.fm/music/Radiohead/OK+Computer"))
})
It("omits URLs from other sites", func() {
Expect(lastFmURLOrEmpty("https://www.radiohead.com/")).To(BeEmpty())
Expect(lastFmURLOrEmpty("https://www.deezer.com/artist/399")).To(BeEmpty())
Expect(lastFmURLOrEmpty("https://evil.example/last.fm/music/Radiohead")).To(BeEmpty())
Expect(lastFmURLOrEmpty("https://notlast.fm/music/Radiohead")).To(BeEmpty())
Expect(lastFmURLOrEmpty("https://www.last.fm/user/someone")).To(BeEmpty())
Expect(lastFmURLOrEmpty("javascript:alert(1)//last.fm/music/")).To(BeEmpty())
Expect(lastFmURLOrEmpty("")).To(BeEmpty())
})
})
Describe("sanitizeSlashes", func() {
It("maps / to _", func() {
Expect(sanitizeSlashes("AC/DC")).To(Equal("AC_DC"))