Merge branch '21137-rp-initiated-logout'

[arvados.git] / lib / config / export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index 44fd559418ea177f365921c00b89c76a1a4088b8..e51e6fc32cdeb03909f84eb3f24cbfcb8351b31a 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -37,8 +37,8 @@ func ExportJSON(w io.Writer, cluster *arvados.Cluster) error {
        return json.NewEncoder(w).Encode(m)
 }
 
-// whitelist classifies configs as safe/unsafe to reveal to
-// unauthenticated clients.
+// whitelist classifies configs as safe/unsafe to reveal through the API
+// endpoint. Note that endpoint does not require authentication.
 //
 // Every config entry must either be listed explicitly here along with
 // all of its parent keys (e.g., "API" + "API.RequestTimeout"), or
@@ -65,13 +65,16 @@ var whitelist = map[string]bool{
        "API.FreezeProjectRequiresDescription":     true,
        "API.FreezeProjectRequiresProperties":      true,
        "API.FreezeProjectRequiresProperties.*":    true,
-       "API.LockBeforeUpdate":                     false,
        "API.KeepServiceRequestTimeout":            false,
-       "API.MaxConcurrentRequests":                false,
+       "API.LockBeforeUpdate":                     false,
        "API.LogCreateRequestFraction":             false,
+       "API.MaxConcurrentRailsRequests":           false,
+       "API.MaxConcurrentRequests":                false,
        "API.MaxIndexDatabaseRead":                 false,
        "API.MaxItemsPerResponse":                  true,
        "API.MaxKeepBlobBuffers":                   false,
+       "API.MaxQueuedRequests":                    false,
+       "API.MaxQueueTimeForLockRequests":          false,
        "API.MaxRequestAmplification":              false,
        "API.MaxRequestSize":                       true,
        "API.MaxTokenLifetime":                     false,
@@ -90,7 +93,9 @@ var whitelist = map[string]bool{
        "Collections.BalanceCollectionBatch":       false,
        "Collections.BalanceCollectionBuffers":     false,
        "Collections.BalancePeriod":                false,
+       "Collections.BalancePullLimit":             false,
        "Collections.BalanceTimeout":               false,
+       "Collections.BalanceTrashLimit":            false,
        "Collections.BalanceUpdateLimit":           false,
        "Collections.BlobDeleteConcurrency":        false,
        "Collections.BlobMissingReport":            false,
@@ -133,6 +138,7 @@ var whitelist = map[string]bool{
        "Containers.LogReuseDecisions":             false,
        "Containers.LSF":                           false,
        "Containers.MaxDispatchAttempts":           false,
+       "Containers.MaximumPriceFactor":            true,
        "Containers.MaxRetryAttempts":              true,
        "Containers.MinRetryPeriod":                true,
        "Containers.PreemptiblePriceFactor":        false,
@@ -245,6 +251,12 @@ var whitelist = map[string]bool{
        "Users.NewUsersAreActive":                             false,
        "Users.PreferDomainForUsername":                       false,
        "Users.RoleGroupsVisibleToAll":                        false,
+       "Users.SyncIgnoredGroups":                             true,
+       "Users.SyncRequiredGroups":                            true,
+       "Users.SyncUserAccounts":                              true,
+       "Users.SyncUserAPITokens":                             true,
+       "Users.SyncUserGroups":                                true,
+       "Users.SyncUserSSHKeys":                               true,
        "Users.UserNotifierEmailBcc":                          false,
        "Users.UserNotifierEmailFrom":                         false,
        "Users.UserProfileNotificationAddress":                false,
@@ -282,7 +294,6 @@ var whitelist = map[string]bool{
        "Workbench.Repositories":                              false,
        "Workbench.RepositoryCache":                           false,
        "Workbench.RunningJobLogRecordsToFetch":               true,
-       "Workbench.SecretKeyBase":                             false,
        "Workbench.ShowRecentCollectionsOnDashboard":          true,
        "Workbench.ShowUserAgreementInline":                   true,
        "Workbench.ShowUserNotifications":                     true,