sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9289 from owncloud/set-secureview-flag-based-on-addr

Browse Source 
set secureview flag based on addr
This commit is contained in:
Jörn Friedrich Dreyer
2024-06-03 15:01:12 +02:00
committed by GitHub
parent d200dfc03f ce383bd203
commit 0ab4999d09
11 changed files with 75 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/frontend/pkg/config/config.go
+3 -3
View File
@@ -107,9 +107,9 @@ type Auth struct {
}
type AppHandler struct {
Prefix string `yaml:"-"`
Insecure bool `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE" desc:"Allow insecure connections to the frontend." introductionVersion:"pre5.0"`
SecureViewApp string `yaml:"secure_view_app" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP" desc:"Name of the app to use for secure view. Should match COLLABORATION_APP_NAME, the name configured for the CS3 app provider." introductionVersion:"5.1"`
Prefix string `yaml:"-"`
Insecure bool `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE" desc:"Allow insecure connections to the frontend." introductionVersion:"pre5.0"`
SecureViewAppAddr string `yaml:"secure_view_app_addr" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR" desc:"Service name or address of the app provider to use for secure view. Should match the service name or address of the registered CS3 app provider." introductionVersion:"5.1"`
}
type Archiver struct {
services/frontend/pkg/config/defaults/defaultconfig.go
+2 -2
View File
@@ -93,8 +93,8 @@ func DefaultConfig() *config.Config {
PreferredUploadType: "sha1",
},
AppHandler: config.AppHandler{
Prefix: "app",
SecureViewApp: "Collabora",
Prefix: "app",
SecureViewAppAddr: "com.owncloud.api.collaboration",
},
Archiver: config.Archiver{
Insecure: false,
services/frontend/pkg/revaconfig/config.go
+1 -1
View File
@@ -137,7 +137,7 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
"contextRouteName": "files-spaces-personal", // TODO: remove when https://github.com/owncloud/web/pull/7437 arrived in oCIS
},
},
"secure_view_app": cfg.AppHandler.SecureViewApp,
"secure_view_app_addr": cfg.AppHandler.SecureViewAppAddr,
},
"archiver": map[string]interface{}{
"prefix": cfg.Archiver.Prefix,