update reva, wopi folderurl

owncloud · Oct 4, 2022 · ad7b94a · ad7b94a
1 parent 1b0ec2c
commit ad7b94a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 23 deletions.
diff --git a/changelog/unreleased/update-reva-rc1.md b/changelog/unreleased/update-reva-rc1.md
@@ -3,4 +3,5 @@ Enhancement: Update reva
 TBD
 
 https://github.com/owncloud/ocis/pull/4588
+https://github.com/owncloud/ocis/pull/4716
 https://github.com/owncloud/ocis/pull/4719
diff --git a/changelog/unreleased/wopi-driver-public-link.md b/changelog/unreleased/wopi-driver-public-link.md
@@ -0,0 +1,5 @@
+Enhancement: Make it possible to configure a WOPI folderurl
+
+The wopi folder URL is used to jump back from an application to the containing folder in the files list.
+
+https://github.com/owncloud/ocis/pull/4716
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/blevesearch/bleve_index_api v1.0.3
 	github.com/coreos/go-oidc/v3 v3.4.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220929083235-bb0b1a236d6c
-	github.com/cs3org/reva/v2 v2.10.1-0.20221004144201-2dfa067f4e96
+	github.com/cs3org/reva/v2 v2.10.1-0.20221004120309-40430d529c4e
 	github.com/disintegration/imaging v1.6.2
 	github.com/ggwhite/go-masker v1.0.9
 	github.com/go-chi/chi/v5 v5.0.7
@@ -98,6 +98,7 @@ require (
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 // indirect
+	github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/ajg/form v1.5.1 // indirect

diff --git a/go.sum b/go.sum
@@ -115,6 +115,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 h1:NsReiLpErI
 github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM=
+github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY=
 github.com/RoaringBitmap/roaring v0.9.4 h1:ckvZSX5gwCRaJYBNe7syNawCU5oruY9gQmjXlp4riwo=
 github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
@@ -295,8 +297,8 @@ github.com/crewjam/saml v0.4.6 h1:XCUFPkQSJLvzyl4cW9OvpWUbRf0gE7VUpU8ZnilbeM4=
 github.com/crewjam/saml v0.4.6/go.mod h1:ZBOXnNPFzB3CgOkRm7Nd6IVdkG+l/wF+0ZXLqD96t1A=
 github.com/cs3org/go-cs3apis v0.0.0-20220929083235-bb0b1a236d6c h1:b+YTmOGlf43mnF8MzO0fsy8/Ho8JLu44Iq5Y0fKLJMM=
 github.com/cs3org/go-cs3apis v0.0.0-20220929083235-bb0b1a236d6c/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.10.1-0.20221004144201-2dfa067f4e96 h1:z6xU4OVcvaBngYQtd5lk/zydF8K4EFKg9B22/AyRKMs=
-github.com/cs3org/reva/v2 v2.10.1-0.20221004144201-2dfa067f4e96/go.mod h1:UQVMlPZtcoPXLZSJ4ZRTruzn6PlRVmpEantwf1wGknU=
+github.com/cs3org/reva/v2 v2.10.1-0.20221004120309-40430d529c4e h1:nVkgLcPZeIxxprEs1HNOnvQWZnjlKzGjpAKPa34q3QU=
+github.com/cs3org/reva/v2 v2.10.1-0.20221004120309-40430d529c4e/go.mod h1:3KJAxMKj8RMkCE//Zr/CTuLloRt7HpUVYmj3DD6S3Vo=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=

diff --git a/services/app-provider/pkg/config/config.go b/services/app-provider/pkg/config/config.go
@@ -62,13 +62,15 @@ type Drivers struct {
 }
 
 type WOPIDriver struct {
-	AppAPIKey      string `yaml:"app_api_key" env:"APP_PROVIDER_WOPI_APP_API_KEY" desc:"API key for the wopi app."`
-	AppDesktopOnly bool   `yaml:"app_desktop_only" env:"APP_PROVIDER_WOPI_APP_DESKTOP_ONLY" desc:"Offer this app only on desktop."`
-	AppIconURI     string `yaml:"app_icon_uri" env:"APP_PROVIDER_WOPI_APP_ICON_URI" desc:"URI to an app icon to be used by clients."`
-	AppInternalURL string `yaml:"app_internal_url" env:"APP_PROVIDER_WOPI_APP_INTERNAL_URL" desc:"Internal URL to the app, like in your DMZ."`
-	AppName        string `yaml:"app_name" env:"APP_PROVIDER_WOPI_APP_NAME" desc:"Human readable app name."`
-	AppURL         string `yaml:"app_url" env:"APP_PROVIDER_WOPI_APP_URL" desc:"URL for end users to access the app."`
-	Insecure       bool   `yaml:"insecure" env:"APP_PROVIDER_WOPI_INSECURE" desc:"Allow insecure connections to the app."`
-	IopSecret      string `yaml:"wopi_server_iop_secret" env:"APP_PROVIDER_WOPI_WOPI_SERVER_IOP_SECRET" desc:"Shared secret of the CS3org WOPI server."`
-	WopiURL        string `yaml:"wopi_server_external_url" env:"APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL" desc:"External url of the CS3org WOPI server."`
+	AppAPIKey                 string `yaml:"app_api_key" env:"APP_PROVIDER_WOPI_APP_API_KEY" desc:"API key for the wopi app."`
+	AppDesktopOnly            bool   `yaml:"app_desktop_only" env:"APP_PROVIDER_WOPI_APP_DESKTOP_ONLY" desc:"Offer this app only on desktop."`
+	AppIconURI                string `yaml:"app_icon_uri" env:"APP_PROVIDER_WOPI_APP_ICON_URI" desc:"URI to an app icon to be used by clients."`
+	AppInternalURL            string `yaml:"app_internal_url" env:"APP_PROVIDER_WOPI_APP_INTERNAL_URL" desc:"Internal URL to the app, like in your DMZ."`
+	AppName                   string `yaml:"app_name" env:"APP_PROVIDER_WOPI_APP_NAME" desc:"Human readable app name."`
+	AppURL                    string `yaml:"app_url" env:"APP_PROVIDER_WOPI_APP_URL" desc:"URL for end users to access the app."`
+	Insecure                  bool   `yaml:"insecure" env:"APP_PROVIDER_WOPI_INSECURE" desc:"Allow insecure connections to the app."`
+	IopSecret                 string `yaml:"wopi_server_iop_secret" env:"APP_PROVIDER_WOPI_WOPI_SERVER_IOP_SECRET" desc:"Shared secret of the CS3org WOPI server."`
+	WopiURL                   string `yaml:"wopi_server_external_url" env:"APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL" desc:"External url of the CS3org WOPI server."`
+	WopiFolderURLBaseURL      string `yaml:"wopi_folder_url_base_url" env:"OCIS_URL;APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL" desc:"Base url to navigate back from the app the containing folder in the file list."`
+	WopiFolderURLPathTemplate string `yaml:"wopi_folder_url_path_template" env:"APP_PROVIDER_WOPI_FOLDER_URL_PATH_TEMPLATE" desc:"Path template to navigate back from the app the containing folder in the file list. Possible template variables are {{.ResourceInfo.ResourceID}}, {{.ResourceInfo.Mtime.Seconds}}, {{.ResourceInfo.Name}}, {{.ResourceInfo.Path}}, {{.ResourceInfo.Type}}, {{.ResourceInfo.Id.SpaceId}}, {{.ResourceInfo.Id.StorageId}}, {{.ResourceInfo.Id.OpaqueId}}, {{.ResourceInfo.MimeType}}"`
 }
diff --git a/services/app-provider/pkg/config/defaults/defaultconfig.go b/services/app-provider/pkg/config/defaults/defaultconfig.go
@@ -33,7 +33,10 @@ func DefaultConfig() *config.Config {
 		},
 		Driver: "",
 		Drivers: config.Drivers{
-			WOPI: config.WOPIDriver{},
+			WOPI: config.WOPIDriver{
+				WopiFolderURLBaseURL:      "https://localhost:9200/",
+				WopiFolderURLPathTemplate: "/f/{{.ResourceID}}",
+			},
 		},
 	}
 }

