* fix(jellycompat): match MediaSourceId across UUID formats (compact vs dashed)
* fix(jellycompat): honor ImageTypes=Backdrop as a filter on /Items
Wholphin genre cards request /Items?imageTypes=Backdrop&limit=1&sortBy=Random
and assume every returned item has a backdrop. Silo ignored ImageTypes, so a
random pick could lack a backdrop (BackdropImageTags: null), crashing Wholphin.
Push the filter down to the catalog browse SQL
(NULLIF(BTRIM(backdrop_path),'') IS NOT NULL) so random/limited selections only
ever consider backdrop-having items; empty genres correctly return [].
* fix(jellycompat): case-insensitive PlaySessionId + api_key in stream auth
Wholphin's jellyfin-sdk-kotlin builds its own direct-play URL
(/Videos/{id}/stream?static=true&playSessionId=...&mediaSourceId=...) with a
lowercase 'playSessionId', no api_key, and no auth header (ExoPlayer's data
source drops it). PlaybackSessionAuth read 'PlaySessionId'/'PlaySessionID'
case-sensitively, so the fallback never matched -> 401 on every direct-play
stream -> forced (often failing) transcode fallback. Resolve PlaySessionId via
newCaseInsensitiveQuery, and likewise accept case-variant api_key in
ExtractToken.
* fix(jellycompat): support Wholphin season item queries
---------
Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com>
214 lines
7.8 KiB
Go
214 lines
7.8 KiB
Go
package jellycompat
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"net/http"
|
|
"regexp"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/auth"
|
|
)
|
|
|
|
type sessionContextKey string
|
|
|
|
const compatSessionKey sessionContextKey = "jellycompat_session"
|
|
|
|
var mediaBrowserTokenPattern = regexp.MustCompile(`(?i)token="?([^",\s]+)"?`)
|
|
|
|
const (
|
|
tokenRefreshBuffer = 5 * time.Minute
|
|
tokenRefreshTimeout = 30 * time.Second
|
|
)
|
|
|
|
// Authenticator extracts Jellyfin-style auth tokens and resolves compat sessions.
|
|
type Authenticator struct {
|
|
sessions *SessionStore
|
|
authService *auth.Service
|
|
now func() time.Time
|
|
}
|
|
|
|
// NewAuthenticator creates a new compat authenticator.
|
|
func NewAuthenticator(sessions *SessionStore, authService *auth.Service) *Authenticator {
|
|
return &Authenticator{sessions: sessions, authService: authService, now: time.Now}
|
|
}
|
|
|
|
// ExtractToken extracts a compat token from Jellyfin-style request auth.
|
|
// Checks Authorization, X-Emby-Authorization, X-Emby-Token,
|
|
// X-Mediabrowser-Token headers and api_key query parameter.
|
|
func ExtractToken(r *http.Request) (string, bool) {
|
|
// Check Authorization and X-Emby-Authorization headers for Bearer or
|
|
// MediaBrowser Token="..." formats. The Jellyfin Kotlin SDK (used by
|
|
// Findroid and other Android clients) sends X-Emby-Authorization.
|
|
for _, headerName := range []string{"Authorization", "X-Emby-Authorization"} {
|
|
if header := strings.TrimSpace(r.Header.Get(headerName)); header != "" {
|
|
parts := strings.SplitN(header, " ", 2)
|
|
if len(parts) == 2 && strings.EqualFold(parts[0], "bearer") {
|
|
token := strings.TrimSpace(parts[1])
|
|
if token != "" {
|
|
return token, true
|
|
}
|
|
}
|
|
if match := mediaBrowserTokenPattern.FindStringSubmatch(header); len(match) == 2 && match[1] != "" {
|
|
return match[1], true
|
|
}
|
|
}
|
|
}
|
|
|
|
if token := strings.TrimSpace(r.Header.Get("X-Emby-Token")); token != "" {
|
|
return token, true
|
|
}
|
|
if token := strings.TrimSpace(r.Header.Get("X-Mediabrowser-Token")); token != "" {
|
|
return token, true
|
|
}
|
|
// Case-insensitive: Jellyfin clients vary the casing (api_key / Api_Key / API_KEY).
|
|
if token := strings.TrimSpace(newCaseInsensitiveQuery(r.URL.Query()).Get("api_key")); token != "" {
|
|
return token, true
|
|
}
|
|
|
|
return "", false
|
|
}
|
|
|
|
// RequireSession enforces a valid compat session for a route.
|
|
func (a *Authenticator) RequireSession(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
token, ok := ExtractToken(r)
|
|
if !ok {
|
|
slog.Warn("jellycompat auth: no token in request",
|
|
"path", r.URL.Path,
|
|
"auth_header_present", r.Header.Get("Authorization") != "",
|
|
"x_emby_auth_present", r.Header.Get("X-Emby-Authorization") != "",
|
|
)
|
|
writeError(w, http.StatusUnauthorized, "Unauthorized", "Missing authentication token")
|
|
return
|
|
}
|
|
|
|
session, ok := a.sessions.Get(token)
|
|
if !ok {
|
|
slog.Warn("jellycompat auth: session not found",
|
|
"path", r.URL.Path,
|
|
"token_prefix", safeTokenPrefix(token),
|
|
)
|
|
writeError(w, http.StatusUnauthorized, "Unauthorized", "Invalid or expired authentication token")
|
|
return
|
|
}
|
|
|
|
// Refresh underlying Silo tokens if they're about to expire.
|
|
// Use a detached context so a client aborting the request mid-refresh
|
|
// (common on flaky mobile networks) doesn't revoke the compat session.
|
|
if a.authService != nil && !session.StreamAppTokenExpiry.IsZero() &&
|
|
session.StreamAppTokenExpiry.Before(a.now().Add(tokenRefreshBuffer)) {
|
|
refreshCtx, cancel := context.WithTimeout(context.Background(), tokenRefreshTimeout)
|
|
newPair, err := a.authService.Refresh(refreshCtx, session.StreamAppRefreshToken)
|
|
cancel()
|
|
if err != nil {
|
|
slog.Warn("jellycompat auth: token refresh failed, revoking session",
|
|
"path", r.URL.Path,
|
|
"token_prefix", safeTokenPrefix(token),
|
|
"error", err,
|
|
)
|
|
a.sessions.Delete(token)
|
|
writeError(w, http.StatusUnauthorized, "Unauthorized", "Session expired")
|
|
return
|
|
}
|
|
updateErr := a.sessions.Update(token, func(s *Session) error {
|
|
s.StreamAppAccessToken = newPair.AccessToken
|
|
s.StreamAppRefreshToken = newPair.RefreshToken
|
|
s.StreamAppTokenExpiry = a.now().Add(time.Duration(newPair.ExpiresIn) * time.Second)
|
|
return nil
|
|
})
|
|
if updateErr != nil {
|
|
slog.Warn("jellycompat auth: session update after refresh failed",
|
|
"token_prefix", safeTokenPrefix(token),
|
|
"error", updateErr,
|
|
)
|
|
} else {
|
|
// Re-read the session to get the updated tokens.
|
|
session, _ = a.sessions.Get(token)
|
|
}
|
|
}
|
|
|
|
serveWithSession(next, w, r, session)
|
|
})
|
|
}
|
|
|
|
// safeTokenPrefix returns the first 8 characters of a token for logging.
|
|
func safeTokenPrefix(token string) string {
|
|
if len(token) <= 8 {
|
|
return token
|
|
}
|
|
return token[:8] + "..."
|
|
}
|
|
|
|
// serveWithSession injects the resolved compat session into the request context
|
|
// and continues the handler chain.
|
|
func serveWithSession(next http.Handler, w http.ResponseWriter, r *http.Request, session *Session) {
|
|
ctx := context.WithValue(r.Context(), compatSessionKey, session)
|
|
next.ServeHTTP(w, r.WithContext(ctx))
|
|
}
|
|
|
|
// resolveCompatToken resolves a token to a compat session: a session-store token
|
|
// (normal login) or, matching Jellyfin, an sa_ admin API key (synthesized
|
|
// session bound to the key user's primary profile). Returns false when the token
|
|
// matches neither. keyAuth may be nil (resolveSession handles a nil receiver).
|
|
func resolveCompatToken(ctx context.Context, sessions *SessionStore, keyAuth *AdminAPIKeyAuthenticator, token string) (*Session, bool) {
|
|
if token == "" {
|
|
return nil, false
|
|
}
|
|
if session, ok := sessions.Get(token); ok {
|
|
return session, true
|
|
}
|
|
if strings.HasPrefix(token, "sa_") {
|
|
if session, _, _ := keyAuth.resolveSession(ctx, token); session != nil {
|
|
return session, true
|
|
}
|
|
}
|
|
return nil, false
|
|
}
|
|
|
|
// PlaybackSessionAuth creates middleware that falls back to playback session
|
|
// authentication for media stream endpoints where external players (e.g. libmpv)
|
|
// don't forward auth headers or query parameters.
|
|
func PlaybackSessionAuth(sessions *SessionStore, playbackStore *PlaybackSessionStore, keyAuth *AdminAPIKeyAuthenticator) func(next http.Handler) http.Handler {
|
|
return func(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
// Try standard token auth first — a compat session token or an sa_
|
|
// admin key (synthesized session).
|
|
if token, ok := ExtractToken(r); ok {
|
|
if session, ok := resolveCompatToken(r.Context(), sessions, keyAuth, token); ok {
|
|
serveWithSession(next, w, r, session)
|
|
return
|
|
}
|
|
}
|
|
|
|
// Follow-up HLS requests (master/segment) carry only PlaySessionId,
|
|
// no auth header or api_key. Resolve the negotiated session's
|
|
// CompatToken — which for an API-key stream is itself the sa_ key,
|
|
// so it must go through the same session-or-API-key resolution.
|
|
//
|
|
// The lookup must be case-insensitive: Wholphin's jellyfin-sdk-kotlin
|
|
// builds its own direct-play URL with a lowercase "playSessionId"
|
|
// (and no api_key / auth header), so a case-sensitive match would
|
|
// miss it and 401 the stream — forcing a needless transcode fallback.
|
|
if playSessionID := newCaseInsensitiveQuery(r.URL.Query()).Get("PlaySessionId"); playSessionID != "" {
|
|
if playSession, found := playbackStore.Get(playSessionID); found {
|
|
if session, ok := resolveCompatToken(r.Context(), sessions, keyAuth, playSession.CompatToken); ok {
|
|
serveWithSession(next, w, r, session)
|
|
return
|
|
}
|
|
writeError(w, http.StatusUnauthorized, "Unauthorized", "Session expired")
|
|
return
|
|
}
|
|
}
|
|
writeError(w, http.StatusUnauthorized, "Unauthorized", "Missing authentication token")
|
|
})
|
|
}
|
|
}
|
|
|
|
// SessionFromContext returns the authenticated compat session, if present.
|
|
func SessionFromContext(ctx context.Context) *Session {
|
|
session, _ := ctx.Value(compatSessionKey).(*Session)
|
|
return session
|
|
}
|