From 42cb7282cfc609f4f765d92eca82e7a33bb9ef37 Mon Sep 17 00:00:00 2001 From: clover caruso Date: Wed, 28 Oct 2026 00:36:36 -0700 Subject: [PATCH] Serve music through Feishin Keep Navidrome as the music backend, with Snow Globe SSO for the web player and password authentication for music clients. Assisted-by: gpt-6.1-terra --- service/navidrome/README.md | 16 ++++++ service/navidrome/bootstrap.js | 47 ++++++++++++++++++ service/navidrome/nginx.conf | 91 ++++++++++++++++++++++++++++++++++ service/navidrome/service.pkl | 87 ++++++++++++++++++++++++-------- service/navidrome/settings.js | 5 ++ 5 files changed, 225 insertions(+), 21 deletions(-) create mode 100644 service/navidrome/README.md create mode 100644 service/navidrome/bootstrap.js create mode 100644 service/navidrome/nginx.conf create mode 100644 service/navidrome/settings.js diff --git a/service/navidrome/README.md b/service/navidrome/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7f0453e2db6eb73b277be977458f90f19573bece --- /dev/null +++ b/service/navidrome/README.md @@ -0,0 +1,16 @@ +# Music + +The music address serves Feishin with Snow Globe sign-in and Navidrome's +Subsonic and native APIs for clients. Existing Navidrome data and the Music +folder remain the backend. The browser bridge uses Navidrome's externally +authenticated session; Feishin's local cache is cleared when the signed-in +account changes. + +Clients that cannot use Snow Globe SSO need a Navidrome password. Open +`/manage/`, select the account from the user menu, and set a password; use the +music address as the server URL. For an account created through SSO, the first +password can be set without its autogenerated current password. Passwords are +separate from Snow Globe and continue to work for clients until changed. + +The preview starts with an empty database and music directory. It does not +connect to the production library or send external integration requests. diff --git a/service/navidrome/bootstrap.js b/service/navidrome/bootstrap.js new file mode 100644 index 0000000000000000000000000000000000000000..c140637b0706d7b37cfd586f6042a4ba4043a82a --- /dev/null +++ b/service/navidrome/bootstrap.js @@ -0,0 +1,47 @@ +(async () => { + const response = await fetch('/snow-session', { cache: 'no-store' }); + if (!response.ok) throw new Error('Music sign-in failed'); + const match = (await response.text()).match(/window\.__APP_CONFIG__\s*=\s*(.+)/); + if (!match) throw new Error('Music session is unavailable'); + const value = JSON.parse(match[1].trim().replace(/;$/, '')); + const auth = (typeof value === 'string' ? JSON.parse(value) : value).auth; + if (!auth?.username || !auth.id || !auth.subsonicSalt || !auth.subsonicToken) { + throw new Error('Music session is unavailable'); + } + if (localStorage.getItem('snow_user') !== auth.username) { + localStorage.clear(); + await new Promise((resolve, reject) => { + const request = indexedDB.deleteDatabase('keyval-store'); + request.onsuccess = resolve; + request.onerror = request.onblocked = reject; + }); + localStorage.setItem('snow_user', auth.username); + } + const id = 'snowglobe'; + const saved = JSON.parse(localStorage.getItem('store_authentication') || 'null'); + const server = { + ...saved?.state?.serverList?.[id], + id, + name: 'Music', + type: 'navidrome', + url: window.location.origin, + username: auth.username, + userId: auth.id, + isAdmin: auth.isAdmin, + credential: `u=${encodeURIComponent(auth.username)}&s=${auth.subsonicSalt}&t=${auth.subsonicToken}`, + ndCredential: 'sso', + }; + const state = saved?.state || {}; + state.currentServer = server; + state.serverList = { [id]: server }; + localStorage.setItem('store_authentication', JSON.stringify({ state, version: 2 })); + if (document.readyState === 'loading') { + await new Promise(resolve => document.addEventListener('DOMContentLoaded', resolve, { once: true })); + } + const original = document.querySelector('script[type="application/x-snow-module"]'); + if (!original) throw new Error('Music application is unavailable'); + const script = document.createElement('script'); + script.type = 'module'; + script.src = original.src; + document.head.appendChild(script); +})(); diff --git a/service/navidrome/nginx.conf b/service/navidrome/nginx.conf new file mode 100644 index 0000000000000000000000000000000000000000..7cd2e661ae3c963f61becad0e63835bbd7129853 --- /dev/null +++ b/service/navidrome/nginx.conf @@ -0,0 +1,91 @@ +server { + listen 127.0.0.1:{{ env "NOMAD_PORT_app_http" }}; + absolute_redirect off; + access_log off; + root /usr/share/nginx/html; + + location = /snow-health { proxy_pass http://unix:/socket/navidrome.sock:/ping; } + location /snow.oauth2/ { + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Proto https; + proxy_pass http://{{ range nomadService 1 (env "NOMAD_ALLOC_ID") "AUTH_SERVICE" }}{{ .Address }}:{{ .Port }}{{ end }}; + } + location = /snow-auth { + internal; + proxy_pass http://{{ range nomadService 1 (env "NOMAD_ALLOC_ID") "AUTH_SERVICE" }}{{ .Address }}:{{ .Port }}{{ end }}/snow.oauth2/auth; + proxy_pass_request_body off; + proxy_set_header Content-Length ""; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Proto https; + proxy_set_header X-Forwarded-Uri $request_uri; + } + location = /snow-signin { + internal; + return 302 /snow.oauth2/start?rd=https://$host$request_uri; + } + location = /ping { + proxy_set_header Remote-User ""; + proxy_pass http://unix:/socket/navidrome.sock:; + } + location = /auth/login { + proxy_set_header Remote-User ""; + proxy_set_header X-Forwarded-For ""; + proxy_pass http://unix:/socket/navidrome.sock:; + } + location /rest/ { + proxy_set_header Remote-User ""; + proxy_set_header X-Forwarded-For ""; + proxy_pass http://unix:/socket/navidrome.sock:; + } + location = /snow-session { + auth_request /snow-auth; + auth_request_set $snow_user $upstream_http_x_auth_request_preferred_username; + proxy_set_header Remote-User $snow_user; + proxy_set_header X-Forwarded-For ""; + proxy_set_header X-Nd-Authorization ""; + proxy_set_header Authorization ""; + add_header Cache-Control "no-store" always; + proxy_pass http://unix:/socket/navidrome.sock:/app/; + } + location = /manage { return 308 /manage/; } + location = /app { return 308 /app/; } + location ~ ^/(app|manage|share)/ { + auth_request /snow-auth; + error_page 401 = /snow-signin; + auth_request_set $snow_user $upstream_http_x_auth_request_preferred_username; + proxy_set_header Remote-User $snow_user; + proxy_set_header X-Forwarded-For ""; + proxy_set_header X-Nd-Authorization ""; + proxy_set_header Authorization ""; + rewrite ^/manage/(.*)$ /app/$1 break; + proxy_pass http://unix:/socket/navidrome.sock:; + } + location /api/ { + auth_request /snow-auth; + error_page 401 = @native_api; + auth_request_set $snow_user $upstream_http_x_auth_request_preferred_username; + proxy_set_header Remote-User $snow_user; + proxy_set_header X-Forwarded-For ""; + proxy_set_header X-Nd-Authorization ""; + proxy_set_header Authorization ""; + proxy_pass http://unix:/socket/navidrome.sock:; + } + location @native_api { + proxy_set_header Remote-User ""; + proxy_set_header X-Forwarded-For ""; + proxy_pass http://unix:/socket/navidrome.sock:; + } + location = /settings.js { + auth_request /snow-auth; + alias /etc/nginx/conf.d/settings.js; + add_header Cache-Control "no-store"; + } + location / { + auth_request /snow-auth; + error_page 401 = /snow-signin; + sub_filter '' ''; + sub_filter 'type="module" crossorigin src=' 'type="application/x-snow-module" crossorigin src='; + sub_filter_once off; + try_files $uri $uri/ /index.html; + } +} diff --git a/service/navidrome/service.pkl b/service/navidrome/service.pkl index e6d604d84e6cd63b957b83ad8de934164eed3fff..4705f192dd7b3e4ee1cbf4122c673918f3a77070 100644 --- a/service/navidrome/service.pkl +++ b/service/navidrome/service.pkl @@ -1,31 +1,76 @@ amends "../../config/Service.pkl" import "../../config/site.pkl" as site +import "../../config/OpenID.pkl" as sso +import "../forward-auth/service.pkl" as forwardAuth -name = "Navidrome" +name = "Music" +access = "media" +stageIsolation = if (site.preview) "fresh" else "clone" -container { - image = "docker.io/deluan/navidrome@sha256:59ce76e6e06193fbfbb1736a93b8468227e1ea663fc7b25b1da13fbb97f5197b" - - http { - containerPort = 4533 - subdomain = "music" - authRole = "media" - userHeader = "Remote-User" - checkPath = "/ping" +requirements { + new sso.Client { + clientId = module.id + name = module.name + redirectUris { "https://\(module.containers["app"].http.hostname)/snow.oauth2/callback" } } +} - volumes { - ["/data"] {} - ["/music"] { src = "\(site.mediaRoot)/Music"; readOnly = true } - } +secrets { ["cookie"] = forwardAuth.secrets["cookie"] } - env { - ["ND_SCANNER_GROUPALBUMRELEASES"] = "1" - ["ND_BASEURL"] = "https://\(module.container.http.hostname)/" - ["ND_PID_ALBUM"] = "folder" - ["ND_EXTAUTH_USERHEADER"] = "Remote-User" - ["ND_EXTAUTH_TRUSTEDSOURCES"] = "10.88.0.1/32" - ["ND_PORT"] = "4533" +containers { + ["auth"] = (forwardAuth.container!!) { + lifecycle = "prestartSidecar" + hostNetwork = true + http = null + tcp { new { name = "oauth"; containerPort = 4180 } } + envTemplate = "OAUTH2_PROXY_HTTP_ADDRESS=127.0.0.1:{{ env \"NOMAD_PORT_auth_oauth\" }}" + env { + ["OAUTH2_PROXY_COOKIE_NAME"] = "_snow_\(module.id)" + ["OAUTH2_PROXY_COOKIE_DOMAINS"] = module.containers["app"].http.hostname!! + ["OAUTH2_PROXY_WHITELIST_DOMAINS"] = "\(module.containers["app"].http.hostname),\(sso.hostname)" + ["OAUTH2_PROXY_REDIRECT_URL"] = "https://\(module.containers["app"].http.hostname)/snow.oauth2/callback" + ["OAUTH2_PROXY_ALLOWED_GROUPS"] = "role:media" + ["OAUTH2_PROXY_AUTH_LOGGING"] = "false" + ["OAUTH2_PROXY_REQUEST_LOGGING"] = "false" + } + } + ["server"] { + image = "docker.io/deluan/navidrome@sha256:59ce76e6e06193fbfbb1736a93b8468227e1ea663fc7b25b1da13fbb97f5197b" + lifecycle = "prestartSidecar" + hostNetwork = true + volumes { + ["/data"] {} + ["/socket"] {} + when (site.preview) { ["/music"] {} } + when (!site.preview) { ["/music"] { src = "\(site.mediaRoot)/Music"; readOnly = true } } + } + env { + ["ND_SCANNER_GROUPALBUMRELEASES"] = "1" + ["ND_BASEURL"] = "https://\(module.containers["app"].http.hostname)/" + ["ND_PID_ALBUM"] = "folder" + ["ND_EXTAUTH_USERHEADER"] = "Remote-User" + ["ND_EXTAUTH_TRUSTEDSOURCES"] = "@" + ["ND_ADDRESS"] = "unix:/socket/navidrome.sock" + when (site.preview) { ["ND_ENABLEEXTERNALSERVICES"] = "false" } + } + } + ["app"] { + image = "ghcr.io/jeffvli/feishin@sha256:6c75a4d3b99065ac245e2eb2b693fde3e5f2a6fe41c9e255da4fcb8948071965" + hostNetwork = true + entrypoint = "nginx" + args { "-g"; "daemon off;" } + cpu = 100 + memory = 256 + http { containerPort = 9180; loopback = true; subdomain = "music"; checkPath = "/snow-health" } + volumes { + ["/socket"] { readOnly = true } + ["/etc/nginx/conf.d/settings.js"] { config = "settings.js" } + ["/usr/share/nginx/html/snow-bootstrap.js"] { config = "bootstrap.js" } + } + secretFiles { + ["/etc/nginx/conf.d/default.conf"] = read("nginx.conf").text + .replaceAll("AUTH_SERVICE", "\(module.id)-auth") + } } } diff --git a/service/navidrome/settings.js b/service/navidrome/settings.js new file mode 100644 index 0000000000000000000000000000000000000000..dc6c6c982a75fa83f643f99811a95f872e57c331 --- /dev/null +++ b/service/navidrome/settings.js @@ -0,0 +1,5 @@ +window.SERVER_URL = window.location.origin; +window.SERVER_NAME = 'Music'; +window.SERVER_TYPE = 'navidrome'; +window.SERVER_LOCK = true; +window.ANALYTICS_DISABLED = true; -- 2.54.1