Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-31 14:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Transcoder: If empty JWKS env var, do not enable JWKS (#1025)

Browse Source
This commit is contained in:
Arthur Jamet 2025-07-23 13:49:52 +01:00 committed by GitHub
parent e9a34967f1
commit bfff409142
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.dev.yml
View File

@ -10,6 +10,8 @@ x-transcoder: &transcoder-base
- "7666:7666" - "7666:7666"
restart: unless-stopped restart: unless-stopped
cpus: 1 cpus: 1
environment:
- JWKS_URL=http://auth:4568/.well-known/jwks.json
env_file: env_file:
- ./.env - ./.env
volumes: volumes:

6
transcoder/main.go
View File

@ -76,6 +76,9 @@ func main() {
return return
} }
g := e.Group("/video")
if src.Settings.JwksUrl != "" {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
@ -85,8 +88,6 @@ func main() {
return return
} }
jwks.Register(ctx, src.Settings.JwksUrl) jwks.Register(ctx, src.Settings.JwksUrl)
g := e.Group("/video")
g.Use(echojwt.WithConfig(echojwt.Config{ g.Use(echojwt.WithConfig(echojwt.Config{
KeyFunc: func(token *jwt.Token) (any, error) { KeyFunc: func(token *jwt.Token) (any, error) {
keys, err := jwks.CachedSet(src.Settings.JwksUrl) keys, err := jwks.CachedSet(src.Settings.JwksUrl)
@ -110,6 +111,7 @@ func main() {
return pubkey, nil return pubkey, nil
}, },
})) }))
}
api.RegisterStreamHandlers(g, transcoder) api.RegisterStreamHandlers(g, transcoder)
api.RegisterMetadataHandlers(g, metadata) api.RegisterMetadataHandlers(g, metadata)

2
transcoder/src/settings.go
View File

@ -32,6 +32,6 @@ var Settings = SettingsT{
// we manually add a folder to make sure we do not delete user data. // we manually add a folder to make sure we do not delete user data.
Outpath: path.Join(GetEnvOr("GOCODER_CACHE_ROOT", "/cache"), "kyoo_cache"), Outpath: path.Join(GetEnvOr("GOCODER_CACHE_ROOT", "/cache"), "kyoo_cache"),
SafePath: GetEnvOr("GOCODER_SAFE_PATH", "/video"), SafePath: GetEnvOr("GOCODER_SAFE_PATH", "/video"),
JwksUrl: GetEnvOr("JWKS_URL", "http://auth:4568/.well-known/jwks.json"), JwksUrl: os.Getenv("JWKS_URL"),
HwAccel: DetectHardwareAccel(), HwAccel: DetectHardwareAccel(),
} }