mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-27 15:32:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add flag for disabling TUS in capabilities

Browse Source
This commit is contained in:
Vincent Petry
2020-05-29 16:00:34 +02:00
parent 699f3c4d4e
commit 32306dc6b4
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/command/frontend.go
View File

@@ -78,6 +78,24 @@ func Frontend(cfg *config.Config) *cli.Command {
desktopRedirectURIs[port] = fmt.Sprintf("http://localhost:%d", (port + 1024))
}
filesCfg := map[string]interface{}{
"private_links": false,
"bigfilechunking": false,
"blacklisted_files": []string{},
"undelete": true,
"versioning": true,
}
if !cfg.Reva.UploadDisableTus {
filesCfg["tus_support"] = map[string]interface{}{
"version": "1.0.0",
"resumable": "1.0.0",
"extension": "creation,creation-with-upload",
"http_method_override": cfg.Reva.UploadHTTPMethodOverride,
"max_chunk_size": int(cfg.Reva.UploadMaxChunkSize),
}
}
rcfg := map[string]interface{}{
"core": map[string]interface{}{
"max_cpus": cfg.Reva.Users.MaxCPUs,
@@ -108,6 +126,7 @@ func Frontend(cfg *config.Config) *cli.Command {
"chunk_folder": "/var/tmp/reva/chunks",
"files_namespace": cfg.Reva.OCDav.DavFilesNamespace,
"webdav_namespace": cfg.Reva.OCDav.WebdavNamespace,
"disable_tus": cfg.Reva.UploadDisableTus,
},
"ocs": map[string]interface{}{
"config": map[string]interface{}{
@@ -117,6 +136,7 @@ func Frontend(cfg *config.Config) *cli.Command {
"contact": "admin@localhost",
"ssl": "false",
},
"disable_tus": cfg.Reva.UploadDisableTus,
"capabilities": map[string]interface{}{
"capabilities": map[string]interface{}{
"core": map[string]interface{}{
@@ -137,21 +157,8 @@ func Frontend(cfg *config.Config) *cli.Command {
"supported_types": []string{"SHA256"},
"preferred_upload_type": "SHA256",
},
"files": map[string]interface{}{
"private_links": false,
"bigfilechunking": false,
"blacklisted_files": []string{},
"undelete": true,
"versioning": true,
"tus_support": map[string]interface{}{
"version": "1.0.0",
"resumable": "1.0.0",
"extension": "creation,creation-with-upload",
"http_method_override": cfg.Reva.UploadHttpMethodOverride,
"max_chunk_size": int(cfg.Reva.UploadMaxChunkSize),
},
},
"dav": map[string]interface{}{},
"files": filesCfg,
"dav": map[string]interface{}{},
"files_sharing": map[string]interface{}{
"api_enabled": true,
"resharing": true,

3
pkg/config/config.go
View File

@@ -255,7 +255,8 @@ type Reva struct {
Configs map[string]interface{}
// chunking and resumable upload config (TUS)
UploadMaxChunkSize int
UploadHttpMethodOverride string
UploadHTTPMethodOverride string
UploadDisableTus bool
}
// Tracing defines the available tracing configuration.

9
pkg/flagset/frontend.go
View File

@@ -159,6 +159,13 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
},
// Chunking
&cli.BoolFlag{
Name: "upload-disable-tus",
Value: false,
Usage: "Tells clients to not use TUS by disabling the capability (this doesn't disable the endpoints)",
EnvVars: []string{"REVA_FRONTEND_UPLOAD_DISABLE_TUS"},
Destination: &cfg.Reva.UploadDisableTus,
},
&cli.IntFlag{
Name: "upload-max-chunk-size",
Value: 0,
@@ -171,7 +178,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
Value: "",
Usage: "Specify an HTTP method (ex: POST) to use when uploading in case OPTIONS and PATCH are not available",
EnvVars: []string{"REVA_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE"},
Destination: &cfg.Reva.UploadHttpMethodOverride,
Destination: &cfg.Reva.UploadHTTPMethodOverride,
},
}
}