mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 21:04:37 +03:00
fix(middleware): set baseURL to external host if provided (#369)
This commit is contained in:
@@ -296,6 +296,11 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
|
|||||||
}
|
}
|
||||||
baseURL := scheme + "://" + r.Host
|
baseURL := scheme + "://" + r.Host
|
||||||
|
|
||||||
|
externalHost := config.GetExternalHost()
|
||||||
|
if externalHost != "" {
|
||||||
|
baseURL = externalHost
|
||||||
|
}
|
||||||
|
|
||||||
r = r.WithContext(context.WithValue(ctx, BaseURLCtxKey, baseURL))
|
r = r.WithContext(context.WithValue(ctx, BaseURLCtxKey, baseURL))
|
||||||
|
|
||||||
next.ServeHTTP(w, r)
|
next.ServeHTTP(w, r)
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ const MaxStreamingTranscodeSize = "max_streaming_transcode_size"
|
|||||||
|
|
||||||
const Host = "host"
|
const Host = "host"
|
||||||
const Port = "port"
|
const Port = "port"
|
||||||
|
const ExternalHost = "external_host"
|
||||||
|
|
||||||
// Interface options
|
// Interface options
|
||||||
const SoundOnPreview = "sound_on_preview"
|
const SoundOnPreview = "sound_on_preview"
|
||||||
@@ -108,6 +109,10 @@ func GetPort() int {
|
|||||||
return viper.GetInt(Port)
|
return viper.GetInt(Port)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetExternalHost() string {
|
||||||
|
return viper.GetString(ExternalHost)
|
||||||
|
}
|
||||||
|
|
||||||
func GetMaxTranscodeSize() models.StreamingResolutionEnum {
|
func GetMaxTranscodeSize() models.StreamingResolutionEnum {
|
||||||
ret := viper.GetString(MaxTranscodeSize)
|
ret := viper.GetString(MaxTranscodeSize)
|
||||||
|
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ func initEnvs() {
|
|||||||
viper.SetEnvPrefix("stash") // will be uppercased automatically
|
viper.SetEnvPrefix("stash") // will be uppercased automatically
|
||||||
viper.BindEnv("host") // STASH_HOST
|
viper.BindEnv("host") // STASH_HOST
|
||||||
viper.BindEnv("port") // STASH_PORT
|
viper.BindEnv("port") // STASH_PORT
|
||||||
|
viper.BindEnv("external_host") // STASH_EXTERNAL_HOST
|
||||||
viper.BindEnv("stash") // STASH_STASH
|
viper.BindEnv("stash") // STASH_STASH
|
||||||
viper.BindEnv("generated") // STASH_GENERATED
|
viper.BindEnv("generated") // STASH_GENERATED
|
||||||
viper.BindEnv("metadata") // STASH_METADATA
|
viper.BindEnv("metadata") // STASH_METADATA
|
||||||
|
|||||||
Reference in New Issue
Block a user