From: Tom Clegg Date: Sat, 6 Feb 2021 23:45:15 +0000 (-0500) Subject: Merge branch '17335-oidc-auth-params' X-Git-Tag: 2.2.0~133 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/42bf31f017a009585eaac2fe44a83b2596b3e5c8 Merge branch '17335-oidc-auth-params' refs #17335 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- 42bf31f017a009585eaac2fe44a83b2596b3e5c8 diff --cc lib/config/export.go index 2d666e638b,2dbb11bba3..3d0e27c722 --- a/lib/config/export.go +++ b/lib/config/export.go @@@ -59,211 -59,210 +59,213 @@@ func ExportJSON(w io.Writer, cluster *a // exists. var whitelist = map[string]bool{ // | sort -t'"' -k2,2 - "API": true, - "API.AsyncPermissionsUpdateInterval": false, - "API.DisabledAPIs": false, - "API.KeepServiceRequestTimeout": false, - "API.MaxConcurrentRequests": false, - "API.MaxIndexDatabaseRead": false, - "API.MaxItemsPerResponse": true, - "API.MaxKeepBlobBuffers": false, - "API.MaxRequestAmplification": false, - "API.MaxRequestSize": true, - "API.RequestTimeout": true, - "API.SendTimeout": true, - "API.WebsocketClientEventQueue": false, - "API.WebsocketServerEventQueue": false, - "AuditLogs": false, - "AuditLogs.MaxAge": false, - "AuditLogs.MaxDeleteBatch": false, - "AuditLogs.UnloggedAttributes": false, - "ClusterID": true, - "Collections": true, - "Collections.BalanceCollectionBatch": false, - "Collections.BalanceCollectionBuffers": false, - "Collections.BalancePeriod": false, - "Collections.BalanceTimeout": false, - "Collections.BlobDeleteConcurrency": false, - "Collections.BlobMissingReport": false, - "Collections.BlobReplicateConcurrency": false, - "Collections.BlobSigning": true, - "Collections.BlobSigningKey": false, - "Collections.BlobSigningTTL": true, - "Collections.BlobTrash": false, - "Collections.BlobTrashCheckInterval": false, - "Collections.BlobTrashConcurrency": false, - "Collections.BlobTrashLifetime": false, - "Collections.CollectionVersioning": false, - "Collections.DefaultReplication": true, - "Collections.DefaultTrashLifetime": true, - "Collections.ForwardSlashNameSubstitution": true, - "Collections.ManagedProperties": true, - "Collections.ManagedProperties.*": true, - "Collections.ManagedProperties.*.*": true, - "Collections.PreserveVersionIfIdle": true, - "Collections.S3FolderObjects": true, - "Collections.TrashSweepInterval": false, - "Collections.TrustAllContent": false, - "Collections.WebDAVCache": false, - "Containers": true, - "Containers.CloudVMs": false, - "Containers.CrunchRunArgumentsList": false, - "Containers.CrunchRunCommand": false, - "Containers.DefaultKeepCacheRAM": true, - "Containers.DispatchPrivateKey": false, - "Containers.JobsAPI": true, - "Containers.JobsAPI.Enable": true, - "Containers.JobsAPI.GitInternalDir": false, - "Containers.Logging": false, - "Containers.LogReuseDecisions": false, - "Containers.MaxComputeVMs": false, - "Containers.MaxDispatchAttempts": false, - "Containers.MaxRetryAttempts": true, - "Containers.MinRetryPeriod": true, - "Containers.ReserveExtraRAM": true, - "Containers.ShellAccess": true, - "Containers.ShellAccess.Admin": true, - "Containers.ShellAccess.User": true, - "Containers.SLURM": false, - "Containers.StaleLockTimeout": false, - "Containers.SupportedDockerImageFormats": true, - "Containers.SupportedDockerImageFormats.*": true, - "Containers.UsePreemptibleInstances": true, - "ForceLegacyAPI14": false, - "Git": false, - "InstanceTypes": true, - "InstanceTypes.*": true, - "InstanceTypes.*.*": true, - "Login": true, - "Login.Google": true, - "Login.Google.AlternateEmailAddresses": false, - "Login.Google.ClientID": false, - "Login.Google.ClientSecret": false, - "Login.Google.Enable": true, - "Login.LDAP": true, - "Login.LDAP.AppendDomain": false, - "Login.LDAP.EmailAttribute": false, - "Login.LDAP.Enable": true, - "Login.LDAP.InsecureTLS": false, - "Login.LDAP.SearchAttribute": false, - "Login.LDAP.SearchBase": false, - "Login.LDAP.SearchBindPassword": false, - "Login.LDAP.SearchBindUser": false, - "Login.LDAP.SearchFilters": false, - "Login.LDAP.StartTLS": false, - "Login.LDAP.StripDomain": false, - "Login.LDAP.URL": false, - "Login.LDAP.UsernameAttribute": false, - "Login.LoginCluster": true, - "Login.OpenIDConnect": true, - "Login.OpenIDConnect.ClientID": false, - "Login.OpenIDConnect.ClientSecret": false, - "Login.OpenIDConnect.EmailClaim": false, - "Login.OpenIDConnect.EmailVerifiedClaim": false, - "Login.OpenIDConnect.Enable": true, - "Login.OpenIDConnect.Issuer": false, - "Login.OpenIDConnect.UsernameClaim": false, - "Login.PAM": true, - "Login.PAM.DefaultEmailDomain": false, - "Login.PAM.Enable": true, - "Login.PAM.Service": false, - "Login.RemoteTokenRefresh": true, - "Login.SSO": true, - "Login.SSO.Enable": true, - "Login.SSO.ProviderAppID": false, - "Login.SSO.ProviderAppSecret": false, - "Login.Test": true, - "Login.Test.Enable": true, - "Login.Test.Users": false, - "Login.TokenLifetime": false, - "Login.TrustedClients": false, - "Mail": true, - "Mail.EmailFrom": false, - "Mail.IssueReporterEmailFrom": false, - "Mail.IssueReporterEmailTo": false, - "Mail.MailchimpAPIKey": false, - "Mail.MailchimpListID": false, - "Mail.SendUserSetupNotificationEmail": false, - "Mail.SupportEmailAddress": true, - "ManagementToken": false, - "PostgreSQL": false, - "RemoteClusters": true, - "RemoteClusters.*": true, - "RemoteClusters.*.ActivateUsers": true, - "RemoteClusters.*.Host": true, - "RemoteClusters.*.Insecure": true, - "RemoteClusters.*.Proxy": true, - "RemoteClusters.*.Scheme": true, - "Services": true, - "Services.*": true, - "Services.*.ExternalURL": true, - "Services.*.InternalURLs": false, - "SystemLogs": false, - "SystemRootToken": false, - "TLS": false, - "Users": true, - "Users.AdminNotifierEmailFrom": false, - "Users.AnonymousUserToken": true, - "Users.AutoAdminFirstUser": false, - "Users.AutoAdminUserWithEmail": false, - "Users.AutoSetupNewUsers": false, - "Users.AutoSetupNewUsersWithRepository": false, - "Users.AutoSetupNewUsersWithVmUUID": false, - "Users.AutoSetupUsernameBlacklist": false, - "Users.EmailSubjectPrefix": false, - "Users.NewInactiveUserNotificationRecipients": false, - "Users.NewUserNotificationRecipients": false, - "Users.NewUsersAreActive": false, - "Users.PreferDomainForUsername": false, - "Users.UserNotifierEmailFrom": false, - "Users.UserProfileNotificationAddress": false, - "Users.UserSetupMailText": false, - "Volumes": true, - "Volumes.*": true, - "Volumes.*.*": false, - "Volumes.*.AccessViaHosts": true, - "Volumes.*.AccessViaHosts.*": true, - "Volumes.*.AccessViaHosts.*.ReadOnly": true, - "Volumes.*.ReadOnly": true, - "Volumes.*.Replication": true, - "Volumes.*.StorageClasses": true, - "Volumes.*.StorageClasses.*": false, - "Workbench": true, - "Workbench.ActivationContactLink": false, - "Workbench.APIClientConnectTimeout": true, - "Workbench.APIClientReceiveTimeout": true, - "Workbench.APIResponseCompression": true, - "Workbench.ApplicationMimetypesWithViewIcon": true, - "Workbench.ApplicationMimetypesWithViewIcon.*": true, - "Workbench.ArvadosDocsite": true, - "Workbench.ArvadosPublicDataDocURL": true, - "Workbench.DefaultOpenIdPrefix": false, - "Workbench.EnableGettingStartedPopup": true, - "Workbench.EnablePublicProjectsPage": true, - "Workbench.FileViewersConfigURL": true, - "Workbench.IdleTimeout": true, - "Workbench.InactivePageHTML": true, - "Workbench.LogViewerMaxBytes": true, - "Workbench.MultiSiteSearch": true, - "Workbench.ProfilingEnabled": true, - "Workbench.Repositories": false, - "Workbench.RepositoryCache": false, - "Workbench.RunningJobLogRecordsToFetch": true, - "Workbench.SecretKeyBase": false, - "Workbench.ShowRecentCollectionsOnDashboard": true, - "Workbench.ShowUserAgreementInline": true, - "Workbench.ShowUserNotifications": true, - "Workbench.SiteName": true, - "Workbench.SSHHelpHostSuffix": true, - "Workbench.SSHHelpPageHTML": true, - "Workbench.Theme": true, - "Workbench.UserProfileFormFields": true, - "Workbench.UserProfileFormFields.*": true, - "Workbench.UserProfileFormFields.*.*": true, - "Workbench.UserProfileFormFields.*.*.*": true, - "Workbench.UserProfileFormMessage": true, - "Workbench.VocabularyURL": true, - "Workbench.WelcomePageHTML": true, + "API": true, + "API.AsyncPermissionsUpdateInterval": false, + "API.DisabledAPIs": false, + "API.KeepServiceRequestTimeout": false, + "API.MaxConcurrentRequests": false, + "API.MaxIndexDatabaseRead": false, + "API.MaxItemsPerResponse": true, + "API.MaxKeepBlobBuffers": false, + "API.MaxRequestAmplification": false, + "API.MaxRequestSize": true, + "API.RequestTimeout": true, + "API.SendTimeout": true, + "API.WebsocketClientEventQueue": false, + "API.WebsocketServerEventQueue": false, + "AuditLogs": false, + "AuditLogs.MaxAge": false, + "AuditLogs.MaxDeleteBatch": false, + "AuditLogs.UnloggedAttributes": false, + "ClusterID": true, + "Collections": true, + "Collections.BalanceCollectionBatch": false, + "Collections.BalanceCollectionBuffers": false, + "Collections.BalancePeriod": false, + "Collections.BalanceTimeout": false, + "Collections.BlobDeleteConcurrency": false, + "Collections.BlobMissingReport": false, + "Collections.BlobReplicateConcurrency": false, + "Collections.BlobSigning": true, + "Collections.BlobSigningKey": false, + "Collections.BlobSigningTTL": true, + "Collections.BlobTrash": false, + "Collections.BlobTrashCheckInterval": false, + "Collections.BlobTrashConcurrency": false, + "Collections.BlobTrashLifetime": false, + "Collections.CollectionVersioning": false, + "Collections.DefaultReplication": true, + "Collections.DefaultTrashLifetime": true, + "Collections.ForwardSlashNameSubstitution": true, + "Collections.ManagedProperties": true, + "Collections.ManagedProperties.*": true, + "Collections.ManagedProperties.*.*": true, + "Collections.PreserveVersionIfIdle": true, + "Collections.S3FolderObjects": true, + "Collections.TrashSweepInterval": false, + "Collections.TrustAllContent": false, + "Collections.WebDAVCache": false, + "Containers": true, + "Containers.CloudVMs": false, + "Containers.CrunchRunArgumentsList": false, + "Containers.CrunchRunCommand": false, + "Containers.DefaultKeepCacheRAM": true, + "Containers.DispatchPrivateKey": false, + "Containers.JobsAPI": true, + "Containers.JobsAPI.Enable": true, + "Containers.JobsAPI.GitInternalDir": false, + "Containers.Logging": false, + "Containers.LogReuseDecisions": false, + "Containers.MaxComputeVMs": false, + "Containers.MaxDispatchAttempts": false, + "Containers.MaxRetryAttempts": true, + "Containers.MinRetryPeriod": true, + "Containers.ReserveExtraRAM": true, ++ "Containers.ShellAccess": true, ++ "Containers.ShellAccess.Admin": true, ++ "Containers.ShellAccess.User": true, + "Containers.SLURM": false, + "Containers.StaleLockTimeout": false, + "Containers.SupportedDockerImageFormats": true, + "Containers.SupportedDockerImageFormats.*": true, + "Containers.UsePreemptibleInstances": true, + "ForceLegacyAPI14": false, + "Git": false, + "InstanceTypes": true, + "InstanceTypes.*": true, + "InstanceTypes.*.*": true, + "Login": true, + "Login.Google": true, + "Login.Google.AlternateEmailAddresses": false, + "Login.Google.AuthenticationRequestParameters": false, + "Login.Google.ClientID": false, + "Login.Google.ClientSecret": false, + "Login.Google.Enable": true, + "Login.LDAP": true, + "Login.LDAP.AppendDomain": false, + "Login.LDAP.EmailAttribute": false, + "Login.LDAP.Enable": true, + "Login.LDAP.InsecureTLS": false, + "Login.LDAP.SearchAttribute": false, + "Login.LDAP.SearchBase": false, + "Login.LDAP.SearchBindPassword": false, + "Login.LDAP.SearchBindUser": false, + "Login.LDAP.SearchFilters": false, + "Login.LDAP.StartTLS": false, + "Login.LDAP.StripDomain": false, + "Login.LDAP.URL": false, + "Login.LDAP.UsernameAttribute": false, + "Login.LoginCluster": true, + "Login.OpenIDConnect": true, + "Login.OpenIDConnect.AuthenticationRequestParameters": false, + "Login.OpenIDConnect.ClientID": false, + "Login.OpenIDConnect.ClientSecret": false, + "Login.OpenIDConnect.EmailClaim": false, + "Login.OpenIDConnect.EmailVerifiedClaim": false, + "Login.OpenIDConnect.Enable": true, + "Login.OpenIDConnect.Issuer": false, + "Login.OpenIDConnect.UsernameClaim": false, + "Login.PAM": true, + "Login.PAM.DefaultEmailDomain": false, + "Login.PAM.Enable": true, + "Login.PAM.Service": false, + "Login.RemoteTokenRefresh": true, + "Login.SSO": true, + "Login.SSO.Enable": true, + "Login.SSO.ProviderAppID": false, + "Login.SSO.ProviderAppSecret": false, + "Login.Test": true, + "Login.Test.Enable": true, + "Login.Test.Users": false, + "Login.TokenLifetime": false, + "Login.TrustedClients": false, + "Mail": true, + "Mail.EmailFrom": false, + "Mail.IssueReporterEmailFrom": false, + "Mail.IssueReporterEmailTo": false, + "Mail.MailchimpAPIKey": false, + "Mail.MailchimpListID": false, + "Mail.SendUserSetupNotificationEmail": false, + "Mail.SupportEmailAddress": true, + "ManagementToken": false, + "PostgreSQL": false, + "RemoteClusters": true, + "RemoteClusters.*": true, + "RemoteClusters.*.ActivateUsers": true, + "RemoteClusters.*.Host": true, + "RemoteClusters.*.Insecure": true, + "RemoteClusters.*.Proxy": true, + "RemoteClusters.*.Scheme": true, + "Services": true, + "Services.*": true, + "Services.*.ExternalURL": true, + "Services.*.InternalURLs": false, + "SystemLogs": false, + "SystemRootToken": false, + "TLS": false, + "Users": true, + "Users.AdminNotifierEmailFrom": false, + "Users.AnonymousUserToken": true, + "Users.AutoAdminFirstUser": false, + "Users.AutoAdminUserWithEmail": false, + "Users.AutoSetupNewUsers": false, + "Users.AutoSetupNewUsersWithRepository": false, + "Users.AutoSetupNewUsersWithVmUUID": false, + "Users.AutoSetupUsernameBlacklist": false, + "Users.EmailSubjectPrefix": false, + "Users.NewInactiveUserNotificationRecipients": false, + "Users.NewUserNotificationRecipients": false, + "Users.NewUsersAreActive": false, + "Users.PreferDomainForUsername": false, + "Users.UserNotifierEmailFrom": false, + "Users.UserProfileNotificationAddress": false, + "Users.UserSetupMailText": false, + "Volumes": true, + "Volumes.*": true, + "Volumes.*.*": false, + "Volumes.*.AccessViaHosts": true, + "Volumes.*.AccessViaHosts.*": true, + "Volumes.*.AccessViaHosts.*.ReadOnly": true, + "Volumes.*.ReadOnly": true, + "Volumes.*.Replication": true, + "Volumes.*.StorageClasses": true, + "Volumes.*.StorageClasses.*": false, + "Workbench": true, + "Workbench.ActivationContactLink": false, + "Workbench.APIClientConnectTimeout": true, + "Workbench.APIClientReceiveTimeout": true, + "Workbench.APIResponseCompression": true, + "Workbench.ApplicationMimetypesWithViewIcon": true, + "Workbench.ApplicationMimetypesWithViewIcon.*": true, + "Workbench.ArvadosDocsite": true, + "Workbench.ArvadosPublicDataDocURL": true, + "Workbench.DefaultOpenIdPrefix": false, + "Workbench.EnableGettingStartedPopup": true, + "Workbench.EnablePublicProjectsPage": true, + "Workbench.FileViewersConfigURL": true, + "Workbench.IdleTimeout": true, + "Workbench.InactivePageHTML": true, + "Workbench.LogViewerMaxBytes": true, + "Workbench.MultiSiteSearch": true, + "Workbench.ProfilingEnabled": true, + "Workbench.Repositories": false, + "Workbench.RepositoryCache": false, + "Workbench.RunningJobLogRecordsToFetch": true, + "Workbench.SecretKeyBase": false, + "Workbench.ShowRecentCollectionsOnDashboard": true, + "Workbench.ShowUserAgreementInline": true, + "Workbench.ShowUserNotifications": true, + "Workbench.SiteName": true, + "Workbench.SSHHelpHostSuffix": true, + "Workbench.SSHHelpPageHTML": true, + "Workbench.Theme": true, + "Workbench.UserProfileFormFields": true, + "Workbench.UserProfileFormFields.*": true, + "Workbench.UserProfileFormFields.*.*": true, + "Workbench.UserProfileFormFields.*.*.*": true, + "Workbench.UserProfileFormMessage": true, + "Workbench.VocabularyURL": true, + "Workbench.WelcomePageHTML": true, } func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {