mirror of
https://github.com/navidrome/navidrome.git
synced 2025-04-04 13:07:36 +03:00
18143fa5a1
* Use the RealIP middleware only behind a reverse proxy * Fix proxy ip source in tests * Fix test for PR#2087 The PR did not update the test after changing the behavior, but the test still passed because another condition was preventing the user from being created in the test. * Use RealIP even without a trusted reverse proxy * Use own type for context key * Fix casing to follow go's conventions * Do not apply RealIP middleware twice * Fix IP source in logs The most interesting data point in the log message is the proxy's IP, but having the client IP too can help identify integration issues.
92 lines
2.4 KiB
Go
92 lines
2.4 KiB
Go
package request
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/navidrome/navidrome/model"
|
|
)
|
|
|
|
type contextKey string
|
|
|
|
const (
|
|
User = contextKey("user")
|
|
Username = contextKey("username")
|
|
Client = contextKey("client")
|
|
Version = contextKey("version")
|
|
Player = contextKey("player")
|
|
Transcoding = contextKey("transcoding")
|
|
ClientUniqueId = contextKey("clientUniqueId")
|
|
ReverseProxyIp = contextKey("reverseProxyIp")
|
|
)
|
|
|
|
func WithUser(ctx context.Context, u model.User) context.Context {
|
|
return context.WithValue(ctx, User, u)
|
|
}
|
|
|
|
func WithUsername(ctx context.Context, username string) context.Context {
|
|
return context.WithValue(ctx, Username, username)
|
|
}
|
|
|
|
func WithClient(ctx context.Context, client string) context.Context {
|
|
return context.WithValue(ctx, Client, client)
|
|
}
|
|
|
|
func WithVersion(ctx context.Context, version string) context.Context {
|
|
return context.WithValue(ctx, Version, version)
|
|
}
|
|
|
|
func WithPlayer(ctx context.Context, player model.Player) context.Context {
|
|
return context.WithValue(ctx, Player, player)
|
|
}
|
|
|
|
func WithTranscoding(ctx context.Context, t model.Transcoding) context.Context {
|
|
return context.WithValue(ctx, Transcoding, t)
|
|
}
|
|
|
|
func WithClientUniqueId(ctx context.Context, clientUniqueId string) context.Context {
|
|
return context.WithValue(ctx, ClientUniqueId, clientUniqueId)
|
|
}
|
|
|
|
func WithReverseProxyIp(ctx context.Context, reverseProxyIp string) context.Context {
|
|
return context.WithValue(ctx, ReverseProxyIp, reverseProxyIp)
|
|
}
|
|
|
|
func UserFrom(ctx context.Context) (model.User, bool) {
|
|
v, ok := ctx.Value(User).(model.User)
|
|
return v, ok
|
|
}
|
|
|
|
func UsernameFrom(ctx context.Context) (string, bool) {
|
|
v, ok := ctx.Value(Username).(string)
|
|
return v, ok
|
|
}
|
|
|
|
func ClientFrom(ctx context.Context) (string, bool) {
|
|
v, ok := ctx.Value(Client).(string)
|
|
return v, ok
|
|
}
|
|
|
|
func VersionFrom(ctx context.Context) (string, bool) {
|
|
v, ok := ctx.Value(Version).(string)
|
|
return v, ok
|
|
}
|
|
|
|
func PlayerFrom(ctx context.Context) (model.Player, bool) {
|
|
v, ok := ctx.Value(Player).(model.Player)
|
|
return v, ok
|
|
}
|
|
|
|
func TranscodingFrom(ctx context.Context) (model.Transcoding, bool) {
|
|
v, ok := ctx.Value(Transcoding).(model.Transcoding)
|
|
return v, ok
|
|
}
|
|
|
|
func ClientUniqueIdFrom(ctx context.Context) (string, bool) {
|
|
v, ok := ctx.Value(ClientUniqueId).(string)
|
|
return v, ok
|
|
}
|
|
|
|
func ReverseProxyIpFrom(ctx context.Context) (string, bool) {
|
|
v, ok := ctx.Value(ReverseProxyIp).(string)
|
|
return v, ok
|
|
}
|