diff --git a/services/app-provider/pkg/revaconfig/config.go b/services/app-provider/pkg/revaconfig/config.go
@@ -27,16 +27,18 @@ func AppProviderConfigFromStruct(cfg *config.Config) map[string]interface{} {
 					"driver":           cfg.Driver,
 					"drivers": map[string]interface{}{
 						"wopi": map[string]interface{}{
-							"app_api_key":          cfg.Drivers.WOPI.AppAPIKey,
-							"app_desktop_only":     cfg.Drivers.WOPI.AppDesktopOnly,
-							"app_icon_uri":         cfg.Drivers.WOPI.AppIconURI,
-							"app_int_url":          cfg.Drivers.WOPI.AppInternalURL,
-							"app_name":             cfg.Drivers.WOPI.AppName,
-							"app_url":              cfg.Drivers.WOPI.AppURL,
-							"insecure_connections": cfg.Drivers.WOPI.Insecure,
-							"iop_secret":           cfg.Drivers.WOPI.IopSecret,
-							"jwt_secret":           cfg.TokenManager.JWTSecret,
-							"wopi_url":             cfg.Drivers.WOPI.WopiURL,
+							"app_api_key":                   cfg.Drivers.WOPI.AppAPIKey,
+							"app_desktop_only":              cfg.Drivers.WOPI.AppDesktopOnly,
+							"app_icon_uri":                  cfg.Drivers.WOPI.AppIconURI,
+							"app_int_url":                   cfg.Drivers.WOPI.AppInternalURL,
+							"app_name":                      cfg.Drivers.WOPI.AppName,
+							"app_url":                       cfg.Drivers.WOPI.AppURL,
+							"insecure_connections":          cfg.Drivers.WOPI.Insecure,
+							"iop_secret":                    cfg.Drivers.WOPI.IopSecret,
+							"jwt_secret":                    cfg.TokenManager.JWTSecret,
+							"wopi_url":                      cfg.Drivers.WOPI.WopiURL,
+							"wopi_folder_url_base_url":      cfg.Drivers.WOPI.WopiFolderURLBaseURL,
+							"wopi_folder_url_path_template": cfg.Drivers.WOPI.WopiFolderURLPathTemplate,
 						},
 					},
 				},