17464: Fix config entry

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 516d0477cb3f4a26edcd27667600362c1e529be3..7fee7509b29d663d4813f4e280ecf656fef82322 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -559,7 +559,7 @@ Clusters:
       # able to download or upload data files using the
       # upload/download features for Workbench, WebDAV and S3 API
       # support.
-      KeepWebPermisison:
+      KeepWebPermission:
         User:
           Download: true
           Upload: true

diff --git a/lib/config/export.go b/lib/config/export.go
index d1c71ed2dc935fa6ff55efa0e891525b0a0a42b9..cf3c23812ae16d7e7726af6dbb8fa50c301cad3c 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -106,6 +106,8 @@ var whitelist = map[string]bool{
        "Collections.TrashSweepInterval":                      false,
        "Collections.TrustAllContent":                         false,
        "Collections.WebDAVCache":                             false,
+       "Collections.KeepproxyPermission":                     false,
+       "Collections.KeepWebPermission":                       false,
        "Containers":                                          true,
        "Containers.CloudVMs":                                 false,
        "Containers.CrunchRunArgumentsList":                   false,

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 0ae85461b089a206de7e62aa6237021edff3fc34..1a940bdbaf0b1bd0fcb5b05ba117c8c5b00aedb3 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -561,6 +561,29 @@ Clusters:
         # Persistent sessions.
         MaxSessions: 100
 
+      # Selectively set permissions for regular users and admins to be
+      # able to download or upload data files using the
+      # upload/download features for Workbench, WebDAV and S3 API
+      # support.
+      KeepWebPermission:
+        User:
+          Download: true
+          Upload: true
+        Admin:
+          Download: true
+          Upload: true
+
+      # Selectively set permissions for regular users and admins to be
+      # able to download or upload blocks using arv-put and
+      # arv-get from outside the cluster.
+      KeepproxyPermission:
+        User:
+          Download: true
+          Upload: true
+        Admin:
+          Download: true
+          Upload: true
+
     Login:
       # One of the following mechanisms (SSO, Google, PAM, LDAP, or
       # LoginCluster) should be enabled; see

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 8149b93965553304172353d0bf971ee3164cbf0e..2ff775601c9b4658f2795138955f735cb6fa1b9d 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -68,6 +68,16 @@ type WebDAVCacheConfig struct {
        MaxSessions          int
 }
 
+type UploadDownloadPermission struct {
+       Upload   bool
+       Download bool
+}
+
+type UploadDownloadRolePermissions struct {
+       User  UploadDownloadPermission
+       Admin UploadDownloadPermission
+}
+
 type Cluster struct {
        ClusterID       string `json:"-"`
        ManagementToken string
@@ -130,6 +140,9 @@ type Cluster struct {
                BalanceTimeout           Duration
 
                WebDAVCache WebDAVCacheConfig
+
+               KeepproxyPermission UploadDownloadRolePermissions
+               KeepWebPermission   UploadDownloadRolePermissions
        }
        Git struct {
                GitCommand   string