[ARVADOS] updated: 1.3.0-1571-g7c3e13d48

Git user git at public.curoverse.com
Thu Sep 5 18:38:36 UTC 2019


Summary of changes:
 lib/config/config.default.yml                      |  13 +-
 lib/config/export.go                               |   6 +-
 lib/config/generated_config.go                     |  13 +-
 sdk/go/arvados/config.go                           |   6 +-
 .../app/controllers/user_sessions_controller.rb    |  33 ++++-
 .../api/app/models/api_client_authorization.rb     | 154 +++++++++++++--------
 services/api/config/arvados_config.rb              |   2 +
 .../functional/user_sessions_controller_test.rb    |  31 ++++-
 services/api/test/integration/remote_user_test.rb  |  98 ++++++++-----
 9 files changed, 252 insertions(+), 104 deletions(-)

       via  7c3e13d4876a8e37feffee3cdaebc44b20b7b61b (commit)
       via  068e72307f9ce91538e45cb461b99cf92d2f5666 (commit)
       via  fb5b1feb7acdfafed1bcbe932ff90e95e129c2a3 (commit)
       via  4653d82e57660b2f2d5cc9ce0960f44684b160ec (commit)
       via  383122c1bc4a08772df618a415420ac3ea527051 (commit)
       via  f676243c0372529cdaa5821d4ebe9f9f59d0cd5a (commit)
       via  0b471c74f2cc392a37aa4f8df8ed931bb5969236 (commit)
      from  a6f874e7de1026f9c60bc4769f919da031927ebe (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 7c3e13d4876a8e37feffee3cdaebc44b20b7b61b
Merge: a6f874e7d 068e72307
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Sep 5 14:38:20 2019 -0400

    Merge branch '15529-federated-user-accounts' refs #15529
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --cc lib/config/config.default.yml
index 24b2e450e,3338bec51..c7a038bec
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -418,18 -415,16 +418,27 @@@ Clusters
        ProviderAppSecret: ""
        ProviderAppID: ""
  
+       # The cluster ID to delegate the user database.  When set,
+       # logins on this cluster will be redirected to the login cluster
+       # (login cluster must appear in RemoteHosts with Proxy: true)
+       LoginCluster: ""
+ 
+       # How long a cached token belonging to a remote cluster will
+       # remain valid before it needs to be revalidated.
+       RemoteTokenRefresh: 5m
+ 
      Git:
 +      # Path to git or gitolite-shell executable. Each authenticated
 +      # request will execute this program with the single argument "http-backend"
 +      GitCommand: /usr/bin/git
 +
 +      # Path to Gitolite's home directory. If a non-empty path is given,
 +      # the CGI environment will be set up to support the use of
 +      # gitolite-shell as a GitCommand: for example, if GitoliteHome is
 +      # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh,
 +      # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1.
 +      GitoliteHome: ""
 +
        # Git repositories must be readable by api server, or you won't be
        # able to submit crunch jobs. To pass the test suites, put a clone
        # of the arvados tree in {git_repositories_dir}/arvados.git or
diff --cc lib/config/generated_config.go
index 8a5b4610c,ce1d8a1ed..f8a0e097d
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -424,18 -421,16 +424,27 @@@ Clusters
        ProviderAppSecret: ""
        ProviderAppID: ""
  
+       # The cluster ID to delegate the user database.  When set,
+       # logins on this cluster will be redirected to the login cluster
+       # (login cluster must appear in RemoteHosts with Proxy: true)
+       LoginCluster: ""
+ 
+       # How long a cached token belonging to a remote cluster will
+       # remain valid before it needs to be revalidated.
+       RemoteTokenRefresh: 5m
+ 
      Git:
 +      # Path to git or gitolite-shell executable. Each authenticated
 +      # request will execute this program with the single argument "http-backend"
 +      GitCommand: /usr/bin/git
 +
 +      # Path to Gitolite's home directory. If a non-empty path is given,
 +      # the CGI environment will be set up to support the use of
 +      # gitolite-shell as a GitCommand: for example, if GitoliteHome is
 +      # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh,
 +      # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1.
 +      GitoliteHome: ""
 +
        # Git repositories must be readable by api server, or you won't be
        # able to submit crunch jobs. To pass the test suites, put a clone
        # of the arvados tree in {git_repositories_dir}/arvados.git or

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list