deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2026-03-14 14:35:44 +01:00
Code Issues Releases Wiki Activity

backend secrets: read with environment override

Browse source 
Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
Adphi 2025-01-28 19:21:53 +01:00
commit dcda0984fa
No known key found for this signature in database
GPG key ID: 46BE4062DB2397FF
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend_server.go
View file

@ -73,8 +73,8 @@ type BackendServer struct {
}
func NewBackendServer(config *goconf.ConfigFile, hub *Hub, version string) (*BackendServer, error) {
turnapikey, _ := config.GetString("turn", "apikey")
turnsecret, _ := config.GetString("turn", "secret")
turnapikey, _ := GetStringOptionWithEnv(config, "turn", "apikey")
turnsecret, _ := GetStringOptionWithEnv(config, "turn", "secret")
turnservers, _ := config.GetString("turn", "servers")
// TODO(jojo): Make the validity for TURN credentials configurable.
turnvalid := 24 * time.Hour

8
backend_storage_static.go
View file

@ -42,7 +42,7 @@ type backendStorageStatic struct {
func NewBackendStorageStatic(config *goconf.ConfigFile) (BackendStorage, error) {
allowAll, _ := config.GetBool("backend", "allowall")
allowHttp, _ := config.GetBool("backend", "allowhttp")
commonSecret, _ := config.GetString("backend", "secret")
commonSecret, _ := GetStringOptionWithEnv(config, "backend", "secret")
sessionLimit, err := config.GetInt("backend", "sessionlimit")
if err != nil || sessionLimit < 0 {
sessionLimit = 0
@ -206,7 +206,7 @@ func getConfiguredBackendIDs(backendIds string) (ids []string) {
func getConfiguredHosts(backendIds string, config *goconf.ConfigFile, commonSecret string) (hosts map[string][]*Backend) {
hosts = make(map[string][]*Backend)
for _, id := range getConfiguredBackendIDs(backendIds) {
u, _ := config.GetString(id, "url")
u, _ := GetStringOptionWithEnv(config, id, "url")
if u == "" {
log.Printf("Backend %s is missing or incomplete, skipping", id)
continue
@ -226,7 +226,7 @@ func getConfiguredHosts(backendIds string, config *goconf.ConfigFile, commonSecr
u = parsed.String()
}
secret, _ := config.GetString(id, "secret")
secret, _ := GetStringOptionWithEnv(config, id, "secret")
if secret == "" && commonSecret != "" {
log.Printf("Backend %s has no own shared secret set, using common shared secret", id)
secret = commonSecret
@ -280,7 +280,7 @@ func (s *backendStorageStatic) Reload(config *goconf.ConfigFile) {
return
}
commonSecret, _ := config.GetString("backend", "secret")
commonSecret, _ := GetStringOptionWithEnv(config, "backend", "secret")
if backendIds, _ := config.GetString("backend", "backends"); backendIds != "" {
configuredHosts := getConfiguredHosts(backendIds, config, commonSecret)