[ARVADOS] updated: 1.3.0-3002-gbd8bdd900

Git user git at public.arvados.org
Tue Aug 25 18:11:43 UTC 2020


Summary of changes:
 doc/_config.yml                                    |  1 +
 doc/admin/scoped-tokens.html.textile.liquid        |  6 ++
 .../token-expiration-policy.html.textile.liquid    | 62 +++++++++++++++++++++
 doc/admin/user-management-cli.html.textile.liquid  | 64 ++++++++++++++++++----
 lib/config/config.default.yml                      |  5 ++
 lib/config/export.go                               |  1 +
 lib/config/generated_config.go                     |  5 ++
 sdk/go/arvados/config.go                           |  1 +
 .../app/controllers/user_sessions_controller.rb    |  5 ++
 services/api/app/models/api_client.rb              |  9 ++-
 services/api/config/arvados_config.rb              |  1 +
 .../api/lib/tasks/manage_long_lived_tokens.rake    | 61 +++++++++++++++++++++
 .../functional/user_sessions_controller_test.rb    | 23 +++++++-
 services/api/test/unit/api_client_test.rb          | 41 ++++++++------
 14 files changed, 252 insertions(+), 33 deletions(-)
 create mode 100644 doc/admin/token-expiration-policy.html.textile.liquid
 create mode 100644 services/api/lib/tasks/manage_long_lived_tokens.rake

       via  bd8bdd90055d61263eff5bdb9a953c57319aa83d (commit)
       via  67207bade066ddf25b5d0056a5df6201e7ecab2c (commit)
       via  3e38df9fabcbf421ef0b0aac2e82f92373c0e70f (commit)
       via  46fefa537c9bf8c2835a5ae26bf77a8dfb3fe10f (commit)
       via  00e16fb980a0a234d5944ffb06c5614d19280921 (commit)
       via  9ef2a81fb159c8b4aad625cd4a45fd89b21e3ac6 (commit)
       via  614145d096375ae18c7020e8f9205eaa2a1d0d39 (commit)
       via  0371c7348509369fe338951b0df86325819622d5 (commit)
       via  929bf2ca704f43685c58da9fd60dceac037d3593 (commit)
       via  2ea2aedaaadd0fcd204fe891df8b2ab56acf7dee (commit)
      from  7af2ada1dec46b67b80d3c89a8f961c17525dd02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bd8bdd90055d61263eff5bdb9a953c57319aa83d
Merge: 7af2ada1d 67207bade
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Aug 25 15:00:33 2020 -0300

    Merge branch '16678-login-tokens-lifetime-config'
    Closes #16678
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --cc lib/config/export.go
index 5cdc3dae6,76f00c765..b203dff26
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@@ -170,9 -170,7 +170,10 @@@ var whitelist = map[string]bool
  	"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,
  	"Mail":                                         true,
  	"Mail.EmailFrom":                               false,
  	"Mail.IssueReporterEmailFrom":                  false,
diff --cc sdk/go/arvados/config.go
index c87f880e5,86673320d..d98ffd18e
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@@ -177,12 -177,9 +177,13 @@@ type Cluster struct 
  			ProviderAppID     string
  			ProviderAppSecret string
  		}
 +		Test struct {
 +			Enable bool
 +			Users  map[string]TestUser
 +		}
  		LoginCluster       string
  		RemoteTokenRefresh Duration
+ 		TokenLifetime      Duration
  	}
  	Mail struct {
  		MailchimpAPIKey                string

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list